diff options
| author | ThibG <thib@sitedethib.com> | 2020-04-17 22:36:48 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-17 22:36:48 +0200 |
| commit | 62e65dca11e1c39630db2958c514c45407dcdfa7 (patch) | |
| tree | 92b5f9a2f93a2355dd94bac7e63e8fd9c552dafb /app/helpers/admin | |
| parent | 5fdd5eef5a6b05b072a57e065954fdcb0b4a8898 (diff) | |
| parent | 81ef26b67d01aaa693edbdcf7a8f2a6cdfd56920 (diff) | |
Merge pull request #1318 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/helpers/admin')
| -rw-r--r-- | app/helpers/admin/action_logs_helper.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/helpers/admin/action_logs_helper.rb b/app/helpers/admin/action_logs_helper.rb index 88d6e4580..8e398c3b2 100644 --- a/app/helpers/admin/action_logs_helper.rb +++ b/app/helpers/admin/action_logs_helper.rb @@ -47,7 +47,7 @@ module Admin::ActionLogsHelper I18n.t('admin.action_logs.deleted_status') end when 'Announcement' - truncate(attributes['text']) + truncate(attributes['text'].is_a?(Array) ? attributes['text'].last : attributes['text']) end end end |