Merge branch 'skinnable-master'

[nucleus-jp/nucleus-next.git] / nucleus / libs / PARSER.php

diff --git a/nucleus/libs/PARSER.php b/nucleus/libs/PARSER.php
index c23d297..79f372e 100644 (file)
--- 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
                {