Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
a75164c6dc
|
@ -5,6 +5,6 @@ module UserHelper
|
||||||
return APP_CONFIG['anonymous_name'] if user.nil? || anonymous
|
return APP_CONFIG['anonymous_name'] if user.nil? || anonymous
|
||||||
name = user.display_name.blank? ? user.screen_name : user.display_name
|
name = user.display_name.blank? ? user.screen_name : user.display_name
|
||||||
return link_to(name, show_user_profile_path(user.screen_name), class: "#{"user--banned" if user.banned?}") if url
|
return link_to(name, show_user_profile_path(user.screen_name), class: "#{"user--banned" if user.banned?}") if url
|
||||||
name
|
name.strip
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in New Issue