From 08db7c318478fcc676f01b356283eefe35f2ee59 Mon Sep 17 00:00:00 2001
From: sakamocchi <o-takashi@sakamocchi.jp>
Date: Thu, 3 May 2012 11:49:15 +0900
Subject: [PATCH] =?utf8?q?MERGE:=20=E3=83=AA=E3=83=93=E3=82=B8=E3=83=A7?=
 =?utf8?q?=E3=83=B31817=E3=80=82=E6=B4=BE=E7=94=9F=E3=82=AF=E3=83=A9?=
 =?utf8?q?=E3=82=B9=E3=81=8B=E3=82=89setParser()=E3=83=A1=E3=82=BD?=
 =?utf8?q?=E3=83=83=E3=83=89=E3=82=92=E5=9F=BA=E5=BA=95=E3=82=AF=E3=83=A9?=
 =?utf8?q?=E3=82=B9=E3=81=A7=E3=81=82=E3=82=8BBaseActions=E3=81=AB?=
 =?utf8?q?=E7=A7=BB=E5=8B=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

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
---
 nucleus/libs/ACTIONS.php        | 13 -------------
 nucleus/libs/BaseActions.php    | 13 +++++++++++++
 nucleus/libs/COMMENTACTIONS.php | 12 ------------
 nucleus/libs/ITEMACTIONS.php    | 12 ------------
 4 files changed, 13 insertions(+), 37 deletions(-)

diff --git a/nucleus/libs/ACTIONS.php b/nucleus/libs/ACTIONS.php
index addb469..c302f8d 100644
--- a/nucleus/libs/ACTIONS.php
+++ b/nucleus/libs/ACTIONS.php
@@ -276,19 +276,6 @@ class Actions extends BaseActions
 	}
 	
 	/**
-	 * Actions::setParser()
-	 * Set the parser
-	 * 
-	 * @param	object	$parser	an instance of Parser class
-	 * @return	void
-	 */
-	public function setParser(&$parser)
-	{
-		$this->parser =& $parser;
-		return;
-	}
-	
-	/**
 	 * Actions::doForm()
 	 * Forms get parsedincluded now, using an extra <formdata> skinvar
 	 *
diff --git a/nucleus/libs/BaseActions.php b/nucleus/libs/BaseActions.php
index e8a4a3e..00f6c2e 100644
--- 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 9c50ece..7bd116a 100644
--- a/nucleus/libs/COMMENTACTIONS.php
+++ b/nucleus/libs/COMMENTACTIONS.php
@@ -100,18 +100,6 @@ class CommentActions extends BaseActions
 	}
 	
 	/**
-	 * CommentActions::setParser()
-	 * 
-	 * @param	object	$parser	instance of Parser class
-	 * @return	void
-	 */
-	public function setParser(&$parser)
-	{
-		$this->parser =& $parser;
-		return;
-	}
-	
-	/**
 	 * 
 	 * CommentActions::setCommentsObj()
 	 * 
diff --git a/nucleus/libs/ITEMACTIONS.php b/nucleus/libs/ITEMACTIONS.php
index f6dbfaf..d2fd5c1 100644
--- a/nucleus/libs/ITEMACTIONS.php
+++ b/nucleus/libs/ITEMACTIONS.php
@@ -155,18 +155,6 @@ class ItemActions extends BaseActions
 	}
 	
 	/**
-	 * ItemActions::setParser()
-	 * 
-	 * @param	object	&$parser	instance of Parser class
-	 * @return	void
-	 */
-	public function setParser(&$parser)
-	{
-		$this->parser =& $parser;
-		return;
-	}
-	
-	/**
 	 * ItemActions::setCurrentItem()
 	 * 
 	 * @param	object	$item	instance of Item class
-- 
2.11.0