From e9268117241be756c3172083e48e932cad96c3e9 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Sun, 2 Sep 2018 19:10:32 +0200
Subject: Fix nil error in admin_account_link_to helper (#8578)
Fix #8573
---
app/helpers/admin/account_moderation_notes_helper.rb | 4 ++++
1 file changed, 4 insertions(+)
(limited to 'app/helpers')
diff --git a/app/helpers/admin/account_moderation_notes_helper.rb b/app/helpers/admin/account_moderation_notes_helper.rb
index 49e764cef..25586fbba 100644
--- a/app/helpers/admin/account_moderation_notes_helper.rb
+++ b/app/helpers/admin/account_moderation_notes_helper.rb
@@ -2,6 +2,8 @@
module Admin::AccountModerationNotesHelper
def admin_account_link_to(account)
+ return if account.nil?
+
link_to admin_account_path(account.id), class: name_tag_classes(account) do
safe_join([
image_tag(account.avatar.url, width: 15, height: 15, alt: display_name(account), class: 'avatar'),
@@ -11,6 +13,8 @@ module Admin::AccountModerationNotesHelper
end
def admin_account_inline_link_to(account)
+ return if account.nil?
+
link_to admin_account_path(account.id), class: name_tag_classes(account, true) do
content_tag(:span, account.acct, class: 'username')
end
--
cgit