diff options
| author | Brion Vibber <brion@status.net> | 2010-08-05 10:56:49 -0700 |
|---|---|---|
| committer | Brion Vibber <brion@status.net> | 2010-08-05 10:56:49 -0700 |
| commit | 77a96e3d7cecd5fd61ad72b698a15a8a3c7b0940 (patch) | |
| tree | e7ab2aaf70f19d22136057741ea8dfc97897dd73 /lib | |
| parent | a44641bdb692c4bcf03d9dea07773ac1511dd8da (diff) | |
| parent | fd530a892fd969f8938d8f7300d348846e684d2f (diff) | |
Merge branch 'master' into testing
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/apiaction.php | 2 | ||||
| -rw-r--r-- | lib/noticelist.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/apiaction.php b/lib/apiaction.php index 7868ecab1..479a86ad8 100644 --- a/lib/apiaction.php +++ b/lib/apiaction.php @@ -27,7 +27,7 @@ * @author Jeffery To <jeffery.to@gmail.com> * @author Toby Inkster <mail@tobyinkster.co.uk> * @author Zach Copley <zach@status.net> - * @copyright 2009 StatusNet, Inc. + * @copyright 2009-2010 StatusNet, Inc. * @copyright 2009 Free Software Foundation, Inc http://www.fsf.org * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 * @link http://status.net/ diff --git a/lib/noticelist.php b/lib/noticelist.php index 17adf3a49..252e1ca90 100644 --- a/lib/noticelist.php +++ b/lib/noticelist.php @@ -499,7 +499,7 @@ class NoticeListItem extends Widget $ns = $this->notice->getSource(); if ($ns) { - $source_name = _($ns->code); + $source_name = (empty($ns->name)) ? _($ns->code) : _($ns->name); $this->out->text(' '); $this->out->elementStart('span', 'source'); $this->out->text(_('from')); |