MERGE: リビジョン1817。派生クラスからsetParser()メソッドを基底クラスであるBaseActionsに移動

BaseActions::parse_parsedinclude()はBaseActions::$parserを利用するが、いくつかの派生クラスではこれがセットされなかった。基底クラスに移動することで、どのクラスでも利用可能にする。

Revision 1817:
CHANGE: move setParser() method from BaseActions-derived class to
BaseActions
BaseActions::parse_phpinclude() need parser object but
PageFactory/BodyActions has no parser object. This commit allows all
BaseActions-derived class to utilize <%phpinclude%> tag.
http://nucleuscms.svn.sourceforge.net/viewvc/nucleuscms?view=revision&revision=1817

diff --git a/nucleus/libs/ACTIONS.php b/nucleus/libs/ACTIONS.php
index 622d444..be4c10f 100644 (file)
--- a/nucleus/libs/ACTIONS.php
+++ b/nucleus/libs/ACTIONS.php
@@ -276,19 +276,6 @@ class Actions extends BaseActions
        }\r
        \r
        /**\r
-        * Actions::setParser()\r
-        * Set the parser\r
-        * \r
-        * @param       object  $parser an instance of Parser class\r
-        * @return      void\r
-        */\r
-       public function setParser(&$parser)\r
-       {\r
-               $this->parser =& $parser;\r
-               return;\r
-       }\r
-       \r
-       /**\r
         * Actions::doForm()\r
         * Forms get parsedincluded now, using an extra <formdata> skinvar\r
         *\r

diff --git a/nucleus/libs/BaseActions.php b/nucleus/libs/BaseActions.php
index e8a4a3e..00f6c2e 100644 (file)
--- a/nucleus/libs/BaseActions.php
+++ b/nucleus/libs/BaseActions.php
@@ -100,6 +100,19 @@ class BaseActions
        }
        
        /**
+        * BaseActions::setParser()
+        * Set the parser
+        * 
+        * @param       object  $parser an instance of Parser class
+        * @return      void
+        */
+       public function setParser(&$parser)
+       {
+               $this->parser =& $parser;
+               return;
+       }
+       
+       /**
         * BaseActions::parse_include()
         * include file (no parsing of php)
         * 

diff --git a/nucleus/libs/COMMENTACTIONS.php b/nucleus/libs/COMMENTACTIONS.php
index 4bed9d0..850772a 100644 (file)
--- a/nucleus/libs/COMMENTACTIONS.php
+++ b/nucleus/libs/COMMENTACTIONS.php
@@ -100,18 +100,6 @@ class CommentActions extends BaseActions
        }\r
        \r
        /**\r
-        * CommentActions::setParser()\r
-        * \r
-        * @param       object  $parser instance of Parser class\r
-        * @return      void\r
-        */\r
-       public function setParser(&$parser)\r
-       {\r
-               $this->parser =& $parser;\r
-               return;\r
-       }\r
-       \r
-       /**\r
         * \r
         * CommentActions::setCommentsObj()\r
         * \r

diff --git a/nucleus/libs/ITEMACTIONS.php b/nucleus/libs/ITEMACTIONS.php
index d676266..1a45013 100644 (file)
--- a/nucleus/libs/ITEMACTIONS.php
+++ b/nucleus/libs/ITEMACTIONS.php
@@ -154,18 +154,6 @@ class ItemActions extends BaseActions
        }\r
        \r
        /**\r
-        * ItemActions::setParser()\r
-        * \r
-        * @param       object  &$parser        instance of Parser class\r
-        * @return      void\r
-        */\r
-       public function setParser(&$parser)\r
-       {\r
-               $this->parser =& $parser;\r
-               return;\r
-       }\r
-       \r
-       /**\r
         * ItemActions::setCurrentItem()\r
         * \r
         * @param       object  $item   instance of Item class\r