From 96df5916ad2cb29d81c6114d7345c4b3381e27c8 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@controlyourself.ca>
Date: Wed, 3 Dec 2008 12:32:25 -0500
Subject: [PATCH] change Action::init() to Action::prepare() to avoid conflict
 with RSS10Action::init()

darcs-hash:20081203173225-5ed1f-e5ebfb202ed4a84c90851d0faa025ad09774d2c3.gz
---
 actions/shownotice.php | 2 +-
 index.php              | 2 +-
 lib/action.php         | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/actions/shownotice.php b/actions/shownotice.php
index ca1b134977..a8f5060d24 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);
 
diff --git a/index.php b/index.php
index 5c16d2fd50..ae2e56f25c 100644
--- a/index.php
+++ b/index.php
@@ -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 16959c53a2..7a2461bb5c 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) {