diff options
| author | Chad Kieffer <ckieffer@gmail.com> | 2010-02-18 23:01:15 -0700 |
|---|---|---|
| committer | Chad Kieffer <ckieffer@gmail.com> | 2010-02-18 23:01:15 -0700 |
| commit | 3f021d3610a08e420402c1f05011dbecd17e835e (patch) | |
| tree | de4357fabaa48caad6c96c13e10b50e66b05a977 /modules/user/models | |
| parent | 2846d81171c7101e5015995f848d4cc3a9ddebf6 (diff) | |
| parent | 794660d73ee7749541057f8ffa67c3d211f0ceb3 (diff) | |
Merge branch 'master' of github.com:gallery/gallery3
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; } /** |