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

Fix nil error in admin_account_link_to helper (#8578) 

Fix #8573
This commit is contained in:
Eugen Rochko 2018-09-02 19:10:32 +02:00 committed by GitHub
parent 447d733913
commit e926811724
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/helpers/admin/account_moderation_notes_helper.rb
View File

@ -2,6 +2,8 @@
module Admin::AccountModerationNotesHelper module Admin::AccountModerationNotesHelper
def admin_account_link_to(account) def admin_account_link_to(account)
return if account.nil?
link_to admin_account_path(account.id), class: name_tag_classes(account) do link_to admin_account_path(account.id), class: name_tag_classes(account) do
safe_join([ safe_join([
image_tag(account.avatar.url, width: 15, height: 15, alt: display_name(account), class: 'avatar'), image_tag(account.avatar.url, width: 15, height: 15, alt: display_name(account), class: 'avatar'),
@ -11,6 +13,8 @@ module Admin::AccountModerationNotesHelper
end end
def admin_account_inline_link_to(account) 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 link_to admin_account_path(account.id), class: name_tag_classes(account, true) do
content_tag(:span, account.acct, class: 'username') content_tag(:span, account.acct, class: 'username')
end end