BaseActions::initialize()をコンストラクタに変更。合わせてinitialize()を呼び出している継承クラスのコンストラクタからparent...

diff --git a/nucleus/libs/ACTIONS.php b/nucleus/libs/ACTIONS.php
index 4a86b41..4d9f440 100644 (file)
--- 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 (file)
--- 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 (file)
--- 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 (file)
--- 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 (file)
--- 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 (file)
--- 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);