/**
* @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') )
$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;
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
{