Merge branch 'master' of git.rrerr.net:nilsding/justask

app/helpers/application_helper.rb

@@ -35,7 +35,6 @@ module ApplicationHelper
 
   def inbox_count
     return 0 unless user_signed_in?
-    puts current_user.id
     count = Inbox.select("COUNT(id) AS count")
                  .where(new: true)
                  .where(user_id: current_user.id)

app/helpers/user_helper.rb

@@ -4,7 +4,7 @@ module UserHelper
   def user_screen_name(user, anonymous=false, url=true)
     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(current_user.screen_name)) if url
+    return link_to(name, show_user_profile_path(user.screen_name)) if url
     name
   end
 end