From 1272d0837eeefb96af69bbb24a93b05cc818837f Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Thu, 11 Jun 2009 00:44:34 -0700
Subject: Changed rss_theme::sidebar_blocks to fire the event
 "request_feed_links" to allow modules to contribute rss feed links to the rss
 sidebar block. Ticket #388.

---
 modules/rss/helpers/rss_theme.php | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

(limited to 'modules/rss/helpers/rss_theme.php')

diff --git a/modules/rss/helpers/rss_theme.php b/modules/rss/helpers/rss_theme.php
index 54bba210..185d9d45 100644
--- a/modules/rss/helpers/rss_theme.php
+++ b/modules/rss/helpers/rss_theme.php
@@ -43,13 +43,12 @@ class rss_theme_Core {
     // @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;
+    $event_data = new stdClass();
+    $event_data->feeds = array();
+    $event_data->item = $theme->item();
+
+    module::event("request_feed_links", $event_data);
+    $block->content->feeds = $event_data->feeds;
     return $block;
   }
 }
-- 
cgit v1.2.3


From 4877f968b4d92c69e2fbecef6c6b1666b8af67f8 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Thu, 11 Jun 2009 00:48:32 -0700
Subject: Rearrange the code in sidebar_block to logically group the code for
 readability.

---
 modules/rss/helpers/rss_theme.php | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

(limited to 'modules/rss/helpers/rss_theme.php')

diff --git a/modules/rss/helpers/rss_theme.php b/modules/rss/helpers/rss_theme.php
index 185d9d45..b433c66a 100644
--- a/modules/rss/helpers/rss_theme.php
+++ b/modules/rss/helpers/rss_theme.php
@@ -36,19 +36,17 @@ class rss_theme_Core {
       return;
     }
 
-    $block = new Block();
-    $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.
     $event_data = new stdClass();
     $event_data->feeds = array();
     $event_data->item = $theme->item();
-
     module::event("request_feed_links", $event_data);
+    
+    $block = new Block();
+    $block->css_id = "gRss";
+    $block->title = t("Available RSS Feeds");
+    $block->content = new View("rss_block.html");
     $block->content->feeds = $event_data->feeds;
+
     return $block;
   }
 }
-- 
cgit v1.2.3