diff options
| -rw-r--r-- | actions/shownotice.php | 2 | ||||
| -rw-r--r-- | index.php | 2 | ||||
| -rw-r--r-- | lib/action.php | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/actions/shownotice.php b/actions/shownotice.php index ca1b13497..a8f5060d2 100644 --- a/actions/shownotice.php +++ b/actions/shownotice.php @@ -27,7 +27,7 @@ class ShownoticeAction extends StreamAction { var $profile = NULL; var $avatar = NULL; - function init($args) { + function prepare($args) { parent::init($args); @@ -52,7 +52,7 @@ if (file_exists($actionfile)) { } $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); } } else { diff --git a/lib/action.php b/lib/action.php index 16959c53a..7a2461bb5 100644 --- a/lib/action.php +++ b/lib/action.php @@ -28,7 +28,7 @@ class Action { // lawsuit # For initializing members of the class - function init($argarray) { + function prepare($argarray) { $this->args =& common_copy_args($argarray); return true; } @@ -61,7 +61,7 @@ class Action { // lawsuit 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) { |