diff options
| author | Andy Staudacher <andy.st@gmail.com> | 2010-02-21 13:08:06 -0800 |
|---|---|---|
| committer | Andy Staudacher <andy.st@gmail.com> | 2010-02-21 13:08:06 -0800 |
| commit | be20309259de9310da3be703c93c4e42def2541b (patch) | |
| tree | 38ecbb4fe4183e65af79cd9fbdfae3d99b8cd4d3 /modules/user/models | |
| parent | cb57c3912aef6bed394a4693f94e9c97001aff34 (diff) | |
| parent | 1377b2c7b3110a132d4b2d748be72a6aafa537e6 (diff) | |
Merge commit 'upstream/master'
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; } /** |