3 files changed, 18 insertions, 5 deletions

diff --git a/modules/comment/helpers/comment_rss.php b/modules/comment/helpers/comment_rss.php
index 26d98d21..cc4180bf 100644
--- a/modules/comment/helpers/comment_rss.php
+++ b/modules/comment/helpers/comment_rss.php
@@ -57,13 +57,19 @@ class comment_rss_Core {
               "thumb_height" => $item->thumb_height,
               "thumb_width" => $item->thumb_width,
               "item_uri" => url::abs_site("{$item->type}s/$item->id"),
-              "title" => html::purify($item->title),
+              "title" => (
+                ($item->id == item::root()->id) ?
+                html::purify($item->title) :
+                t("%site_title - %item_title",
+                  array("site_title" => item::root()->title,
+                        "item_title" => $item->title))),
               "author" => html::clean($comment->author_name())),
         ArrayObject::ARRAY_AS_PROPS);
     }
 
     $feed->max_pages = ceil($comments->count_all() / $limit);
-    $feed->title = htmlspecialchars(t("Recent Comments"));
+    $feed->title = html::purify(t("%site_title - Recent Comments",
+                                 array("site_title" => item::root()->title)));
     $feed->uri = url::abs_site("albums/" . (empty($id) ? "1" : $id));
     $feed->description = t("Recent comments");
 
diff --git a/modules/gallery/helpers/gallery_rss.php b/modules/gallery/helpers/gallery_rss.php
index bec34912..fb617934 100644
--- a/modules/gallery/helpers/gallery_rss.php
+++ b/modules/gallery/helpers/gallery_rss.php
@@ -40,7 +40,7 @@ class gallery_rss_Core {
         ->order_by("created", "DESC");
 
       $feed->max_pages = ceil($all_items->find_all()->count() / $limit);
-      $feed->title = t("Recent updates");
+      $feed->title = t("%site_title - Recent updates", array("site_title" => item::root()->title));
       $feed->description = t("Recent updates");
       return $feed;
 
@@ -53,7 +53,13 @@ class gallery_rss_Core {
         ->descendants($limit, $offset, array(array("type", "=", "photo")));
       $feed->max_pages = ceil(
         $item->viewable()->descendants_count(array(array("type", "=", "photo"))) / $limit);
-      $feed->title = html::purify($item->title);
+      if ($item->id == item::root()->id) {
+        $feed->title = html::purify($item->title);
+      } else {
+        $feed->title = t("%site_title - %item_title",
+                         array("site_title" => item::root()->title,
+                               "item_title" => $item->title));
+      }
       $feed->description = nl2br(html::purify($item->description));
 
       return $feed;
diff --git a/modules/tag/helpers/tag_rss.php b/modules/tag/helpers/tag_rss.php
index ea3865be..f60bd908 100644
--- a/modules/tag/helpers/tag_rss.php
+++ b/modules/tag/helpers/tag_rss.php
@@ -38,7 +38,8 @@ class tag_rss_Core {
       $feed = new stdClass();
       $feed->items = $tag->items($limit, $offset, "photo");
       $feed->max_pages = ceil($tag->count / $limit);
-      $feed->title = $tag->name;
+      $feed->title = t("%site_title - %tag_name",
+                       array("site_title" => item::root()->title, "tag_name" => $tag->name));
       $feed->description = t("Photos related to %tag_name", array("tag_name" => $tag->name));
 
       return $feed;