summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Denhardt <ian@zenhack.net>2010-08-09 14:43:32 -0400
committerIan Denhardt <ian@zenhack.net>2010-08-09 14:43:32 -0400
commitd933ee7bad47aeb3267dd9c23633d3943478cfe1 (patch)
tree5c56412bf7eb1b665b3034d365b64f791f765021
parentdd17e32c85da4ba4ffbc6e56bf97b3e8ccc7ea9b (diff)
parentfd530a892fd969f8938d8f7300d348846e684d2f (diff)
Merge branch 'master' of git://gitorious.org/statusnet/mainline
-rw-r--r--lib/noticelist.php2
1 files changed, 1 insertions, 1 deletions
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'));