diff options
| author | ThibG <thib@sitedethib.com> | 2018-08-16 20:05:26 +0200 |
|---|---|---|
| committer | Eugen Rochko <eugen@zeonfederated.com> | 2018-08-16 20:05:26 +0200 |
| commit | 106fa28a00ae9b336c05a25b800b9897bd61820d (patch) | |
| tree | 137e1392381f1fe5ec4eeeada7d35807fa7e64c1 | |
| parent | c98681c358c1f32f044992d2fe97f2e7843c83d1 (diff) | |
Prevent actions log from crashing when displaying deleted status (fixes #8133) (#8219)
| -rw-r--r-- | app/helpers/admin/action_logs_helper.rb | 6 | ||||
| -rw-r--r-- | config/locales/en.yml | 1 |
2 files changed, 6 insertions, 1 deletions
diff --git a/app/helpers/admin/action_logs_helper.rb b/app/helpers/admin/action_logs_helper.rb index 4c663211e..85bd30304 100644 --- a/app/helpers/admin/action_logs_helper.rb +++ b/app/helpers/admin/action_logs_helper.rb @@ -34,7 +34,11 @@ module Admin::ActionLogsHelper link_to attributes['domain'], "https://#{attributes['domain']}" when 'Status' tmp_status = Status.new(attributes) - link_to tmp_status.account&.acct || "##{tmp_status.account_id}", TagManager.instance.url_for(tmp_status) + if tmp_status.account + link_to tmp_status.account&.acct || "##{tmp_status.account_id}", admin_account_path(tmp_status.account_id) + else + I18n.t('admin.action_logs.deleted_status') + end end end diff --git a/config/locales/en.yml b/config/locales/en.yml index 9c2800433..cc24a02cf 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -184,6 +184,7 @@ en: unsuspend_account: "%{name} unsuspended %{target}'s account" update_custom_emoji: "%{name} updated emoji %{target}" update_status: "%{name} updated status by %{target}" + deleted_status: "(deleted status)" title: Audit log custom_emojis: by_domain: Domain |