From f8b5cdaefa1c670f2b38df0c289a54ba107278d8 Mon Sep 17 00:00:00 2001
From: reine <reine@users.sourceforge.jp>
Date: Tue, 17 Apr 2012 20:52:22 +0900
Subject: [PATCH] =?utf8?q?BaseActions::initialize()=E3=82=92=E3=82=B3?=
 =?utf8?q?=E3=83=B3=E3=82=B9=E3=83=88=E3=83=A9=E3=82=AF=E3=82=BF=E3=81=AB?=
 =?utf8?q?=E5=A4=89=E6=9B=B4=E3=80=82=E5=90=88=E3=82=8F=E3=81=9B=E3=81=A6i?=
 =?utf8?q?nitialize()=E3=82=92=E5=91=BC=E3=81=B3=E5=87=BA=E3=81=97?=
 =?utf8?q?=E3=81=A6=E3=81=84=E3=82=8B=E7=B6=99=E6=89=BF=E3=82=AF=E3=83=A9?=
 =?utf8?q?=E3=82=B9=E3=81=AE=E3=82=B3=E3=83=B3=E3=82=B9=E3=83=88=E3=83=A9?=
 =?utf8?q?=E3=82=AF=E3=82=BF=E3=81=8B=E3=82=89parent::=5F=5Fconstructor()?=
 =?utf8?q?=E3=82=92=E5=91=BC=E3=81=B3=E5=87=BA=E3=81=99=E3=82=88=E3=81=86?=
 =?utf8?q?=E3=81=AB=E4=BF=AE=E6=AD=A3=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 nucleus/libs/ACTIONS.php        | 5 +++--
 nucleus/libs/BODYACTIONS.php    | 2 +-
 nucleus/libs/BaseActions.php    | 4 ++--
 nucleus/libs/COMMENTACTIONS.php | 2 +-
 nucleus/libs/ITEMACTIONS.php    | 4 ++--
 nucleus/libs/PAGEFACTORY.php    | 4 ++--
 6 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/nucleus/libs/ACTIONS.php b/nucleus/libs/ACTIONS.php
index 4a86b41..4d9f440 100644
--- a/nucleus/libs/ACTIONS.php
+++ b/nucleus/libs/ACTIONS.php
@@ -258,10 +258,11 @@ class Actions extends BaseActions
 	 */
 	public function __construct($type)
 	{
+		// call constructor of superclass first
+		parent::__construct();
+		
 		global $catid;
 		
-		// call constructor of superclass first
-		$this->initialize();
 		$this->skintype = $type;
 		
 		if ( $catid )
diff --git a/nucleus/libs/BODYACTIONS.php b/nucleus/libs/BODYACTIONS.php
index b04639c..6a5230f 100644
--- a/nucleus/libs/BODYACTIONS.php
+++ b/nucleus/libs/BODYACTIONS.php
@@ -45,7 +45,7 @@ class BodyActions extends BaseActions
 	 */
 	public function __construct()
 	{
-		$this->initialize();	
+		parent::__construct();	
 		return;
 	}
 	
diff --git a/nucleus/libs/BaseActions.php b/nucleus/libs/BaseActions.php
index 8346046..10c1b51 100644
--- a/nucleus/libs/BaseActions.php
+++ b/nucleus/libs/BaseActions.php
@@ -53,10 +53,10 @@ class BaseActions
 	private $aHighlight;
 	
 	/**
-	 * BaseActions::BaseActions()
+	 * BaseActions::__construct()
 	 *  Constructor for a new BaseAction object
 	 */
-	protected function initialize()
+	protected function __construct()
 	{
 		$this->level = 0;
 		
diff --git a/nucleus/libs/COMMENTACTIONS.php b/nucleus/libs/COMMENTACTIONS.php
index 9354deb..65ca1e8 100644
--- a/nucleus/libs/COMMENTACTIONS.php
+++ b/nucleus/libs/COMMENTACTIONS.php
@@ -91,7 +91,7 @@ class CommentActions extends BaseActions
 	public function __construct(&$comments)
 	{
 		// call constructor of superclass first
-		$this->initialize();
+		parent::__construct();
 		
 		// reference to the comments object
 		$this->setCommentsObj($comments);
diff --git a/nucleus/libs/ITEMACTIONS.php b/nucleus/libs/ITEMACTIONS.php
index 58ab008..8059aaf 100644
--- a/nucleus/libs/ITEMACTIONS.php
+++ b/nucleus/libs/ITEMACTIONS.php
@@ -122,10 +122,10 @@ class ItemActions extends BaseActions
 	 */
 	public function __construct(&$blog)
 	{
-		global $catid, $member;
 		// call constructor of superclass first
-		$this->initialize();
+		parent::__construct();
 		
+		global $catid, $member;
 		// extra parameters for created links
 		if ( $catid )
 		{
diff --git a/nucleus/libs/PAGEFACTORY.php b/nucleus/libs/PAGEFACTORY.php
index a716f89..2657143 100644
--- a/nucleus/libs/PAGEFACTORY.php
+++ b/nucleus/libs/PAGEFACTORY.php
@@ -98,9 +98,9 @@ class PageFactory extends BaseActions
 	 */
 	public function __construct($blog_id)
 	{
-		global $manager;
+		parent::__construct();
 		
-		parent::initialize();
+		global $manager;
 		
 		$this->blog =& $manager->getBlog($blog_id);
 		
-- 
2.11.0