trac #1142 fix tag rss

diff --git a/actions/tagrss.php b/actions/tagrss.php
index b4c2dcdff72135aab2f5c3d395d1b8596eab9d1c..a77fa12c984c5a00b18037664eaa0565db15564e 100644 (file)
--- a/actions/tagrss.php
+++ b/actions/tagrss.php
@@ -25,12 +25,12 @@ require_once(INSTALLDIR.'/lib/rssaction.php');
 
 class TagrssAction extends Rss10Action
 {
+    var $tag;
 
-    function init()
-    {
-        $tag = $this->trimmed('tag');
+    function prepare($args) {
+        parent::prepare($args);
+        $tag = common_canonical_tag($this->trimmed('tag'));
         $this->tag = Notice_tag::staticGet('tag', $tag);
-
         if (!$this->tag) {
             $this->clientError(_('No such tag.'));
             return false;
@@ -39,7 +39,7 @@ class TagrssAction extends Rss10Action
         }
     }
 
-    function get_notices($limit=0)
+    function getNotices($limit=0)
     {
         $tag = $this->tag;
 
@@ -48,7 +48,6 @@ class TagrssAction extends Rss10Action
         }
 
         $notice = Notice_tag::getStream($tag->tag, 0, ($limit == 0) ? NOTICES_PER_PAGE : $limit);
-
         while ($notice->fetch()) {
             $notices[] = clone($notice);
         }
@@ -56,10 +55,9 @@ class TagrssAction extends Rss10Action
         return $notices;
     }
 
-    function get_channel()
+    function getChannel()
     {
-        $tag = $this->tag->tag;
-
+        $tagname = $this->tag->tag;
         $c = array('url' => common_local_url('tagrss', array('tag' => $tagname)),
                'title' => $tagname,
                'link' => common_local_url('tagrss', array('tag' => $tagname)),

diff --git a/lib/util.php b/lib/util.php
index 579f964acab34ac7c248dddb607a377c2e109ad7..cbff35a9d68ec9ae78020494e0e78a3ce40baa1c 100644 (file)
--- a/lib/util.php
+++ b/lib/util.php
@@ -736,6 +736,8 @@ function common_fancy_url($action, $args=null)
         return common_path("api/statuses/public_timeline.atom");
      case 'publicxrds':
         return common_path('xrds');
+     case 'tagrss':
+        return common_path('tag/' . $args['tag'] . '/rss');
      case 'featuredrss':
         return common_path('featuredrss');
      case 'favoritedrss':