diff options
| author | Tim Almdal <tnalmdal@shaw.ca> | 2010-02-19 11:36:31 -0800 |
|---|---|---|
| committer | Tim Almdal <tnalmdal@shaw.ca> | 2010-02-19 11:36:31 -0800 |
| commit | a6c3e8f0a26661afd353c75bea496532999f2ca5 (patch) | |
| tree | afe17933b4e8d8cb4e1005b967d7e785a5705e74 /modules/user/models | |
| parent | 74472dc83ca897423c630dce0d1d7e3b13bb0b5f (diff) | |
| parent | 643fffdba0e595e4e3c4777a52088f81bafded40 (diff) | |
Merge branch 'master' into talmdal_dev
Diffstat (limited to 'modules/user/models')
| -rw-r--r-- | modules/user/models/user.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/modules/user/models/user.php b/modules/user/models/user.php index aa752203..4404ee63 100644 --- a/modules/user/models/user.php +++ b/modules/user/models/user.php @@ -113,7 +113,7 @@ class User_Model extends ORM implements User_Definition { * @return string */ public function display_name() { - return empty($this->full_name) ? $this->name : t($this->full_name); + return empty($this->full_name) ? $this->name : $this->full_name; } /** |