Merge branch 'master' of git@github.com:gallery/gallery3

1 files changed, 2 insertions, 10 deletions

diff --git a/modules/rss/helpers/rss_theme.php b/modules/rss/helpers/rss_theme.php
index 54bba210..b82133bd 100644
--- a/modules/rss/helpers/rss_theme.php
+++ b/modules/rss/helpers/rss_theme.php
@@ -40,16 +40,8 @@ class rss_theme_Core {
     $block->css_id = "gRss";
     $block->title = t("Available RSS Feeds");
     $block->content = new View("rss_block.html");
-    // @todo consider pushing the code for the feeds back to the associated modules
-    // and create an event 'generate_rss_feeds' that modules can respond to create
-    // the list of feeds.
-    $feeds = array(t("New photos or movies") => url::site("rss/updates"));
-    if (module::is_active("comment")) {
-      $feeds[t("All new comments")] = url::site("rss/comments");
-      $feeds[sprintf(t("Comments on %s"), $theme->item()->title)] =
-        url::site("rss/comments/{$theme->item()->id}");
-    }
-    $block->content->feeds = $feeds;
+    $block->content->feeds = rss::get_feeds($theme->item());
+
     return $block;
   }
 }