Rename Rss_Controller::__call to Rss_Controller::feed, which changes the feed

url to rss/feed/<feed name>/[<id>]
Where feed name is the name of the feed (i.e. albums, updates, comments, tags
etc.) and id is the optional element id that the feed applies to.

2 files changed, 5 insertions, 6 deletions

diff --git a/modules/rss/controllers/rss.php b/modules/rss/controllers/rss.php
index 164803cb..8cf083db 100644
--- a/modules/rss/controllers/rss.php
+++ b/modules/rss/controllers/rss.php
@@ -20,10 +20,9 @@
 class Rss_Controller extends Controller {
   public static $page_size = 30;
 
-  public function __call($method, $arguments) {
-    $id = empty($arguments) ? null : $arguments[0];
+  public function feed($method, $id=null) {
     $page = $this->input->get("page", 1);
-    $feed_uri = "rss/$method" . (empty($id) ? "" : "/$id");
+    $feed_uri = "rss/feed/$method" . (empty($id) ? "" : "/$id");
     if ($page < 1) {
       url::redirect($feed_uri);
     }
diff --git a/modules/rss/helpers/rss.php b/modules/rss/helpers/rss.php
index 1d30425f..3c278b49 100644
--- a/modules/rss/helpers/rss.php
+++ b/modules/rss/helpers/rss.php
@@ -21,11 +21,11 @@
 class rss_Core {
   static function item_feed($item) {
     $id = $item->is_album() ? $item->id : $item->parent_id;
-    return url::site("rss/albums/$id");
+    return url::site("rss/feed/albums/$id");
   }
 
   static function tag_feed($tag) {
-    return url::site("rss/tags/$tag->id}");
+    return url::site("rss/feed/tags/$tag->id}");
   }
 
   /**
@@ -40,7 +40,7 @@ class rss_Core {
           if ($sidebar_only && !$feed["sidebar"]) {
             continue;
           }
-          $feeds[$feed["description"]] = url::site("rss/{$feed['uri']}");
+          $feeds[$feed["description"]] = url::site("rss/feed/{$feed['uri']}");
         }
       }
     }