prepare and handle function to match parents

diff --git a/actions/userrss.php b/actions/userrss.php
index 308db948918c079a9d4a1ce63463840c3b564a82..fe4ae155a33f2d97d67a9a9c8f198b9a2090c408 100644 (file)
--- 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 c3e1283fed0d2c90a472cbfa8239793da52f56ea..bb4fa12b74f63ead117d254591ff73637648ca7d 100644 (file)
--- 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();
     }