diff options
| author | Tim Almdal <tnalmdal@shaw.ca> | 2009-07-30 05:15:24 -0700 |
|---|---|---|
| committer | Tim Almdal <tnalmdal@shaw.ca> | 2009-07-30 05:15:24 -0700 |
| commit | 29f5a231c710dc1fb63a1ae06bbc985b9c459711 (patch) | |
| tree | c208f238ffb63a32dab7ca9c27a5e2ab805ce75b /modules/comment/models | |
| parent | 6f1da3aba426329eef312831365de29f89529d9f (diff) | |
| parent | 67d4ae21d5f7363f54782c23d2a7ff1d9e9f0505 (diff) | |
Merge branch 'master' of git@github.com:gallery/gallery3
Conflicts:
modules/gallery/models/item.php
Diffstat (limited to 'modules/comment/models')
| -rw-r--r-- | modules/comment/models/comment.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/modules/comment/models/comment.php b/modules/comment/models/comment.php index 551fb245..d052a39c 100644 --- a/modules/comment/models/comment.php +++ b/modules/comment/models/comment.php @@ -31,7 +31,7 @@ class Comment_Model extends ORM { if ($author->guest) { return $this->guest_name; } else { - return $author->full_name; + return $author->display_name(); } } |