diff options
author | Tim Almdal <tnalmdal@shaw.ca> | 2010-02-15 06:27:17 -0800 |
---|---|---|
committer | Tim Almdal <tnalmdal@shaw.ca> | 2010-02-15 06:27:17 -0800 |
commit | eb1cdd037646b3697b64753652669fa9e25a5c8e (patch) | |
tree | 2f9dd9bd70329d5997993eced0a9f94a80895b8a /modules/user/models/user.php | |
parent | e41a2d4e5226c45a5201df91ca6633a40b357630 (diff) | |
parent | 409121942590e12692eaf4e6e9e8b71bfe5ed60c (diff) |
Merge branch 'master' into talmdal_dev
Diffstat (limited to 'modules/user/models/user.php')
-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 4404ee63..aa752203 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 : $this->full_name; + return empty($this->full_name) ? $this->name : t($this->full_name); } /** |