Atom search results for Twitter-compatible API + phpcs stuff

[quix0rs-gnu-social.git] / actions / replies.php

diff --git a/actions/replies.php b/actions/replies.php
index 5777d17fd3266cb8b7105613ef4fa3836d1e7dd4..4ab9b14ed26be98187ee0949c0a2a4b3fac352c6 100644 (file)
--- a/actions/replies.php
+++ b/actions/replies.php
@@ -83,6 +83,8 @@ class RepliesAction extends Action
 
         $this->page = ($this->arg('page')) ? ($this->arg('page')+0) : 1;
 
+        common_set_returnto($this->selfUrl());
+
         return true;
     }
 
@@ -116,7 +118,7 @@ class RepliesAction extends Action
             return sprintf(_("Replies to %s"), $this->user->nickname);
         } else {
             return sprintf(_("Replies to %s, page %d"),
-                           $profile->nickname,
+                           $this->user->nickname,
                            $this->page);
         }
     }
@@ -127,16 +129,13 @@ class RepliesAction extends Action
      * @return void
      */
 
-    function showFeeds()
+    function getFeeds()
     {
         $rssurl   = common_local_url('repliesrss',
                                      array('nickname' => $this->user->nickname));
         $rsstitle = sprintf(_('Feed for replies to %s'), $this->user->nickname);
 
-        $this->element('link', array('rel' => 'alternate',
-                                     'href' => $rssurl,
-                                     'type' => 'application/rss+xml',
-                                     'title' => $rsstitle));
+        return array(new Feed(Feed::RSS1, $rssurl, $rsstitle));
     }
 
     /**
@@ -151,25 +150,6 @@ class RepliesAction extends Action
         $nav->show();
     }
 
-    /**
-     * Show the replies feed links
-     *
-     * @return void
-     */
-
-    function showExportData()
-    {
-        $fl = new FeedList($this);
-
-        $rssurl = common_local_url('repliesrss',
-                                   array('nickname' => $this->user->nickname));
-
-        $fl->show(array(0=>array('href'=> $rssurl,
-                                 'type' => 'rss',
-                                 'version' => 'RSS 1.0',
-                                 'item' => 'repliesrss')));
-    }
-
     /**
      * Show the content
      *