Fixes #2170: user display format in application settings broken by r2010.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2031 e93f8b46-1217-0410-a6f0-8f06a7374b81

Fixes #2170: user display format in application settings broken by r2010.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2031 e93f8b46-1217-0410-a6f0-8f06a7374b81
7c1d8ac0 · Jean-Philippe Lang · 243027e6 · 7c1d8ac0
Commit 7c1d8ac0 authored Nov 13, 2008 by Jean-Philippe Lang
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 1 deletion

user.rb app/models/user.rb +5 -1

No files found.
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -125,7 +125,11 @@ class User < ActiveRecord::Base
 	
  # Return user's full name for display
  def name(formatter = nil)
-    @name ||= eval('"' + (USER_FORMATS[formatter || Setting.user_format] || USER_FORMATS[:firstname_lastname]) + '"')
+    if formatter
+      eval('"' + (USER_FORMATS[formatter] || USER_FORMATS[:firstname_lastname]) + '"')
+    else
+      @name ||= eval('"' + (USER_FORMATS[Setting.user_format] || USER_FORMATS[:firstname_lastname]) + '"')
+    end
  end
  
  def active?