From acdcb2ad8d5b68d7405b8250faf8c80977934f16 Mon Sep 17 00:00:00 2001
From: Mikael Nordfeldth <mmn@hethane.se>
Date: Tue, 7 Jul 2015 19:34:42 +0200
Subject: [PATCH] prepare and handle function to match parents

---
 actions/userrss.php | 4 ++--
 lib/rssaction.php   | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/actions/userrss.php b/actions/userrss.php
index 308db94891..fe4ae155a3 100644
--- a/actions/userrss.php
+++ b/actions/userrss.php
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
+if (!defined('GNUSOCIAL')) { exit(1); }
 
 require_once(INSTALLDIR.'/lib/rssaction.php');
 
@@ -27,7 +27,7 @@ class UserrssAction extends Rss10Action
 {
     var $tag  = null;
 
-    function prepare($args)
+    protected function prepare(array $args=array())
     {
         parent::prepare($args);
         $nickname   = $this->trimmed('nickname');
diff --git a/lib/rssaction.php b/lib/rssaction.php
index c3e1283fed..bb4fa12b74 100644
--- a/lib/rssaction.php
+++ b/lib/rssaction.php
@@ -75,7 +75,7 @@ class Rss10Action extends Action
      * @return boolean success
      */
 
-    function prepare($args)
+    protected function prepare(array $args=array())
     {
         parent::prepare($args);
 
@@ -120,10 +120,10 @@ class Rss10Action extends Action
      * @return void
      */
 
-    function handle($args)
+    protected function handle()
     {
         // Parent handling, including cache check
-        parent::handle($args);
+        parent::handle();
         $this->showRss();
     }