Merge branch 'testing' into 0.9.x

diff --git a/lib/noticelist.php b/lib/noticelist.php
index 17adf3a49cdef86043c0c44b3970b9ed9143ecbc..252e1ca9002f9ad01a7d6ca89c0f11427781d0db 100644 (file)
--- 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'));