GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

change Action::init() to Action::prepare() to avoid conflict with RSS10Action::init()

Browse Source 
darcs-hash:20081203173225-5ed1f-e5ebfb202ed4a84c90851d0faa025ad09774d2c3.gz
This commit is contained in:
Evan Prodromou 2008-12-03 12:32:25 -05:00
parent 54df7dcbbd
commit 96df5916ad
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
actions/shownotice.php
View File

@ -27,7 +27,7 @@ class ShownoticeAction extends StreamAction {
var $profile = NULL; var $profile = NULL;
var $avatar = NULL; var $avatar = NULL;
function init($args) { function prepare($args) {
parent::init($args); parent::init($args);

2
index.php
View File

@ -52,7 +52,7 @@ if (file_exists($actionfile)) {
} }
$config['db']['database'] = $mirror; $config['db']['database'] = $mirror;
} }
if (call_user_func(array($action_obj, 'init'), $_REQUEST)) { if (call_user_func(array($action_obj, 'prepare'), $_REQUEST)) {
call_user_func(array($action_obj, 'handle'), $_REQUEST); call_user_func(array($action_obj, 'handle'), $_REQUEST);
} }
} else { } else {

4
lib/action.php
View File

@ -28,7 +28,7 @@ class Action { // lawsuit
# For initializing members of the class # For initializing members of the class
function init($argarray) { function prepare($argarray) {
$this->args =& common_copy_args($argarray); $this->args =& common_copy_args($argarray);
return true; return true;
} }
@ -61,7 +61,7 @@ class Action { // lawsuit
return (is_string($arg)) ? trim($arg) : $arg; return (is_string($arg)) ? trim($arg) : $arg;
} }
# Note: argarray ignored, since it's now passed in in init() # Note: argarray ignored, since it's now passed in in prepare()
function handle($argarray=NULL) { function handle($argarray=NULL) {