Merge remote-tracking branch 'origin/master'

This commit is contained in:
pixeldesu 2015-06-09 18:07:30 +02:00
commit a75164c6dc
1 changed files with 1 additions and 1 deletions

View File

@ -5,6 +5,6 @@ module UserHelper
return APP_CONFIG['anonymous_name'] if user.nil? || anonymous
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
name
name.strip
end
end