| @@ -125,7 +125,11 class User < ActiveRecord::Base | |||||
| 125 |
|
125 | |||
| 126 | # Return user's full name for display |
|
126 | # Return user's full name for display | |
| 127 | def name(formatter = nil) |
|
127 | def name(formatter = nil) | |
| 128 | @name ||= eval('"' + (USER_FORMATS[formatter || Setting.user_format] || USER_FORMATS[:firstname_lastname]) + '"') |
|
128 | if formatter | |
|
|
129 | eval('"' + (USER_FORMATS[formatter] || USER_FORMATS[:firstname_lastname]) + '"') | |||
|
|
130 | else | |||
|
|
131 | @name ||= eval('"' + (USER_FORMATS[Setting.user_format] || USER_FORMATS[:firstname_lastname]) + '"') | |||
|
|
132 | end | |||
| 129 | end |
|
133 | end | |
| 130 |
|
134 | |||
| 131 | def active? |
|
135 | def active? | |
General Comments 0
You need to be logged in to leave comments.
Login now