nightpool
/
mastodon
forked from cybrespace/mastodon
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Prevent actions log from crashing when displaying deleted status (fixes #8133) (#8219)

This commit is contained in:
ThibG 2018-08-16 20:05:26 +02:00 committed by Eugen Rochko
parent c98681c358
commit 106fa28a00
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/helpers/admin/action_logs_helper.rb
View File

@ -34,7 +34,11 @@ module Admin::ActionLogsHelper
link_to attributes['domain'], "https://#{attributes['domain']}" link_to attributes['domain'], "https://#{attributes['domain']}"
when 'Status' when 'Status'
tmp_status = Status.new(attributes) 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
end end

1
config/locales/en.yml
View File

@ -184,6 +184,7 @@ en:
unsuspend_account: "%{name} unsuspended %{target}'s account" unsuspend_account: "%{name} unsuspended %{target}'s account"
update_custom_emoji: "%{name} updated emoji %{target}" update_custom_emoji: "%{name} updated emoji %{target}"
update_status: "%{name} updated status by %{target}" update_status: "%{name} updated status by %{target}"
deleted_status: "(deleted status)"
title: Audit log title: Audit log
custom_emojis: custom_emojis:
by_domain: Domain by_domain: Domain