improved feed presentation

1 files changed, 4 insertions, 4 deletions

diff --git a/lib/news.php b/lib/news.php
index 90effbb22..601785770 100644
--- a/lib/news.php
+++ b/lib/news.php
@@ -136,7 +136,7 @@ function show_feed($locale, $news_title, $link, $feed, $count = 5, $skip = null,
 
         if ($split && strpos($d['title'], ') : ') !== false) {
             $title  = explode(') : ', $d['title']);
-            $source = ' / ' . array_shift($title) . ')';
+            $source = array_shift($title) . '): ';
             $source = (is_null($date_separator) ? $source : null);
             $title  = implode(' : ', $title);
         } else {
@@ -144,14 +144,14 @@ function show_feed($locale, $news_title, $link, $feed, $count = 5, $skip = null,
             $source = null;
         }
 
-        $s .= sprintf('<li>%s<a href="%s">%s</a> %s<span class="dt">%s</span></li>',
-            $discrete_title, $d['link'], $title, $date_separator, news_date($d['date'], $locale));
+        $s .= sprintf('<li>%s<a href="%s">%s%s</a> %s<span class="dt">%s</span></li>',
+            $discrete_title, $d['link'], $source, $title, $date_separator, news_date($d['date'], $locale));
         $discrete_title = null;
     }
     $s .= '</ul>';
 
     if (is_null($date_separator)) {
-        $header = sprintf('<h2><a href="%s">%s%s</a></h2>', $link, $news_title, $source);
+        $header = sprintf('<h2><a href="%s">%s</a></h2>', $link, $news_title);
     }
 
     $s  = $header . $s;