X-Git-Url: http://git.osdn.net/view?p=nucleus-jp%2Fnucleus-next.git;a=blobdiff_plain;f=nucleus%2Flibs%2FPARSER.php;fp=nucleus%2Flibs%2FPARSER.php;h=79f372ed1bd7351e7f85f6127793afe61eefc2c7;hp=c23d297cf4542bdd49c2b57cc62284a6c75c4689;hb=c90b0980cfa3e79cd4bc7eed551a64a5e2b02a5c;hpb=fe4e862f6b23596d657c5228588785dfe537fb8f

diff --git a/nucleus/libs/PARSER.php b/nucleus/libs/PARSER.php
index c23d297..79f372e 100644
--- a/nucleus/libs/PARSER.php
+++ b/nucleus/libs/PARSER.php
@@ -12,7 +12,11 @@
 /**
  * @license http://nucleuscms.org/license.txt GNU General Public License
  * @copyright Copyright (C) 2002-2009 The Nucleus Group
+<<<<<<< HEAD
  * @version $Id: PARSER.php 1757 2012-04-15 09:02:32Z sakamocchi $
+=======
+ * @version $Id: PARSER.php 1879 2012-06-17 07:45:09Z sakamocchi $
+>>>>>>> skinnable-master
  */
 
 if ( !function_exists('requestVar') )
@@ -62,8 +66,11 @@ class Parser
 		$this->pdelim	=  $pdelim;
 		$this->norestrictions = 0;	// set this to 1 to disable checking for allowedActions
 		
+<<<<<<< HEAD
 		$this->skin		= NULL;
 		
+=======
+>>>>>>> skinnable-master
 		$handler->setParser($this);
 		
 		return;
@@ -137,7 +144,11 @@ class Parser
 		
 		if ( in_array($actionlc, $this->actions) || $this->norestrictions )
 		{
+<<<<<<< HEAD
 			call_user_func_array(array(&$this->handler, "parse_{$actionlc}"), $params);
+=======
+			call_user_func_array(array($this->handler, "parse_{$actionlc}"), $params);
+>>>>>>> skinnable-master
 		}
 		else
 		{