From: Mikael Nordfeldth Date: Tue, 7 Jul 2015 17:34:42 +0000 (+0200) Subject: prepare and handle function to match parents X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=acdcb2ad8d5b68d7405b8250faf8c80977934f16;p=quix0rs-gnu-social.git prepare and handle function to match parents --- 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 . */ -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(); }