]> cat aescling's git repositories - mastodon.git/commitdiff
Fix nil error in log_target_from_history helper (#6173)
authorEugen Rochko <eugen@zeonfederated.com>
Thu, 4 Jan 2018 01:56:23 +0000 (02:56 +0100)
committerYamagishi Kazutoshi <ykzts@desire.sh>
Thu, 4 Jan 2018 01:56:23 +0000 (10:56 +0900)
app/helpers/admin/action_logs_helper.rb

index e85243e57e4d3bd68658c555306d338eab3867fb..4475034a508b0242182466a57d7b3ead77949077 100644 (file)
@@ -34,7 +34,7 @@ module Admin::ActionLogsHelper
       link_to attributes['domain'], "https://#{attributes['domain']}"
     when 'Status'
       tmp_status = Status.new(attributes)
-      link_to tmp_status.account.acct, TagManager.instance.url_for(tmp_status)
+      link_to tmp_status.account&.acct || "##{tmp_status.account_id}", TagManager.instance.url_for(tmp_status)
     end
   end