diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2008-11-13 16:43:39 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2008-11-13 16:43:39 +0000 |
| commit | 7c1d8ac00b62e63045f667c2897730fd9e1657a1 (patch) | |
| tree | 19434fb553ab2266a2f99fd2e033fb11299f779b | |
| parent | 243027e63a5f3e06f48aeffd1cfb3505a17efe98 (diff) | |
| download | redmine-7c1d8ac00b62e63045f667c2897730fd9e1657a1.tar.gz redmine-7c1d8ac00b62e63045f667c2897730fd9e1657a1.zip | |
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
| -rw-r--r-- | app/models/user.rb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/app/models/user.rb b/app/models/user.rb index 53453c0dc..72c550b82 100644 --- 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? |