Merge branch '0.9.x'

This commit is contained in:
Brion Vibber 2010-08-11 18:55:12 -07:00
commit 78eea352b4

View File

@ -499,7 +499,7 @@ class NoticeListItem extends Widget
$ns = $this->notice->getSource();
if ($ns) {
$source_name = (empty($ns->name)) ? _($ns->code) : _($ns->name);
$source_name = (empty($ns->name)) ? ($ns->code ? _($ns->code) : _('web')) : _($ns->name);
$this->out->text(' ');
$this->out->elementStart('span', 'source');
// FIXME: probably i18n issue. If "from" is followed by text, that should be a parameter to "from" (from %s).