From e5793b5b2680cba14dda6bd0242b262baa0d00a6 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Fri, 12 Jun 2009 06:58:53 -0700
Subject: Change the "request_feed_links" eventing handling so that individual
 modules provide the part of the url (the suffix) that they are interested in
 and the rss module will format the rest of the url.

---
 modules/comment/helpers/comment_event.php | 4 ++--
 modules/gallery/helpers/gallery_event.php | 2 +-
 modules/rss/helpers/rss_theme.php         | 4 +++-
 3 files changed, 6 insertions(+), 4 deletions(-)

(limited to 'modules')

diff --git a/modules/comment/helpers/comment_event.php b/modules/comment/helpers/comment_event.php
index 6370e27d..fdf3a96f 100644
--- a/modules/comment/helpers/comment_event.php
+++ b/modules/comment/helpers/comment_event.php
@@ -23,8 +23,8 @@ class comment_event_Core {
   }
 
   static function request_feed_links($event_data) {
-    $event_data->feeds[t("All new comments")] = url::site("rss/comments");
+    $event_data->feeds[t("All new comments")] = "comments";
     $event_data->feeds[sprintf(t("Comments on %s"), $event_data->item->title)] =
-      url::site("rss/comments/{$event_data->item->id}");
+      "comments/{$event_data->item->id}";
   }
 }
diff --git a/modules/gallery/helpers/gallery_event.php b/modules/gallery/helpers/gallery_event.php
index b652d9a4..b1e9332d 100644
--- a/modules/gallery/helpers/gallery_event.php
+++ b/modules/gallery/helpers/gallery_event.php
@@ -45,6 +45,6 @@ class gallery_event_Core {
   }
 
   static function request_feed_links($event_data) {
-    $event_data->feeds[t("New photos or movies")] = url::site("rss/updates");
+    $event_data->feeds[t("New photos or movies")] = url::site("updates");
   }
 }
diff --git a/modules/rss/helpers/rss_theme.php b/modules/rss/helpers/rss_theme.php
index b433c66a..2e4e141b 100644
--- a/modules/rss/helpers/rss_theme.php
+++ b/modules/rss/helpers/rss_theme.php
@@ -40,7 +40,9 @@ class rss_theme_Core {
     $event_data->feeds = array();
     $event_data->item = $theme->item();
     module::event("request_feed_links", $event_data);
-    
+    foreach ($event_data->feeds as $key => $feed) {
+      $event_data->feeds[$key] = url::site("rss/$feed");
+    }
     $block = new Block();
     $block->css_id = "gRss";
     $block->title = t("Available RSS Feeds");
-- 
cgit v1.2.3