Merge branch 'master' of git://gitorious.org/statusnet/mainline

This commit is contained in:
Ian Denhardt 2010-08-09 14:43:32 -04:00
commit d933ee7bad

View File

@ -499,7 +499,7 @@ class NoticeListItem extends Widget
$ns = $this->notice->getSource(); $ns = $this->notice->getSource();
if ($ns) { if ($ns) {
$source_name = _($ns->code); $source_name = (empty($ns->name)) ? _($ns->code) : _($ns->name);
$this->out->text(' '); $this->out->text(' ');
$this->out->elementStart('span', 'source'); $this->out->elementStart('span', 'source');
$this->out->text(_('from')); $this->out->text(_('from'));