diff --git a/libs/smarty/Smarty.class.php b/libs/smarty/Smarty.class.php
index 57b693cb6..82a87da8e 100644
--- a/libs/smarty/Smarty.class.php
+++ b/libs/smarty/Smarty.class.php
@@ -79,7 +79,7 @@ if (!defined('SMARTY_RESOURCE_DATE_FORMAT')) {
  */
 if (!class_exists('Smarty_Autoloader', false)) {
     if (!class_exists('Smarty_Internal_Data', true)) {
-        require_once 'autoloader.php';
+        require_once 'Autoloader.php';
         Smarty_Autoloader::registerBC();
     }
 }
@@ -111,21 +111,28 @@ class Smarty extends Smarty_Internal_TemplateBase
     /**
      * smarty version
      */
-    const SMARTY_VERSION = '3.1.22-dev/18';
+    const SMARTY_VERSION = '3.1.24';
 
     /**
      * define variable scopes
      */
     const SCOPE_LOCAL = 0;
+
     const SCOPE_PARENT = 1;
+
     const SCOPE_ROOT = 2;
+
     const SCOPE_GLOBAL = 3;
+
     /**
      * define caching modes
      */
     const CACHING_OFF = 0;
+
     const CACHING_LIFETIME_CURRENT = 1;
+
     const CACHING_LIFETIME_SAVED = 2;
+
     /**
      * define constant for clearing cache files be saved expiration datees
      */
@@ -135,29 +142,53 @@ class Smarty extends Smarty_Internal_TemplateBase
      * define compile check modes
      */
     const COMPILECHECK_OFF = 0;
+
     const COMPILECHECK_ON = 1;
+
     const COMPILECHECK_CACHEMISS = 2;
+
+    /**
+     * define debug modes
+     */
+    const DEBUG_OFF = 0;
+
+    const DEBUG_ON = 1;
+
+    const DEBUG_INDIVIDUAL = 2;
+
     /**
      * modes for handling of "<?php ... ?>" tags in templates.
      */
     const PHP_PASSTHRU = 0; //-> print tags as plain text
+
     const PHP_QUOTE = 1; //-> escape tags as entities
+
     const PHP_REMOVE = 2; //-> escape tags as entities
+
     const PHP_ALLOW = 3; //-> escape tags as entities
+
     /**
      * filter types
      */
     const FILTER_POST = 'post';
+
     const FILTER_PRE = 'pre';
+
     const FILTER_OUTPUT = 'output';
+
     const FILTER_VARIABLE = 'variable';
+
     /**
      * plugin types
      */
     const PLUGIN_FUNCTION = 'function';
+
     const PLUGIN_BLOCK = 'block';
+
     const PLUGIN_COMPILER = 'compiler';
+
     const PLUGIN_MODIFIER = 'modifier';
+
     const PLUGIN_MODIFIERCOMPILER = 'modifiercompiler';
 
     /**#@-*/
@@ -171,23 +202,29 @@ class Smarty extends Smarty_Internal_TemplateBase
      * error handler returned by set_error_hanlder() in Smarty::muteExpectedErrors()
      */
     public static $_previous_error_handler = null;
+
     /**
      * contains directories outside of SMARTY_DIR that are to be muted by muteExpectedErrors()
      */
-    public static $_muted_directories = array('./templates_c/' => null, './cache/' => null);
+    public static $_muted_directories = array('./templates_c/' => null,
+                                              './cache/'       => null);
+
     /**
      * Flag denoting if Multibyte String functions are available
      */
     public static $_MBSTRING = SMARTY_MBSTRING;
+
     /**
      * The character set to adhere to (e.g. "UTF-8")
      */
     public static $_CHARSET = SMARTY_RESOURCE_CHAR_SET;
+
     /**
      * The date format to be used internally
      * (accepts date() and strftime())
      */
     public static $_DATE_FORMAT = SMARTY_RESOURCE_DATE_FORMAT;
+
     /**
      * Flag denoting if PCRE should run in UTF-8 mode
      */
@@ -208,132 +245,154 @@ class Smarty extends Smarty_Internal_TemplateBase
      * @var boolean
      */
     public $auto_literal = true;
+
     /**
      * display error on not assigned variables
      *
      * @var boolean
      */
     public $error_unassigned = false;
+
     /**
      * look up relative filepaths in include_path
      *
      * @var boolean
      */
     public $use_include_path = false;
+
     /**
      * template directory
      *
      * @var array
      */
     private $template_dir = array('./templates/');
+
     /**
      * joined template directory string used in cache keys
      *
      * @var string
      */
     public $joined_template_dir = './templates/';
+
     /**
      * joined config directory string used in cache keys
      *
      * @var string
      */
     public $joined_config_dir = './configs/';
+
     /**
      * default template handler
      *
      * @var callable
      */
     public $default_template_handler_func = null;
+
     /**
      * default config handler
      *
      * @var callable
      */
     public $default_config_handler_func = null;
+
     /**
      * default plugin handler
      *
      * @var callable
      */
     public $default_plugin_handler_func = null;
+
     /**
      * compile directory
      *
      * @var string
      */
     private $compile_dir = './templates_c/';
+
     /**
      * plugins directory
      *
      * @var array
      */
     private $plugins_dir = null;
+
     /**
      * cache directory
      *
      * @var string
      */
     private $cache_dir = './cache/';
+
     /**
      * config directory
      *
      * @var array
      */
     private $config_dir = array('./configs/');
+
     /**
      * force template compiling?
      *
      * @var boolean
      */
     public $force_compile = false;
+
     /**
      * check template for modifications?
      *
      * @var boolean
      */
     public $compile_check = true;
+
     /**
      * use sub dirs for compiled/cached files?
      *
      * @var boolean
      */
     public $use_sub_dirs = false;
+
     /**
      * allow ambiguous resources (that are made unique by the resource handler)
      *
      * @var boolean
      */
     public $allow_ambiguous_resources = false;
+
     /**
      * merge compiled includes
      *
      * @var boolean
      */
     public $merge_compiled_includes = false;
+
     /**
      * template inheritance merge compiled includes
      *
      * @var boolean
      */
     public $inheritance_merge_compiled_includes = true;
+
     /**
      * force cache file creation
      *
      * @var boolean
      */
     public $force_cache = false;
+
     /**
      * template left-delimiter
      *
      * @var string
      */
     public $left_delimiter = "{";
+
     /**
      * template right-delimiter
      *
      * @var string
      */
     public $right_delimiter = "}";
+
     /**#@+
      * security
      */
@@ -345,24 +404,28 @@ class Smarty extends Smarty_Internal_TemplateBase
      * @see Smarty_Security
      */
     public $security_class = 'Smarty_Security';
+
     /**
      * implementation of security class
      *
      * @var Smarty_Security
      */
     public $security_policy = null;
+
     /**
      * controls handling of PHP-blocks
      *
      * @var integer
      */
     public $php_handling = self::PHP_PASSTHRU;
+
     /**
      * controls if the php template file resource is allowed
      *
      * @var bool
      */
     public $allow_php_templates = false;
+
     /**
      * Should compiled-templates be prevented from being called directly?
      * {@internal
@@ -372,6 +435,7 @@ class Smarty extends Smarty_Internal_TemplateBase
      * @var boolean
      */
     public $direct_access_security = true;
+
     /**#@-*/
     /**
      * debug mode
@@ -380,6 +444,7 @@ class Smarty extends Smarty_Internal_TemplateBase
      * @var boolean
      */
     public $debugging = false;
+
     /**
      * This determines if debugging is enable-able from the browser.
      * <ul>
@@ -390,6 +455,7 @@ class Smarty extends Smarty_Internal_TemplateBase
      * @var string
      */
     public $debugging_ctrl = 'NONE';
+
     /**
      * Name of debugging URL-param.
      * Only used when $debugging_ctrl is set to 'URL'.
@@ -398,12 +464,14 @@ class Smarty extends Smarty_Internal_TemplateBase
      * @var string
      */
     public $smarty_debug_id = 'SMARTY_DEBUG';
+
     /**
      * Path of debug template.
      *
      * @var string
      */
     public $debug_tpl = null;
+
     /**
      * When set, smarty uses this value as error_reporting-level.
      *
@@ -428,12 +496,14 @@ class Smarty extends Smarty_Internal_TemplateBase
      * @var boolean
      */
     public $config_overwrite = true;
+
     /**
      * Controls whether config values of on/true/yes and off/false/no get converted to boolean.
      *
      * @var boolean
      */
     public $config_booleanize = true;
+
     /**
      * Controls whether hidden config sections/vars are read from the file.
      *
@@ -453,12 +523,14 @@ class Smarty extends Smarty_Internal_TemplateBase
      * @var boolean
      */
     public $compile_locking = true;
+
     /**
      * Controls whether cache resources should emply locking mechanism
      *
      * @var boolean
      */
     public $cache_locking = false;
+
     /**
      * seconds to wait for acquiring a lock before ignoring the write lock
      *
@@ -475,6 +547,7 @@ class Smarty extends Smarty_Internal_TemplateBase
      * @var string
      */
     public $default_resource_type = 'file';
+
     /**
      * caching type
      * Must be an element of $cache_resource_types.
@@ -482,24 +555,28 @@ class Smarty extends Smarty_Internal_TemplateBase
      * @var string
      */
     public $caching_type = 'file';
+
     /**
      * internal config properties
      *
      * @var array
      */
     public $properties = array();
+
     /**
      * config type
      *
      * @var string
      */
     public $default_config_type = 'file';
+
     /**
      * cached template objects
      *
      * @var array
      */
     public $source_objects = array();
+
     /**
      * cached template objects
      *
@@ -513,126 +590,150 @@ class Smarty extends Smarty_Internal_TemplateBase
      * @var bool
      */
     public $resource_caching = false;
+
     /**
      * enable template resource caching
      *
      * @var bool
      */
     public $template_resource_caching = true;
+
     /**
      * check If-Modified-Since headers
      *
      * @var boolean
      */
     public $cache_modified_check = false;
+
     /**
      * registered plugins
      *
      * @var array
      */
     public $registered_plugins = array();
+
     /**
      * plugin search order
      *
      * @var array
      */
-    public $plugin_search_order = array('function', 'block', 'compiler', 'class');
+    public $plugin_search_order = array('function',
+                                        'block',
+                                        'compiler',
+                                        'class');
+
     /**
      * registered objects
      *
      * @var array
      */
     public $registered_objects = array();
+
     /**
      * registered classes
      *
      * @var array
      */
     public $registered_classes = array();
+
     /**
      * registered filters
      *
      * @var array
      */
     public $registered_filters = array();
+
     /**
      * registered resources
      *
      * @var array
      */
     public $registered_resources = array();
+
     /**
      * resource handler cache
      *
      * @var array
      */
     public $_resource_handlers = array();
+
     /**
      * registered cache resources
      *
      * @var array
      */
     public $registered_cache_resources = array();
+
     /**
      * cache resource handler cache
      *
      * @var array
      */
     public $_cacheresource_handlers = array();
+
     /**
      * autoload filter
      *
      * @var array
      */
     public $autoload_filters = array();
+
     /**
      * default modifier
      *
      * @var array
      */
     public $default_modifiers = array();
+
     /**
      * autoescape variable output
      *
      * @var boolean
      */
     public $escape_html = false;
+
     /**
      * global internal smarty vars
      *
      * @var array
      */
     public static $_smarty_vars = array();
+
     /**
      * start time for execution time calculation
      *
      * @var int
      */
     public $start_time = 0;
+
     /**
      * default file permissions
      *
      * @var int
      */
     public $_file_perms = 0644;
+
     /**
      * default dir permissions
      *
      * @var int
      */
     public $_dir_perms = 0771;
+
     /**
      * block tag hierarchy
      *
      * @var array
      */
     public $_tag_stack = array();
+
     /**
      * required by the compiler for BC
      *
      * @var string
      */
     public $_current_file = null;
+
     /**
      * internal flag to enable parser debugging
      *
@@ -651,7 +752,6 @@ class Smarty extends Smarty_Internal_TemplateBase
 
     /**
      * Initialize new Smarty object
-
      */
     public function __construct()
     {
@@ -679,8 +779,6 @@ class Smarty extends Smarty_Internal_TemplateBase
         } else {
             $this->setPluginsDir(SMARTY_PLUGINS_DIR);
         }
-
-        $this->debug_tpl = 'file:' . dirname(__FILE__) . '/debug.tpl';
         if (isset($_SERVER['SCRIPT_NAME'])) {
             Smarty::$global_tpl_vars['SCRIPT_NAME'] = new Smarty_Variable($_SERVER['SCRIPT_NAME']);
         }
@@ -1276,9 +1374,7 @@ class Smarty extends Smarty_Internal_TemplateBase
             }
         }
         if ($this->debugging) {
-            if ($this->debugging) {
-                Smarty_Internal_Debug::register_template($tpl);
-            }
+            Smarty_Internal_Debug::register_template($tpl);
         }
         return $tpl;
     }
@@ -1324,10 +1420,8 @@ class Smarty extends Smarty_Internal_TemplateBase
 
         // loop through plugin dirs and find the plugin
         foreach ($this->getPluginsDir() as $_plugin_dir) {
-            $names = array(
-                $_plugin_dir . $_plugin_filename,
-                $_plugin_dir . strtolower($_plugin_filename),
-            );
+            $names = array($_plugin_dir . $_plugin_filename,
+                           $_plugin_dir . strtolower($_plugin_filename),);
             foreach ($names as $file) {
                 if (isset($this->_is_file_cache[$file]) ? $this->_is_file_cache[$file] : $this->_is_file_cache[$file] = is_file($file)) {
                     require_once($file);
@@ -1584,13 +1678,11 @@ class Smarty extends Smarty_Internal_TemplateBase
      */
     public function __get($name)
     {
-        $allowed = array(
-            'template_dir' => 'getTemplateDir',
-            'config_dir'   => 'getConfigDir',
-            'plugins_dir'  => 'getPluginsDir',
-            'compile_dir'  => 'getCompileDir',
-            'cache_dir'    => 'getCacheDir',
-        );
+        $allowed = array('template_dir' => 'getTemplateDir',
+                         'config_dir'   => 'getConfigDir',
+                         'plugins_dir'  => 'getPluginsDir',
+                         'compile_dir'  => 'getCompileDir',
+                         'cache_dir'    => 'getCacheDir',);
 
         if (isset($allowed[$name])) {
             return $this->{$allowed[$name]}();
@@ -1609,13 +1701,11 @@ class Smarty extends Smarty_Internal_TemplateBase
      */
     public function __set($name, $value)
     {
-        $allowed = array(
-            'template_dir' => 'setTemplateDir',
-            'config_dir'   => 'setConfigDir',
-            'plugins_dir'  => 'setPluginsDir',
-            'compile_dir'  => 'setCompileDir',
-            'cache_dir'    => 'setCacheDir',
-        );
+        $allowed = array('template_dir' => 'setTemplateDir',
+                         'config_dir'   => 'setConfigDir',
+                         'plugins_dir'  => 'setPluginsDir',
+                         'compile_dir'  => 'setCompileDir',
+                         'cache_dir'    => 'setCacheDir',);
 
         if (isset($allowed[$name])) {
             $this->{$allowed[$name]}($value);
@@ -1645,10 +1735,8 @@ class Smarty extends Smarty_Internal_TemplateBase
         if (!isset(Smarty::$_muted_directories[SMARTY_DIR])) {
             $smarty_dir = realpath(SMARTY_DIR);
             if ($smarty_dir !== false) {
-                Smarty::$_muted_directories[SMARTY_DIR] = array(
-                    'file'   => $smarty_dir,
-                    'length' => strlen($smarty_dir),
-                );
+                Smarty::$_muted_directories[SMARTY_DIR] = array('file'   => $smarty_dir,
+                                                                'length' => strlen($smarty_dir),);
             }
         }
 
@@ -1662,10 +1750,8 @@ class Smarty extends Smarty_Internal_TemplateBase
                     unset(Smarty::$_muted_directories[$key]);
                     continue;
                 }
-                $dir = array(
-                    'file'   => $file,
-                    'length' => strlen($file),
-                );
+                $dir = array('file'   => $file,
+                             'length' => strlen($file),);
             }
             if (!strncmp($errfile, $dir['file'], $dir['length'])) {
                 $_is_muted_directory = true;
@@ -1707,7 +1793,8 @@ class Smarty extends Smarty_Internal_TemplateBase
                 - between file_exists() and filemtime() a possible race condition is opened,
                   which does not exist using the simple @filemtime() approach.
         */
-        $error_handler = array('Smarty', 'mutingErrorHandler');
+        $error_handler = array('Smarty',
+                               'mutingErrorHandler');
         $previous = set_error_handler($error_handler);
 
         // avoid dead loops
diff --git a/libs/smarty/SmartyBC.class.php b/libs/smarty/SmartyBC.class.php
index cec946746..76dd8bd0f 100644
--- a/libs/smarty/SmartyBC.class.php
+++ b/libs/smarty/SmartyBC.class.php
@@ -52,8 +52,6 @@ class SmartyBC extends Smarty
     public function __construct(array $options = array())
     {
         parent::__construct($options);
-        // register {php} tag
-        $this->registerPlugin('block', 'php', 'smarty_php_tag');
     }
 
     /**
@@ -115,10 +113,10 @@ class SmartyBC extends Smarty
     /**
      * Registers object to be used in templates
      *
-     * @param string  $object      name of template object
-     * @param object  $object_impl the referenced PHP object to register
-     * @param array   $allowed     list of allowed methods (empty = all)
-     * @param boolean $smarty_args smarty argument format, else traditional
+     * @param string  $object        name of template object
+     * @param object  $object_impl   the referenced PHP object to register
+     * @param array   $allowed       list of allowed methods (empty = all)
+     * @param boolean $smarty_args   smarty argument format, else traditional
      * @param array   $block_methods list of methods that are block format
      *
      * @throws SmartyException
@@ -448,20 +446,3 @@ class SmartyBC extends Smarty
         trigger_error("Smarty error: $error_msg", $error_type);
     }
 }
-
-/**
- * Smarty {php}{/php} block function
- *
- * @param array   $params   parameter list
- * @param string  $content  contents of the block
- * @param object  $template template object
- * @param boolean &$repeat  repeat flag
- *
- * @return string content re-formatted
- */
-function smarty_php_tag($params, $content, $template, &$repeat)
-{
-    eval($content);
-
-    return '';
-}
diff --git a/libs/smarty/debug.tpl b/libs/smarty/debug.tpl
index c414496ab..5b09c5bd2 100644
--- a/libs/smarty/debug.tpl
+++ b/libs/smarty/debug.tpl
@@ -105,7 +105,7 @@
     </head>
     <body>
 
-    <h1>Smarty Debug Console
+    <h1>Smarty {Smarty::SMARTY_VERSION} Debug Console
         -  {if isset($template_name)}{$template_name|debug_print_var nofilter} {/if}{if !empty($template_data)}Total Time {$execution_time|string_format:"%.5f"}{/if}</h1>
 
     {if !empty($template_data)}
@@ -126,11 +126,11 @@
     <table id="table_assigned_vars">
         {foreach $assigned_vars as $vars}
             <tr class="{if $vars@iteration % 2 eq 0}odd{else}even{/if}">
-                <td><h3><font color=blue>${$vars@key|escape:'html'}</font></h3>
+                <td><h3><font color=blue>${$vars@key}</font></h3>
                     {if isset($vars['nocache'])}<b>Nocache</b></br>{/if}
-                    {if isset($vars['scope'])}<b>Origin:</b> {$vars['scope']}{/if}
+                    {if isset($vars['scope'])}<b>Origin:</b> {$vars['scope']|debug_print_var:10:80 nofilter}{/if}
                 </td>
-                <td><h3>Value</h3>{$vars['value']|debug_print_var nofilter}</td>
+                <td><h3>Value</h3>{$vars['value']|debug_print_var:10:80 nofilter}</td>
                 <td>{if isset($vars['attributes'])}<h3>Attributes</h3>{$vars['attributes']|debug_print_var nofilter} {/if}</td>
          {/foreach}
     </table>
@@ -140,10 +140,10 @@
     <table id="table_config_vars">
         {foreach $config_vars as $vars}
             <tr class="{if $vars@iteration % 2 eq 0}odd{else}even{/if}">
-                <td><h3><font color=blue>#{$vars@key|escape:'html'}#</font></h3>
-                    {if isset($vars['scope'])}<b>Origin:</b> {$vars['scope']}{/if}
+                <td><h3><font color=blue>#{$vars@key}#</font></h3>
+                    {if isset($vars['scope'])}<b>Origin:</b> {$vars['scope']|debug_print_var:10:80 nofilter}{/if}
                 </td>
-                <td>{$vars['value']|debug_print_var nofilter}</td>
+                <td>{$vars['value']|debug_print_var:10:80 nofilter}</td>
             </tr>
         {/foreach}
 
@@ -153,8 +153,8 @@
 {/capture}
 <script type="text/javascript">
     {$id = ''}
-    {if $display_mode}{$id = $template_name|md5}{/if}
-    _smarty_console = window.open("", "console{$id}", "width=680,height=600,resizable,scrollbars=yes");
+    {if $display_mode}{$id = "$offset$template_name"|md5}{/if}
+    _smarty_console = window.open("", "console{$id}", "width=680,height=600,left={$offset},top={$offset},resizable,scrollbars=yes");
     _smarty_console.document.write("{$debug_output|escape:'javascript' nofilter}");
     _smarty_console.document.close();
 </script>
diff --git a/libs/smarty/plugins/outputfilter.trimwhitespace.php b/libs/smarty/plugins/outputfilter.trimwhitespace.php
index 62ab4e776..ad35d11a2 100644
--- a/libs/smarty/plugins/outputfilter.trimwhitespace.php
+++ b/libs/smarty/plugins/outputfilter.trimwhitespace.php
@@ -45,7 +45,7 @@ function smarty_outputfilter_trimwhitespace($source)
 
     // capture html elements not to be messed with
     $_offset = 0;
-    if (preg_match_all('#<(script|pre|textarea)[^>]*>.*?</\\1>#is', $source, $matches, PREG_OFFSET_CAPTURE | PREG_SET_ORDER)) {
+    if (preg_match_all('#(<script[^>]*>.*?</script[^>]*>)|(<textarea[^>]*>.*?</textarea[^>]*>)|(<pre[^>]*>.*?</pre[^>]*>)#is', $source, $matches, PREG_OFFSET_CAPTURE | PREG_SET_ORDER)) {
         foreach ($matches as $match) {
             $store[] = $match[0][0];
             $_length = strlen($match[0][0]);
@@ -62,7 +62,7 @@ function smarty_outputfilter_trimwhitespace($source)
         // can't remove them entirely, becaue that might break poorly implemented CSS display:inline-block elements
         '#(:SMARTY@!@|>)\s+(?=@!@SMARTY:|<)#s'                            => '\1 \2',
         // remove spaces between attributes (but not in attribute values!)
-        '#(([a-z0-9]\s*=\s*(["\'])[^\3]*?\3)|<[a-z0-9_]+)\s+([a-z/>])#is' => '\1 \4',
+        '#(([a-z0-9]\s*=\s*("[^"]*?")|(\'[^\']*?\'))|<[a-z0-9_]+)\s+([a-z/>])#is' => '\1 \5',
         // note: for some very weird reason trim() seems to remove spaces inside attributes.
         // maybe a \0 byte or something is interfering?
         '#^\s+<#Ss'                                                       => '<',
diff --git a/libs/smarty/sysplugins/smarty_cacheresource.php b/libs/smarty/sysplugins/smarty_cacheresource.php
index 87c8e340b..622ab6fbc 100644
--- a/libs/smarty/sysplugins/smarty_cacheresource.php
+++ b/libs/smarty/sysplugins/smarty_cacheresource.php
@@ -21,7 +21,7 @@ abstract class Smarty_CacheResource
      * @var array
      */
     protected static $sysplugins = array(
-        'file' => true,
+        'file' => 'smarty_internal_cacheresource_file.php',
     );
 
     /**
@@ -198,6 +198,9 @@ abstract class Smarty_CacheResource
         // try sysplugins dir
         if (isset(self::$sysplugins[$type])) {
             $cache_resource_class = 'Smarty_Internal_CacheResource_' . ucfirst($type);
+            if (!class_exists($cache_resource_class, false)) {
+                require SMARTY_SYSPLUGINS_DIR . self::$sysplugins[$type];
+            }
             return $smarty->_cacheresource_handlers[$type] = new $cache_resource_class();
         }
         // try plugins dir
diff --git a/libs/smarty/sysplugins/smarty_cacheresource_custom.php b/libs/smarty/sysplugins/smarty_cacheresource_custom.php
index 14309fb4c..f496c1523 100644
--- a/libs/smarty/sysplugins/smarty_cacheresource_custom.php
+++ b/libs/smarty/sysplugins/smarty_cacheresource_custom.php
@@ -84,8 +84,11 @@ abstract class Smarty_CacheResource_Custom extends Smarty_CacheResource
     {
         $_cache_id = isset($cached->cache_id) ? preg_replace('![^\w\|]+!', '_', $cached->cache_id) : null;
         $_compile_id = isset($cached->compile_id) ? preg_replace('![^\w\|]+!', '_', $cached->compile_id) : null;
-
-        $cached->filepath = sha1($cached->source->filepath . $_cache_id . $_compile_id);
+        $path = $cached->source->filepath . $_cache_id . $_compile_id;
+        $cached->filepath = sha1($path);
+        if ($_template->smarty->cache_locking) {
+            $cached->lock_id = sha1('lock.' . $path);
+        }
         $this->populateTimestamp($cached);
     }
 
@@ -179,9 +182,9 @@ abstract class Smarty_CacheResource_Custom extends Smarty_CacheResource
     public function readCachedContent(Smarty_Internal_Template $_template)
     {
         $content = $_template->cached->content ? $_template->cached->content : null;
-        $timestamp =  null;
+        $timestamp = null;
         if ($content === null) {
-            $timestamp =  null;
+            $timestamp = null;
             $this->fetch(
                 $_template->cached->filepath,
                 $_template->source->name,
@@ -266,15 +269,14 @@ abstract class Smarty_CacheResource_Custom extends Smarty_CacheResource
      */
     public function hasLock(Smarty $smarty, Smarty_Template_Cached $cached)
     {
-        $id = $cached->filepath;
+        $id = $cached->lock_id;
         $name = $cached->source->name . '.lock';
 
-        $mtime = $this->fetchTimestamp($id, $name, null, null);
+        $mtime = $this->fetchTimestamp($id, $name, $cached->cache_id, $cached->compile_id);
         if ($mtime === null) {
-            $this->fetch($id, $name, null, null, $content, $mtime);
+            $this->fetch($id, $name, $cached->cache_id, $cached->compile_id, $content, $mtime);
         }
-
-        return $mtime && time() - $mtime < $smarty->locking_timeout;
+        return $mtime && ($t = time()) - $mtime < $smarty->locking_timeout;
     }
 
     /**
@@ -288,10 +290,9 @@ abstract class Smarty_CacheResource_Custom extends Smarty_CacheResource
     public function acquireLock(Smarty $smarty, Smarty_Template_Cached $cached)
     {
         $cached->is_locked = true;
-
-        $id = $cached->filepath;
+        $id = $cached->lock_id;
         $name = $cached->source->name . '.lock';
-        $this->save($id, $name, null, null, $smarty->locking_timeout, '');
+        $this->save($id, $name, $cached->cache_id, $cached->compile_id, $smarty->locking_timeout, '');
     }
 
     /**
@@ -305,8 +306,7 @@ abstract class Smarty_CacheResource_Custom extends Smarty_CacheResource
     public function releaseLock(Smarty $smarty, Smarty_Template_Cached $cached)
     {
         $cached->is_locked = false;
-
         $name = $cached->source->name . '.lock';
-        $this->delete($name, null, null, null);
+        $this->delete($name, $cached->cache_id, $cached->compile_id, null);
     }
 }
diff --git a/libs/smarty/sysplugins/smarty_internal_cacheresource_file.php b/libs/smarty/sysplugins/smarty_internal_cacheresource_file.php
index cbb38e3ba..de794517a 100644
--- a/libs/smarty/sysplugins/smarty_internal_cacheresource_file.php
+++ b/libs/smarty/sysplugins/smarty_internal_cacheresource_file.php
@@ -61,8 +61,10 @@ class Smarty_Internal_CacheResource_File extends Smarty_CacheResource
             $cached->lock_id = $_lock_dir . sha1($_cache_id . $_compile_id . $_template->source->uid) . '.lock';
         }
         $cached->filepath = $_cache_dir . $_cache_id . $_compile_id . $_filepath . '.' . basename($_source_file_path) . '.php';
-        $cached->timestamp = @filemtime($cached->filepath);
-        $cached->exists = !!$cached->timestamp;
+        $cached->timestamp = $cached->exists = is_file($cached->filepath);
+        if ($cached->exists) {
+            $cached->timestamp = filemtime($cached->filepath);
+        }
     }
 
     /**
@@ -74,8 +76,10 @@ class Smarty_Internal_CacheResource_File extends Smarty_CacheResource
      */
     public function populateTimestamp(Smarty_Template_Cached $cached)
     {
-        $cached->timestamp = @filemtime($cached->filepath);
-        $cached->exists = !!$cached->timestamp;
+        $cached->timestamp = $cached->exists = is_file($cached->filepath);
+        if ($cached->exists) {
+            $cached->timestamp = filemtime($cached->filepath);
+        }
     }
 
     /**
@@ -108,13 +112,13 @@ class Smarty_Internal_CacheResource_File extends Smarty_CacheResource
     {
         $obj = new Smarty_Internal_Write_File();
         if ($obj->writeFile($_template->cached->filepath, $content, $_template->smarty) === true) {
-            $_template->cached->timestamp = @filemtime($_template->cached->filepath);
-            $_template->cached->exists = !!$_template->cached->timestamp;
-            if ($_template->cached->exists) {
+            $cached = $_template->cached;
+            $cached->timestamp = $cached->exists = is_file($cached->filepath);
+            if ($cached->exists) {
+                $cached->timestamp = filemtime($cached->filepath);
                 return true;
             }
         }
-
         return false;
     }
 
@@ -278,9 +282,12 @@ class Smarty_Internal_CacheResource_File extends Smarty_CacheResource
         } else {
             clearstatcache();
         }
-        $t = @filemtime($cached->lock_id);
-
-        return $t && (time() - $t < $smarty->locking_timeout);
+        if (is_file($cached->lock_id)) {
+            $t = @filemtime($cached->lock_id);
+            return $t && (time() - $t < $smarty->locking_timeout);
+        } else {
+            return false;
+        }
     }
 
     /**
diff --git a/libs/smarty/sysplugins/smarty_internal_compile_for.php b/libs/smarty/sysplugins/smarty_internal_compile_for.php
index a624b922c..5bac55011 100644
--- a/libs/smarty/sysplugins/smarty_internal_compile_for.php
+++ b/libs/smarty/sysplugins/smarty_internal_compile_for.php
@@ -47,27 +47,48 @@ class Smarty_Internal_Compile_For extends Smarty_Internal_CompileBase
         $output = "<?php ";
         if ($parameter == 1) {
             foreach ($_attr['start'] as $_statement) {
-                $output .= " \$_smarty_tpl->tpl_vars[$_statement[var]] = new Smarty_Variable;";
-                $output .= " \$_smarty_tpl->tpl_vars[$_statement[var]]->value = $_statement[value];\n";
+                if (is_array($_statement['var'])) {
+                    $var = $_statement['var']['var'];
+                    $index = $_statement['var']['smarty_internal_index'];
+                } else {
+                    $var = $_statement['var'];
+                    $index = '';
+                }
+                $output .= " \$_smarty_tpl->tpl_vars[$var] = new Smarty_Variable;";
+                $output .= " \$_smarty_tpl->tpl_vars[$var]->value{$index} = $_statement[value];\n";
             }
-            $output .= "  if ($_attr[ifexp]) { for (\$_foo=true;$_attr[ifexp]; \$_smarty_tpl->tpl_vars[$_attr[var]]->value$_attr[step]) {\n";
+            if (is_array($_attr['var'])) {
+                $var = $_attr['var']['var'];
+                $index = $_attr['var']['smarty_internal_index'];
+            } else {
+                $var = $_attr['var'];
+                $index = '';
+            }
+            $output .= "  if ($_attr[ifexp]) { for (\$_foo=true;$_attr[ifexp]; \$_smarty_tpl->tpl_vars[$var]->value{$index}$_attr[step]) {\n";
         } else {
             $_statement = $_attr['start'];
-            $output .= "\$_smarty_tpl->tpl_vars[$_statement[var]] = new Smarty_Variable;";
-            if (isset($_attr['step'])) {
-                $output .= "\$_smarty_tpl->tpl_vars[$_statement[var]]->step = $_attr[step];";
+            if (is_array($_statement['var'])) {
+                $var = $_statement['var']['var'];
+                $index = $_statement['var']['smarty_internal_index'];
             } else {
-                $output .= "\$_smarty_tpl->tpl_vars[$_statement[var]]->step = 1;";
+                $var = $_statement['var'];
+                $index = '';
+            }
+            $output .= "\$_smarty_tpl->tpl_vars[$var] = new Smarty_Variable;";
+            if (isset($_attr['step'])) {
+                $output .= "\$_smarty_tpl->tpl_vars[$var]->step = $_attr[step];";
+            } else {
+                $output .= "\$_smarty_tpl->tpl_vars[$var]->step = 1;";
             }
             if (isset($_attr['max'])) {
-                $output .= "\$_smarty_tpl->tpl_vars[$_statement[var]]->total = (int) min(ceil((\$_smarty_tpl->tpl_vars[$_statement[var]]->step > 0 ? $_attr[to]+1 - ($_statement[value]) : $_statement[value]-($_attr[to])+1)/abs(\$_smarty_tpl->tpl_vars[$_statement[var]]->step)),$_attr[max]);\n";
+                $output .= "\$_smarty_tpl->tpl_vars[$var]->total = (int) min(ceil((\$_smarty_tpl->tpl_vars[$var]->step > 0 ? $_attr[to]+1 - ($_statement[value]) : $_statement[value]-($_attr[to])+1)/abs(\$_smarty_tpl->tpl_vars[$var]->step)),$_attr[max]);\n";
             } else {
-                $output .= "\$_smarty_tpl->tpl_vars[$_statement[var]]->total = (int) ceil((\$_smarty_tpl->tpl_vars[$_statement[var]]->step > 0 ? $_attr[to]+1 - ($_statement[value]) : $_statement[value]-($_attr[to])+1)/abs(\$_smarty_tpl->tpl_vars[$_statement[var]]->step));\n";
+                $output .= "\$_smarty_tpl->tpl_vars[$var]->total = (int) ceil((\$_smarty_tpl->tpl_vars[$var]->step > 0 ? $_attr[to]+1 - ($_statement[value]) : $_statement[value]-($_attr[to])+1)/abs(\$_smarty_tpl->tpl_vars[$var]->step));\n";
             }
-            $output .= "if (\$_smarty_tpl->tpl_vars[$_statement[var]]->total > 0) {\n";
-            $output .= "for (\$_smarty_tpl->tpl_vars[$_statement[var]]->value = $_statement[value], \$_smarty_tpl->tpl_vars[$_statement[var]]->iteration = 1;\$_smarty_tpl->tpl_vars[$_statement[var]]->iteration <= \$_smarty_tpl->tpl_vars[$_statement[var]]->total;\$_smarty_tpl->tpl_vars[$_statement[var]]->value += \$_smarty_tpl->tpl_vars[$_statement[var]]->step, \$_smarty_tpl->tpl_vars[$_statement[var]]->iteration++) {\n";
-            $output .= "\$_smarty_tpl->tpl_vars[$_statement[var]]->first = \$_smarty_tpl->tpl_vars[$_statement[var]]->iteration == 1;";
-            $output .= "\$_smarty_tpl->tpl_vars[$_statement[var]]->last = \$_smarty_tpl->tpl_vars[$_statement[var]]->iteration == \$_smarty_tpl->tpl_vars[$_statement[var]]->total;";
+            $output .= "if (\$_smarty_tpl->tpl_vars[$var]->total > 0) {\n";
+            $output .= "for (\$_smarty_tpl->tpl_vars[$var]->value{$index} = $_statement[value], \$_smarty_tpl->tpl_vars[$var]->iteration = 1;\$_smarty_tpl->tpl_vars[$var]->iteration <= \$_smarty_tpl->tpl_vars[$var]->total;\$_smarty_tpl->tpl_vars[$var]->value{$index} += \$_smarty_tpl->tpl_vars[$var]->step, \$_smarty_tpl->tpl_vars[$var]->iteration++) {\n";
+            $output .= "\$_smarty_tpl->tpl_vars[$var]->first = \$_smarty_tpl->tpl_vars[$var]->iteration == 1;";
+            $output .= "\$_smarty_tpl->tpl_vars[$var]->last = \$_smarty_tpl->tpl_vars[$var]->iteration == \$_smarty_tpl->tpl_vars[$var]->total;";
         }
         $output .= "?>";
 
diff --git a/libs/smarty/sysplugins/smarty_internal_compile_foreach.php b/libs/smarty/sysplugins/smarty_internal_compile_foreach.php
index e117a4a10..82ea49637 100644
--- a/libs/smarty/sysplugins/smarty_internal_compile_foreach.php
+++ b/libs/smarty/sysplugins/smarty_internal_compile_foreach.php
@@ -208,7 +208,8 @@ class Smarty_Internal_Compile_Foreach extends Smarty_Internal_CompileBase
                 }
             }
         }
-        $output .= "\$foreachItemSav = \$_smarty_tpl->tpl_vars[$item];\n";
+        $itemName = trim($item,"'\"");
+        $output .= "\$foreach_{$itemName}_Sav = \$_smarty_tpl->tpl_vars[$item];\n";
         $output .= "?>";
 
         return $output;
@@ -239,8 +240,9 @@ class Smarty_Internal_Compile_Foreachelse extends Smarty_Internal_CompileBase
 
         list($openTag, $nocache, $item, $key, $foo) = $this->closeTag($compiler, array('foreach'));
         $this->openTag($compiler, 'foreachelse', array('foreachelse', $nocache, $item, $key, false));
+        $itemName = trim($item,"'\"");
         $output = "<?php\n";
-        $output .= "\$_smarty_tpl->tpl_vars[$item] = \$foreachItemSav;\n";
+        $output .= "\$_smarty_tpl->tpl_vars[$item] = \$foreach_{$itemName}_Sav;\n";
         $output .= "}\n";
         $output .= "if (!\$_smarty_tpl->tpl_vars[$item]->_loop) {\n?>";
         return $output;
@@ -274,9 +276,10 @@ class Smarty_Internal_Compile_Foreachclose extends Smarty_Internal_CompileBase
         }
 
         list($openTag, $compiler->nocache, $item, $key, $restore) = $this->closeTag($compiler, array('foreach', 'foreachelse'));
+        $itemName = trim($item,"'\"");
         $output = "<?php\n";
         if ($restore) {
-            $output .= "\$_smarty_tpl->tpl_vars[$item] = \$foreachItemSav;\n";
+            $output .= "\$_smarty_tpl->tpl_vars[$item] = \$foreach_{$itemName}_Sav;\n";
         }
         $output .= "}\n?>";
 
diff --git a/libs/smarty/sysplugins/smarty_internal_compile_function.php b/libs/smarty/sysplugins/smarty_internal_compile_function.php
index 570548516..35408bcbe 100644
--- a/libs/smarty/sysplugins/smarty_internal_compile_function.php
+++ b/libs/smarty/sysplugins/smarty_internal_compile_function.php
@@ -16,6 +16,7 @@
  */
 class Smarty_Internal_Compile_Function extends Smarty_Internal_CompileBase
 {
+
     /**
      * Attribute definition: Overwrites base class.
      *
@@ -23,6 +24,7 @@ class Smarty_Internal_Compile_Function extends Smarty_Internal_CompileBase
      * @see Smarty_Internal_CompileBase
      */
     public $required_attributes = array('name');
+
     /**
      * Attribute definition: Overwrites base class.
      *
@@ -30,6 +32,7 @@ class Smarty_Internal_Compile_Function extends Smarty_Internal_CompileBase
      * @see Smarty_Internal_CompileBase
      */
     public $shorttag_order = array('name');
+
     /**
      * Attribute definition: Overwrites base class.
      *
@@ -57,9 +60,8 @@ class Smarty_Internal_Compile_Function extends Smarty_Internal_CompileBase
         }
         unset($_attr['nocache']);
         $_name = trim($_attr['name'], "'\"");
-
-        $save = array($_attr, $compiler->parser->current_buffer,
-                      $compiler->template->has_nocache_code, $compiler->template->required_plugins, $compiler->template->caching);
+        $compiler->parent_compiler->templateProperties['tpl_function'][$_name] = array();
+        $save = array($_attr, $compiler->parser->current_buffer, $compiler->template->has_nocache_code, $compiler->template->required_plugins, $compiler->template->caching);
         $this->openTag($compiler, 'function', $save);
         // set flag that we are compiling a template function
         $compiler->compiles_template_function = true;
@@ -80,6 +82,7 @@ class Smarty_Internal_Compile_Function extends Smarty_Internal_CompileBase
  */
 class Smarty_Internal_Compile_Functionclose extends Smarty_Internal_CompileBase
 {
+
     /**
      * Compiler object
      *
@@ -90,11 +93,11 @@ class Smarty_Internal_Compile_Functionclose extends Smarty_Internal_CompileBase
     /**
      * Compiles code for the {/function} tag
      *
-     * @param  array  $args      array with attributes from parser
-     * @param  object $compiler  compiler object
-     * @param  array  $parameter array with compilation parameter
+     * @param  array                                       $args      array with attributes from parser
+     * @param object|\Smarty_Internal_TemplateCompilerBase $compiler  compiler object
+     * @param  array                                       $parameter array with compilation parameter
      *
-     * @return boolean true
+     * @return bool true
      */
     public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter)
     {
diff --git a/libs/smarty/sysplugins/smarty_internal_compile_if.php b/libs/smarty/sysplugins/smarty_internal_compile_if.php
index 26c0acc75..d4fd30e9f 100644
--- a/libs/smarty/sysplugins/smarty_internal_compile_if.php
+++ b/libs/smarty/sysplugins/smarty_internal_compile_if.php
@@ -42,9 +42,14 @@ class Smarty_Internal_Compile_If extends Smarty_Internal_CompileBase
                 $_nocache = ',true';
                 // create nocache var to make it know for further compiling
                 if (is_array($parameter['if condition']['var'])) {
-                    $compiler->template->tpl_vars[trim($parameter['if condition']['var']['var'], "'")] = new Smarty_Variable(null, true);
+                    $var = trim($parameter['if condition']['var']['var'], "'");
                 } else {
-                    $compiler->template->tpl_vars[trim($parameter['if condition']['var'], "'")] = new Smarty_Variable(null, true);
+                    $var = trim($parameter['if condition']['var'], "'");
+                 }
+                if (isset($compiler->template->tpl_vars[$var])) {
+                    $compiler->template->tpl_vars[$var]->nocache = true;
+                } else {
+                    $compiler->template->tpl_vars[$var] = new Smarty_Variable(null, true);
                 }
             } else {
                 $_nocache = '';
@@ -124,9 +129,14 @@ class Smarty_Internal_Compile_Elseif extends Smarty_Internal_CompileBase
                 $_nocache = ',true';
                 // create nocache var to make it know for further compiling
                 if (is_array($parameter['if condition']['var'])) {
-                    $compiler->template->tpl_vars[trim($parameter['if condition']['var']['var'], "'")] = new Smarty_Variable(null, true);
+                    $var = trim($parameter['if condition']['var']['var'], "'");
                 } else {
-                    $compiler->template->tpl_vars[trim($parameter['if condition']['var'], "'")] = new Smarty_Variable(null, true);
+                    $var = trim($parameter['if condition']['var'], "'");
+                }
+                if (isset($compiler->template->tpl_vars[$var])) {
+                    $compiler->template->tpl_vars[$var]->nocache = true;
+                } else {
+                    $compiler->template->tpl_vars[$var] = new Smarty_Variable(null, true);
                 }
             } else {
                 $_nocache = '';
@@ -155,22 +165,23 @@ class Smarty_Internal_Compile_Elseif extends Smarty_Internal_CompileBase
         } else {
             $tmp = '';
             foreach ($compiler->prefix_code as $code) {
-                $tmp .= $code;
-            }
+                $tmp = $compiler->appendCode($tmp, $code);
+           }
             $compiler->prefix_code = array();
+            $tmp = $compiler->appendCode("<?php } else {?>", $tmp);
             $this->openTag($compiler, 'elseif', array($nesting + 1, $compiler->tag_nocache));
             if ($condition_by_assign) {
                 if (is_array($parameter['if condition']['var'])) {
-                    $_output = "<?php } else {?>{$tmp}<?php  if (!isset(\$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var']['var'] . "]) || !is_array(\$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var']['var'] . "]->value)) \$_smarty_tpl->createLocalArrayVariable(" . $parameter['if condition']['var']['var'] . "$_nocache);\n";
+                    $_output = $compiler->appendCode($tmp, "<?php  if (!isset(\$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var']['var'] . "]) || !is_array(\$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var']['var'] . "]->value)) \$_smarty_tpl->createLocalArrayVariable(" . $parameter['if condition']['var']['var'] . "$_nocache);\n");
                     $_output .= "if (\$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var']['var'] . "]->value" . $parameter['if condition']['var']['smarty_internal_index'] . " = " . $parameter['if condition']['value'] . ") {?>";
                 } else {
-                    $_output = "<?php } else {?>{$tmp}<?php if (!isset(\$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var'] . "])) \$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var'] . "] = new Smarty_Variable(null{$_nocache});";
+                    $_output = $compiler->appendCode($tmp, "<?php if (!isset(\$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var'] . "])) \$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var'] . "] = new Smarty_Variable(null{$_nocache});");
                     $_output .= "if (\$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var'] . "]->value = " . $parameter['if condition']['value'] . ") {?>";
                 }
 
                 return $_output;
             } else {
-                return "<?php } else {?>{$tmp}<?php if ({$parameter['if condition']}) {?>";
+                return $compiler->appendCode($tmp, "<?php if ({$parameter['if condition']}) {?>");
             }
         }
     }
diff --git a/libs/smarty/sysplugins/smarty_internal_compile_include.php b/libs/smarty/sysplugins/smarty_internal_compile_include.php
index f013f9fcd..9c7aea0df 100644
--- a/libs/smarty/sysplugins/smarty_internal_compile_include.php
+++ b/libs/smarty/sysplugins/smarty_internal_compile_include.php
@@ -211,6 +211,20 @@ class Smarty_Internal_Compile_Include extends Smarty_Internal_CompileBase
                     }
                     $compiler->parent_compiler->mergedSubTemplatesCode[$tpl->properties['unifunc']] = $compiled_code;
                     $has_compiled_template = true;
+                    if (!empty($tpl->required_plugins['compiled'])) {
+                        foreach ($tpl->required_plugins['compiled'] as $name => $callBack) {
+                            if (!isset($compiler->template->required_plugins['compiled'][$name])) {
+                                $compiler->template->required_plugins['compiled'][$name] = $callBack;
+                            }
+                        }
+                    }
+                    if (!empty($tpl->required_plugins['nocache'])) {
+                        foreach ($tpl->required_plugins['nocache'] as $name => $callBack) {
+                            if (!isset($compiler->template->required_plugins['nocache'][$name])) {
+                                $compiler->template->required_plugins['nocache'][$name] = $callBack;
+                            }
+                        }
+                    }
                     unset ($tpl);
                 }
             } else {
diff --git a/libs/smarty/sysplugins/smarty_internal_compile_insert.php b/libs/smarty/sysplugins/smarty_internal_compile_insert.php
index 4c6585543..57f273506 100644
--- a/libs/smarty/sysplugins/smarty_internal_compile_insert.php
+++ b/libs/smarty/sysplugins/smarty_internal_compile_insert.php
@@ -51,8 +51,11 @@ class Smarty_Internal_Compile_Insert extends Smarty_Internal_CompileBase
     {
         // check and get attributes
         $_attr = $this->getAttributes($compiler, $args);
-        // never compile as nocache code
-        $compiler->suppressNocacheProcessing = true;
+        $nocacheParam = $compiler->template->caching && ($compiler->tag_nocache || $compiler->nocache);
+        if (!$nocacheParam) {
+            // do not compile as nocache code
+            $compiler->suppressNocacheProcessing = true;
+        }
         $compiler->tag_nocache = true;
         $_smarty_tpl = $compiler->template;
         $_name = null;
@@ -65,7 +68,12 @@ class Smarty_Internal_Compile_Insert extends Smarty_Internal_CompileBase
             // output will be stored in a smarty variable instead of being displayed
             $_assign = $_attr['assign'];
             // create variable to make sure that the compiler knows about its nocache status
-            $compiler->template->tpl_vars[trim($_attr['assign'], "'")] = new Smarty_Variable(null, true);
+            $var = trim($_attr['assign'], "'");
+            if (isset($compiler->template->tpl_vars[$var])) {
+                $compiler->template->tpl_vars[$var]->nocache = true;
+            } else {
+                $compiler->template->tpl_vars[$var] = new Smarty_Variable(null, true);
+            }
         }
         if (isset($_attr['script'])) {
             // script which must be included
@@ -116,19 +124,19 @@ class Smarty_Internal_Compile_Insert extends Smarty_Internal_CompileBase
         // convert attributes into parameter array string
         $_paramsArray = array();
         foreach ($_attr as $_key => $_value) {
-            $_paramsArray[] = "'$_key' => $_value";
+                $_paramsArray[] = "'$_key' => $_value";
         }
         $_params = 'array(' . implode(", ", $_paramsArray) . ')';
         // call insert
         if (isset($_assign)) {
-            if ($_smarty_tpl->caching) {
+            if ($_smarty_tpl->caching && !$nocacheParam) {
                 $_output .= "echo Smarty_Internal_Nocache_Insert::compile ('{$_function}',{$_params}, \$_smarty_tpl, '{$_filepath}',{$_assign});?>";
             } else {
                 $_output .= "\$_smarty_tpl->assign({$_assign} , {$_function} ({$_params},\$_smarty_tpl), true);?>";
             }
         } else {
             $compiler->has_output = true;
-            if ($_smarty_tpl->caching) {
+            if ($_smarty_tpl->caching && !$nocacheParam) {
                 $_output .= "echo Smarty_Internal_Nocache_Insert::compile ('{$_function}',{$_params}, \$_smarty_tpl, '{$_filepath}');?>";
             } else {
                 $_output .= "echo {$_function}({$_params},\$_smarty_tpl);?>";
diff --git a/libs/smarty/sysplugins/smarty_internal_compile_private_php.php b/libs/smarty/sysplugins/smarty_internal_compile_private_php.php
new file mode 100644
index 000000000..4211bca9a
--- /dev/null
+++ b/libs/smarty/sysplugins/smarty_internal_compile_private_php.php
@@ -0,0 +1,189 @@
+<?php
+/**
+ * Smarty Internal Plugin Compile PHP Expression
+ * Compiles any tag which will output an expression or variable
+ *
+ * @package    Smarty
+ * @subpackage Compiler
+ * @author     Uwe Tews
+ */
+
+/**
+ * Smarty Internal Plugin Compile PHP Expression Class
+ *
+ * @package    Smarty
+ * @subpackage Compiler
+ */
+class Smarty_Internal_Compile_Private_Php extends Smarty_Internal_CompileBase
+{
+
+    /**
+     * Attribute definition: Overwrites base class.
+     *
+     * @var array
+     * @see Smarty_Internal_CompileBase
+     */
+    public $required_attributes = array('code', 'type');
+
+    /**
+     * Compiles code for generating output from any expression
+     *
+     * @param array                                 $args      array with attributes from parser
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler  compiler object
+     * @param array                                 $parameter array with compilation parameter
+     *
+     * @return string
+     * @throws \SmartyException
+     */
+    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter)
+    {
+        // check and get attributes
+        $_attr = $this->getAttributes($compiler, $args);
+        $compiler->has_code = false;
+        if ($_attr['type'] == 'xml') {
+            $compiler->tag_nocache = true;
+            $save = $compiler->template->has_nocache_code;
+            $compiler->template->has_nocache_code = $save;
+            $output = addcslashes($_attr['code'], "'\\");
+            $compiler->parser->current_buffer->append_subtree(new Smarty_Internal_ParseTree_Tag($compiler->parser, $compiler->processNocacheCode("<?php echo '" . $output . "';?>", $compiler, true)));
+            return '';
+        }
+        if ($_attr['type'] != 'tag') {
+             if ($compiler->php_handling == Smarty::PHP_REMOVE) {
+                return '';
+            } elseif ($compiler->php_handling == Smarty::PHP_QUOTE) {
+                $output = preg_replace_callback('#(<\?(?:php|=)?)|(<%)|(<script\s+language\s*=\s*["\']?\s*php\s*["\']?\s*>)|(\?>)|(%>)|(<\/script>)#i', array($this,
+                    'quote'), $_attr['code']);
+                $compiler->parser->current_buffer->append_subtree(new Smarty_Internal_ParseTree_Text($compiler->parser, $output));
+                return '';
+            } elseif ($compiler->php_handling == Smarty::PHP_PASSTHRU || $_attr['type'] == 'unmatched') {
+                $compiler->tag_nocache = true;
+                $save = $compiler->template->has_nocache_code;
+                $compiler->template->has_nocache_code = $save;
+                $output = addcslashes($_attr['code'], "'\\");
+                $compiler->parser->current_buffer->append_subtree(new Smarty_Internal_ParseTree_Tag($compiler->parser, $compiler->processNocacheCode("<?php echo '" . $output . "';?>", $compiler, true)));
+                return '';
+            } elseif ($compiler->php_handling == Smarty::PHP_ALLOW) {
+                if (!($compiler->smarty instanceof SmartyBC)) {
+                    $compiler->trigger_template_error('$smarty->php_handling PHP_ALLOW not allowed. Use SmartyBC to enable it', $compiler->lex->taglineno);
+                }
+                $compiler->has_code = true;
+                return $_attr['code'];
+            } else {
+                $compiler->trigger_template_error('Illegal $smarty->php_handling value', $compiler->lex->taglineno);
+            }
+        } else {
+            $compiler->has_code = true;
+            if (!($compiler->smarty instanceof SmartyBC)) {
+                $compiler->trigger_template_error('{php}[/php} tags not allowed. Use SmartyBC to enable them', $compiler->lex->taglineno);
+            }
+            $ldel = preg_quote($compiler->smarty->left_delimiter, '#');
+            $rdel = preg_quote($compiler->smarty->right_delimiter, '#');
+            preg_match("#^({$ldel}php\\s*)((.)*?)({$rdel})#", $_attr['code'], $match);
+            if (!empty($match[2])) {
+                if ('nocache' == trim($match[2])) {
+                    $compiler->tag_nocache = true;
+                } else {
+                    $compiler->trigger_template_error("illegal value of option flag \"{$match[2]}\"", $compiler->lex->taglineno);
+                }
+            }
+            return preg_replace(array("#^{$ldel}\\s*php\\s*(.)*?{$rdel}#",
+                                    "#{$ldel}\\s*/\\s*php\\s*{$rdel}$#"), array('<?php ', '?>'), $_attr['code']);
+        }
+    }
+
+    /**
+     * Lexer code for PHP tags
+     *
+     * This code has been moved from lexer here fo easier debugging and maintenance
+     *
+     * @param $lex
+     */
+    public function parsePhp($lex)
+    {
+        $close = 0;
+        $lex->taglineno = $lex->line;
+        $closeTag = '?>';
+        if (strpos($lex->value, '<?xml') === 0) {
+            $lex->phpType = 'xml';
+        } elseif (strpos($lex->value, '<?') === 0) {
+            $lex->phpType = 'php';
+        } elseif (strpos($lex->value, '<%') === 0) {
+            $lex->phpType = 'asp';
+            $closeTag = '%>';
+        } elseif (strpos($lex->value, '%>') === 0) {
+            $lex->phpType = 'unmatched';
+        } elseif (strpos($lex->value, '?>') === 0) {
+            $lex->phpType = 'unmatched';
+        } elseif (strpos($lex->value, '<s') === 0) {
+            $lex->phpType = 'script';
+            $closeTag = '</script>';
+        } elseif (strpos($lex->value, $lex->smarty->left_delimiter) === 0) {
+            if ($lex->isAutoLiteral()) {
+                $lex->token = Smarty_Internal_Templateparser::TP_TEXT;
+                return;
+            }
+            $closeTag = "{$lex->smarty->left_delimiter}/php{$lex->smarty->right_delimiter}";
+            if ($lex->value == $closeTag) {
+                $lex->compiler->trigger_template_error("unexpected closing tag '{$closeTag}'");
+            }
+            $lex->phpType = 'tag';
+        }
+        if ($lex->phpType == 'unmatched') {
+            return;
+        }
+        if (($lex->phpType == 'php' || $lex->phpType == 'asp') && ($lex->compiler->php_handling == Smarty::PHP_PASSTHRU || $lex->compiler->php_handling == Smarty::PHP_QUOTE)) {
+            return;
+        }
+        $start = $lex->counter + strlen($lex->value);
+        $body = true;
+        if (preg_match('~' . preg_quote($closeTag, '~') . '~i', $lex->data, $match, PREG_OFFSET_CAPTURE, $start)) {
+            $close = $match[0][1];
+        } else {
+            $lex->compiler->trigger_template_error("missing closing tag '{$closeTag}'");
+        }
+        while ($body) {
+            if (preg_match('~([/][*])|([/][/][^\n]*)|(\'[^\'\\\\]*(?:\\.[^\'\\\\]*)*\')|("[^"\\\\]*(?:\\.[^"\\\\]*)*")~', $lex->data, $match, PREG_OFFSET_CAPTURE, $start)) {
+                $value = $match[0][0];
+                $from = $pos = $match[0][1];
+                if ($pos > $close) {
+                    $body = false;
+                } else {
+                    $start = $pos + strlen($value);
+                    $phpCommentStart = $value == '/*';
+                    if ($phpCommentStart) {
+                        $phpCommentEnd = preg_match('~([*][/])~', $lex->data, $match, PREG_OFFSET_CAPTURE, $start);
+                        if ($phpCommentEnd) {
+                            $pos2 = $match[0][1];
+                            $start = $pos2 + strlen($match[0][0]);
+                        }
+                    }
+                    while ($close > $pos && $close < $start) {
+                        if (preg_match('~' . preg_quote($closeTag, '~') . '~i', $lex->data, $match, PREG_OFFSET_CAPTURE, $from)) {
+                            $close = $match[0][1];
+                            $from = $close + strlen($match[0][0]);
+                        } else {
+                            $lex->compiler->trigger_template_error("missing closing tag '{$closeTag}'");
+                        }
+                    }
+                    if ($phpCommentStart && (!$phpCommentEnd || $pos2 > $close)) {
+                        $lex->taglineno = $lex->line + substr_count(substr($lex->data, $lex->counter, $start), "\n");
+                        $lex->compiler->trigger_template_error("missing PHP comment closing tag '*/'");
+                    }
+                }
+            } else {
+                $body = false;
+            }
+        }
+        $lex->value = substr($lex->data, $lex->counter, $close + strlen($closeTag) - $lex->counter);
+    }
+
+    /*
+     * Call back function for $php_handling = PHP_QUOTE
+     *
+     */
+    private function quote($match)
+    {
+        return htmlspecialchars($match[0], ENT_QUOTES);
+    }
+}
diff --git a/libs/smarty/sysplugins/smarty_internal_compile_private_special_variable.php b/libs/smarty/sysplugins/smarty_internal_compile_private_special_variable.php
index 0a98127e4..525bc0db7 100644
--- a/libs/smarty/sysplugins/smarty_internal_compile_private_special_variable.php
+++ b/libs/smarty/sysplugins/smarty_internal_compile_private_special_variable.php
@@ -35,7 +35,7 @@ class Smarty_Internal_Compile_Private_Special_Variable extends Smarty_Internal_C
                 case 'foreach':
                     $name = trim($_index[1], "'");
                     $foreachVar = "'__foreach_{$name}'";
-                    return "isset(\$_smarty_tpl->tpl_vars[$foreachVar]->value[{$_index[2]}]) ? \$_smarty_tpl->tpl_vars[$foreachVar]->value[{$_index[2]}] : null";
+                    return "(isset(\$_smarty_tpl->tpl_vars[$foreachVar]->value[{$_index[2]}]) ? \$_smarty_tpl->tpl_vars[$foreachVar]->value[{$_index[2]}] : null)";
                 case 'section':
                     return "\$_smarty_tpl->getVariable('smarty')->value$parameter";
                 case 'capture':
@@ -82,7 +82,7 @@ class Smarty_Internal_Compile_Private_Special_Variable extends Smarty_Internal_C
                         $compiler->trigger_template_error("(secure mode) constants not permitted");
                         break;
                     }
-                    if (strpos($_index[1], '$') === false) {
+                    if (strpos($_index[1], '$') === false && strpos($_index[1], '\'') === false ) {
                         return "@constant('{$_index[1]}')";
                     } else {
                         return "@constant({$_index[1]})";
diff --git a/libs/smarty/sysplugins/smarty_internal_compile_while.php b/libs/smarty/sysplugins/smarty_internal_compile_while.php
index b73602f3f..6a6fb3ef1 100644
--- a/libs/smarty/sysplugins/smarty_internal_compile_while.php
+++ b/libs/smarty/sysplugins/smarty_internal_compile_while.php
@@ -42,9 +42,14 @@ class Smarty_Internal_Compile_While extends Smarty_Internal_CompileBase
                 $_nocache = ',true';
                 // create nocache var to make it know for further compiling
                 if (is_array($parameter['if condition']['var'])) {
-                    $compiler->template->tpl_vars[trim($parameter['if condition']['var']['var'], "'")] = new Smarty_Variable(null, true);
+                    $var = trim($parameter['if condition']['var']['var'], "'");
                 } else {
-                    $compiler->template->tpl_vars[trim($parameter['if condition']['var'], "'")] = new Smarty_Variable(null, true);
+                    $var = trim($parameter['if condition']['var'], "'");
+                }
+                if (isset($compiler->template->tpl_vars[$var])) {
+                    $compiler->template->tpl_vars[$var]->nocache = true;
+                } else {
+                    $compiler->template->tpl_vars[$var] = new Smarty_Variable(null, true);
                 }
             } else {
                 $_nocache = '';
diff --git a/libs/smarty/sysplugins/smarty_internal_configfilelexer.php b/libs/smarty/sysplugins/smarty_internal_configfilelexer.php
index 3e08c9dfd..e5d4770b0 100644
--- a/libs/smarty/sysplugins/smarty_internal_configfilelexer.php
+++ b/libs/smarty/sysplugins/smarty_internal_configfilelexer.php
@@ -1,96 +1,128 @@
 <?php
 /**
-* Smarty Internal Plugin Configfilelexer
-*
-* This is the lexer to break the config file source into tokens 
-* @package Smarty
-* @subpackage Config
-* @author Uwe Tews 
-*/
+ * Smarty Internal Plugin Configfilelexer
+ *
+ * This is the lexer to break the config file source into tokens
+ *
+ * @package    Smarty
+ * @subpackage Config
+ * @author     Uwe Tews
+ */
+
 /**
-* Smarty_Internal_Configfilelexer
-*
-* This is the config file lexer.
-* It is generated from the smarty_internal_configfilelexer.plex file
-*
-* @package Smarty
-* @subpackage Compiler
-* @author Uwe Tews
-*/
+ * Smarty_Internal_Configfilelexer
+ *
+ * This is the config file lexer.
+ * It is generated from the smarty_internal_configfilelexer.plex file
+ *
+ * @package    Smarty
+ * @subpackage Compiler
+ * @author     Uwe Tews
+ */
 class Smarty_Internal_Configfilelexer
 {
+
     /**
      * Source
      *
      * @var string
      */
     public $data;
+
     /**
      * byte counter
      *
      * @var int
      */
     public $counter;
+
     /**
      * token number
      *
      * @var int
      */
     public $token;
+
     /**
      * token value
      *
      * @var string
      */
     public $value;
+
     /**
      * current line
      *
      * @var int
      */
     public $line;
+
     /**
      * state number
      *
      * @var int
      */
     public $state = 1;
+
     /**
      * Smarty object
      *
      * @var Smarty
      */
     public $smarty = null;
+
     /**
      * compiler object
      *
      * @var Smarty_Internal_Config_File_Compiler
      */
     private $compiler = null;
+
     /**
      * copy of config_booleanize
      *
      * @var bool
      */
     private $configBooleanize = false;
+
     /**
      * trace file
      *
      * @var resource
      */
     public $yyTraceFILE;
+
     /**
      * trace prompt
      *
      * @var string
      */
     public $yyTracePrompt;
+
     /**
      * state names
      *
      * @var array
      */
     public $state_name = array(1 => 'START', 2 => 'VALUE', 3 => 'NAKED_STRING_VALUE', 4 => 'COMMENT', 5 => 'SECTION', 6 => 'TRIPPLE');
+
+    /**
+     * storage for assembled token patterns
+     *
+     * @var sring
+     */
+    private $yy_global_pattern1 = null;
+
+    private $yy_global_pattern2 = null;
+
+    private $yy_global_pattern3 = null;
+
+    private $yy_global_pattern4 = null;
+
+    private $yy_global_pattern5 = null;
+
+    private $yy_global_pattern6 = null;
+
     /**
      * token names
      *
@@ -135,9 +167,8 @@ class Smarty_Internal_Configfilelexer
         $this->yyTracePrompt = '<br>';
     }
 
-
-
     private $_yy_state = 1;
+
     private $_yy_stack = array();
 
     public function yylex()
@@ -148,75 +179,54 @@ class Smarty_Internal_Configfilelexer
     public function yypushstate($state)
     {
         if ($this->yyTraceFILE) {
-             fprintf($this->yyTraceFILE, "%sState push %s\n", $this->yyTracePrompt, isset($this->state_name[$this->_yy_state]) ? $this->state_name[$this->_yy_state] : $this->_yy_state);
+            fprintf($this->yyTraceFILE, "%sState push %s\n", $this->yyTracePrompt, isset($this->state_name[$this->_yy_state]) ? $this->state_name[$this->_yy_state] : $this->_yy_state);
         }
         array_push($this->_yy_stack, $this->_yy_state);
         $this->_yy_state = $state;
         if ($this->yyTraceFILE) {
-             fprintf($this->yyTraceFILE, "%snew State %s\n", $this->yyTracePrompt, isset($this->state_name[$this->_yy_state]) ? $this->state_name[$this->_yy_state] : $this->_yy_state);
+            fprintf($this->yyTraceFILE, "%snew State %s\n", $this->yyTracePrompt, isset($this->state_name[$this->_yy_state]) ? $this->state_name[$this->_yy_state] : $this->_yy_state);
         }
     }
 
     public function yypopstate()
     {
-       if ($this->yyTraceFILE) {
-             fprintf($this->yyTraceFILE, "%sState pop %s\n", $this->yyTracePrompt,  isset($this->state_name[$this->_yy_state]) ? $this->state_name[$this->_yy_state] : $this->_yy_state);
-        }
-       $this->_yy_state = array_pop($this->_yy_stack);
         if ($this->yyTraceFILE) {
-             fprintf($this->yyTraceFILE, "%snew State %s\n", $this->yyTracePrompt, isset($this->state_name[$this->_yy_state]) ? $this->state_name[$this->_yy_state] : $this->_yy_state);
+            fprintf($this->yyTraceFILE, "%sState pop %s\n", $this->yyTracePrompt, isset($this->state_name[$this->_yy_state]) ? $this->state_name[$this->_yy_state] : $this->_yy_state);
+        }
+        $this->_yy_state = array_pop($this->_yy_stack);
+        if ($this->yyTraceFILE) {
+            fprintf($this->yyTraceFILE, "%snew State %s\n", $this->yyTracePrompt, isset($this->state_name[$this->_yy_state]) ? $this->state_name[$this->_yy_state] : $this->_yy_state);
         }
-
     }
 
     public function yybegin($state)
     {
-       $this->_yy_state = $state;
+        $this->_yy_state = $state;
         if ($this->yyTraceFILE) {
-             fprintf($this->yyTraceFILE, "%sState set %s\n", $this->yyTracePrompt, isset($this->state_name[$this->_yy_state]) ? $this->state_name[$this->_yy_state] : $this->_yy_state);
+            fprintf($this->yyTraceFILE, "%sState set %s\n", $this->yyTracePrompt, isset($this->state_name[$this->_yy_state]) ? $this->state_name[$this->_yy_state] : $this->_yy_state);
         }
     }
 
-
-
-
     public function yylex1()
     {
-        $tokenMap = array (
-              1 => 0,
-              2 => 0,
-              3 => 0,
-              4 => 0,
-              5 => 0,
-              6 => 0,
-              7 => 0,
-              8 => 0,
-            );
-        if ($this->counter >=  strlen($this->data)) {
+        if (!isset($this->yy_global_pattern1)) {
+            $this->yy_global_pattern1 = "/\G(#|;)|\G(\\[)|\G(\\])|\G(=)|\G([ \t\r]+)|\G(\n)|\G([0-9]*[a-zA-Z_]\\w*)|\G([\S\s])/iS";
+        }
+        if ($this->counter >= strlen($this->data)) {
             return false; // end of input
         }
-        $yy_global_pattern = "/\G(#|;)|\G(\\[)|\G(\\])|\G(=)|\G([ \t\r]+)|\G(\n)|\G([0-9]*[a-zA-Z_]\\w*)|\G([\S\s])/iS";
 
         do {
-            if (preg_match($yy_global_pattern,$this->data, $yymatches, null, $this->counter)) {
+            if (preg_match($this->yy_global_pattern1, $this->data, $yymatches, null, $this->counter)) {
                 $yysubmatches = $yymatches;
                 $yymatches = preg_grep("/(.|\s)+/", $yysubmatches);
-                if (!count($yymatches)) {
-                    throw new Exception('Error: lexing failed because a rule matched' .
-                        ' an empty string.  Input "' . substr($this->data,
-                        $this->counter, 5) . '... state START');
+                if (empty($yymatches)) {
+                    throw new Exception('Error: lexing failed because a rule matched' . ' an empty string.  Input "' . substr($this->data, $this->counter, 5) . '... state START');
                 }
                 next($yymatches); // skip global match
                 $this->token = key($yymatches); // token number
-                if ($tokenMap[$this->token]) {
-                    // extract sub-patterns for passing to lex function
-                    $yysubmatches = array_slice($yysubmatches, $this->token + 1,
-                        $tokenMap[$this->token]);
-                } else {
-                    $yysubmatches = array();
-                }
                 $this->value = current($yymatches); // token value
-                $r = $this->{'yy_r1_' . $this->token}($yysubmatches);
+                $r = $this->{'yy_r1_' . $this->token}();
                 if ($r === null) {
                     $this->counter += strlen($this->value);
                     $this->line += substr_count($this->value, "\n");
@@ -229,106 +239,92 @@ class Smarty_Internal_Configfilelexer
                 } elseif ($r === false) {
                     $this->counter += strlen($this->value);
                     $this->line += substr_count($this->value, "\n");
-                    if ($this->counter >=  strlen($this->data)) {
+                    if ($this->counter >= strlen($this->data)) {
                         return false; // end of input
                     }
                     // skip this token
                     continue;
-                }            } else {
-                throw new Exception('Unexpected input at line' . $this->line .
-                    ': ' . $this->data[$this->counter]);
+                }
+            } else {
+                throw new Exception('Unexpected input at line' . $this->line . ': ' . $this->data[$this->counter]);
             }
             break;
         } while (true);
-
     } // end function
 
-
     const START = 1;
-    function yy_r1_1($yy_subpatterns)
+
+    function yy_r1_1()
     {
 
-    $this->token = Smarty_Internal_Configfileparser::TPC_COMMENTSTART;
-    $this->yypushstate(self::COMMENT);
+        $this->token = Smarty_Internal_Configfileparser::TPC_COMMENTSTART;
+        $this->yypushstate(self::COMMENT);
     }
-    function yy_r1_2($yy_subpatterns)
+
+    function yy_r1_2()
     {
 
-    $this->token = Smarty_Internal_Configfileparser::TPC_OPENB;
-    $this->yypushstate(self::SECTION);
+        $this->token = Smarty_Internal_Configfileparser::TPC_OPENB;
+        $this->yypushstate(self::SECTION);
     }
-    function yy_r1_3($yy_subpatterns)
+
+    function yy_r1_3()
     {
 
-    $this->token = Smarty_Internal_Configfileparser::TPC_CLOSEB;
+        $this->token = Smarty_Internal_Configfileparser::TPC_CLOSEB;
     }
-    function yy_r1_4($yy_subpatterns)
+
+    function yy_r1_4()
     {
 
-    $this->token = Smarty_Internal_Configfileparser::TPC_EQUAL;
-    $this->yypushstate(self::VALUE);
+        $this->token = Smarty_Internal_Configfileparser::TPC_EQUAL;
+        $this->yypushstate(self::VALUE);
     }
-    function yy_r1_5($yy_subpatterns)
+
+    function yy_r1_5()
     {
 
-    return false;
+        return false;
     }
-    function yy_r1_6($yy_subpatterns)
+
+    function yy_r1_6()
     {
 
-    $this->token = Smarty_Internal_Configfileparser::TPC_NEWLINE;
+        $this->token = Smarty_Internal_Configfileparser::TPC_NEWLINE;
     }
-    function yy_r1_7($yy_subpatterns)
+
+    function yy_r1_7()
     {
 
-    $this->token = Smarty_Internal_Configfileparser::TPC_ID;
+        $this->token = Smarty_Internal_Configfileparser::TPC_ID;
     }
-    function yy_r1_8($yy_subpatterns)
+
+    function yy_r1_8()
     {
 
-    $this->token = Smarty_Internal_Configfileparser::TPC_OTHER;
+        $this->token = Smarty_Internal_Configfileparser::TPC_OTHER;
     }
 
-
-
     public function yylex2()
     {
-        $tokenMap = array (
-              1 => 0,
-              2 => 0,
-              3 => 0,
-              4 => 0,
-              5 => 0,
-              6 => 0,
-              7 => 0,
-              8 => 0,
-              9 => 0,
-            );
-        if ($this->counter >=  strlen($this->data)) {
+        if (!isset($this->yy_global_pattern2)) {
+            $this->yy_global_pattern2 = "/\G([ \t\r]+)|\G(\\d+\\.\\d+(?=[ \t\r]*[\n#;]))|\G(\\d+(?=[ \t\r]*[\n#;]))|\G(\"\"\")|\G('[^'\\\\]*(?:\\\\.[^'\\\\]*)*'(?=[ \t\r]*[\n#;]))|\G(\"[^\"\\\\]*(?:\\\\.[^\"\\\\]*)*\"(?=[ \t\r]*[\n#;]))|\G([a-zA-Z]+(?=[ \t\r]*[\n#;]))|\G([^\n]+?(?=[ \t\r]*\n))|\G(\n)/iS";
+        }
+        if ($this->counter >= strlen($this->data)) {
             return false; // end of input
         }
-        $yy_global_pattern = "/\G([ \t\r]+)|\G(\\d+\\.\\d+(?=[ \t\r]*[\n#;]))|\G(\\d+(?=[ \t\r]*[\n#;]))|\G(\"\"\")|\G('[^'\\\\]*(?:\\\\.[^'\\\\]*)*'(?=[ \t\r]*[\n#;]))|\G(\"[^\"\\\\]*(?:\\\\.[^\"\\\\]*)*\"(?=[ \t\r]*[\n#;]))|\G([a-zA-Z]+(?=[ \t\r]*[\n#;]))|\G([^\n]+?(?=[ \t\r]*\n))|\G(\n)/iS";
 
         do {
-            if (preg_match($yy_global_pattern,$this->data, $yymatches, null, $this->counter)) {
+            if (preg_match($this->yy_global_pattern2, $this->data, $yymatches, null, $this->counter)) {
                 $yysubmatches = $yymatches;
                 $yymatches = preg_grep("/(.|\s)+/", $yysubmatches);
-                if (!count($yymatches)) {
-                    throw new Exception('Error: lexing failed because a rule matched' .
-                        ' an empty string.  Input "' . substr($this->data,
-                        $this->counter, 5) . '... state VALUE');
+                if (empty($yymatches)) {
+                    throw new Exception('Error: lexing failed because a rule matched' . ' an empty string.  Input "' . substr($this->data, $this->counter, 5) . '... state VALUE');
                 }
                 next($yymatches); // skip global match
                 $this->token = key($yymatches); // token number
-                if ($tokenMap[$this->token]) {
-                    // extract sub-patterns for passing to lex function
-                    $yysubmatches = array_slice($yysubmatches, $this->token + 1,
-                        $tokenMap[$this->token]);
-                } else {
-                    $yysubmatches = array();
-                }
                 $this->value = current($yymatches); // token value
-                $r = $this->{'yy_r2_' . $this->token}($yysubmatches);
+                $r = $this->{'yy_r2_' . $this->token}();
                 if ($r === null) {
                     $this->counter += strlen($this->value);
                     $this->line += substr_count($this->value, "\n");
@@ -341,115 +337,110 @@ class Smarty_Internal_Configfilelexer
                 } elseif ($r === false) {
                     $this->counter += strlen($this->value);
                     $this->line += substr_count($this->value, "\n");
-                    if ($this->counter >=  strlen($this->data)) {
+                    if ($this->counter >= strlen($this->data)) {
                         return false; // end of input
                     }
                     // skip this token
                     continue;
-                }            } else {
-                throw new Exception('Unexpected input at line' . $this->line .
-                    ': ' . $this->data[$this->counter]);
+                }
+            } else {
+                throw new Exception('Unexpected input at line' . $this->line . ': ' . $this->data[$this->counter]);
             }
             break;
         } while (true);
-
     } // end function
 
-
     const VALUE = 2;
-    function yy_r2_1($yy_subpatterns)
+
+    function yy_r2_1()
     {
 
-    return false;
+        return false;
     }
-    function yy_r2_2($yy_subpatterns)
+
+    function yy_r2_2()
     {
 
-    $this->token = Smarty_Internal_Configfileparser::TPC_FLOAT;
-    $this->yypopstate();
-    }
-    function yy_r2_3($yy_subpatterns)
-    {
-
-    $this->token = Smarty_Internal_Configfileparser::TPC_INT;
-    $this->yypopstate();
-    }
-    function yy_r2_4($yy_subpatterns)
-    {
-
-    $this->token = Smarty_Internal_Configfileparser::TPC_TRIPPLE_QUOTES;
-    $this->yypushstate(self::TRIPPLE);
-    }
-    function yy_r2_5($yy_subpatterns)
-    {
-
-    $this->token = Smarty_Internal_Configfileparser::TPC_SINGLE_QUOTED_STRING;
-    $this->yypopstate();
-    }
-    function yy_r2_6($yy_subpatterns)
-    {
-
-    $this->token = Smarty_Internal_Configfileparser::TPC_DOUBLE_QUOTED_STRING;
-    $this->yypopstate();
-    }
-    function yy_r2_7($yy_subpatterns)
-    {
-
-    if (!$this->configBooleanize || !in_array(strtolower($this->value), Array("true", "false", "on", "off", "yes", "no")) ) {
-        $this->yypopstate();
-        $this->yypushstate(self::NAKED_STRING_VALUE);
-        return true; //reprocess in new state
-    } else {
-        $this->token = Smarty_Internal_Configfileparser::TPC_BOOL;
+        $this->token = Smarty_Internal_Configfileparser::TPC_FLOAT;
         $this->yypopstate();
     }
-    }
-    function yy_r2_8($yy_subpatterns)
+
+    function yy_r2_3()
     {
 
-    $this->token = Smarty_Internal_Configfileparser::TPC_NAKED_STRING;
-    $this->yypopstate();
+        $this->token = Smarty_Internal_Configfileparser::TPC_INT;
+        $this->yypopstate();
     }
-    function yy_r2_9($yy_subpatterns)
+
+    function yy_r2_4()
     {
 
-    $this->token = Smarty_Internal_Configfileparser::TPC_NAKED_STRING;
-    $this->value = "";
-    $this->yypopstate();
+        $this->token = Smarty_Internal_Configfileparser::TPC_TRIPPLE_QUOTES;
+        $this->yypushstate(self::TRIPPLE);
     }
 
+    function yy_r2_5()
+    {
 
+        $this->token = Smarty_Internal_Configfileparser::TPC_SINGLE_QUOTED_STRING;
+        $this->yypopstate();
+    }
+
+    function yy_r2_6()
+    {
+
+        $this->token = Smarty_Internal_Configfileparser::TPC_DOUBLE_QUOTED_STRING;
+        $this->yypopstate();
+    }
+
+    function yy_r2_7()
+    {
+
+        if (!$this->configBooleanize || !in_array(strtolower($this->value), Array("true", "false", "on", "off", "yes", "no"))) {
+            $this->yypopstate();
+            $this->yypushstate(self::NAKED_STRING_VALUE);
+            return true; //reprocess in new state
+        } else {
+            $this->token = Smarty_Internal_Configfileparser::TPC_BOOL;
+            $this->yypopstate();
+        }
+    }
+
+    function yy_r2_8()
+    {
+
+        $this->token = Smarty_Internal_Configfileparser::TPC_NAKED_STRING;
+        $this->yypopstate();
+    }
+
+    function yy_r2_9()
+    {
+
+        $this->token = Smarty_Internal_Configfileparser::TPC_NAKED_STRING;
+        $this->value = "";
+        $this->yypopstate();
+    }
 
     public function yylex3()
     {
-        $tokenMap = array (
-              1 => 0,
-            );
-        if ($this->counter >=  strlen($this->data)) {
+        if (!isset($this->yy_global_pattern3)) {
+            $this->yy_global_pattern3 = "/\G([^\n]+?(?=[ \t\r]*\n))/iS";
+        }
+        if ($this->counter >= strlen($this->data)) {
             return false; // end of input
         }
-        $yy_global_pattern = "/\G([^\n]+?(?=[ \t\r]*\n))/iS";
 
         do {
-            if (preg_match($yy_global_pattern,$this->data, $yymatches, null, $this->counter)) {
+            if (preg_match($this->yy_global_pattern3, $this->data, $yymatches, null, $this->counter)) {
                 $yysubmatches = $yymatches;
                 $yymatches = preg_grep("/(.|\s)+/", $yysubmatches);
-                if (!count($yymatches)) {
-                    throw new Exception('Error: lexing failed because a rule matched' .
-                        ' an empty string.  Input "' . substr($this->data,
-                        $this->counter, 5) . '... state NAKED_STRING_VALUE');
+                if (empty($yymatches)) {
+                    throw new Exception('Error: lexing failed because a rule matched' . ' an empty string.  Input "' . substr($this->data, $this->counter, 5) . '... state NAKED_STRING_VALUE');
                 }
                 next($yymatches); // skip global match
                 $this->token = key($yymatches); // token number
-                if ($tokenMap[$this->token]) {
-                    // extract sub-patterns for passing to lex function
-                    $yysubmatches = array_slice($yysubmatches, $this->token + 1,
-                        $tokenMap[$this->token]);
-                } else {
-                    $yysubmatches = array();
-                }
                 $this->value = current($yymatches); // token value
-                $r = $this->{'yy_r3_' . $this->token}($yysubmatches);
+                $r = $this->{'yy_r3_' . $this->token}();
                 if ($r === null) {
                     $this->counter += strlen($this->value);
                     $this->line += substr_count($this->value, "\n");
@@ -462,63 +453,48 @@ class Smarty_Internal_Configfilelexer
                 } elseif ($r === false) {
                     $this->counter += strlen($this->value);
                     $this->line += substr_count($this->value, "\n");
-                    if ($this->counter >=  strlen($this->data)) {
+                    if ($this->counter >= strlen($this->data)) {
                         return false; // end of input
                     }
                     // skip this token
                     continue;
-                }            } else {
-                throw new Exception('Unexpected input at line' . $this->line .
-                    ': ' . $this->data[$this->counter]);
+                }
+            } else {
+                throw new Exception('Unexpected input at line' . $this->line . ': ' . $this->data[$this->counter]);
             }
             break;
         } while (true);
-
     } // end function
 
-
     const NAKED_STRING_VALUE = 3;
-    function yy_r3_1($yy_subpatterns)
+
+    function yy_r3_1()
     {
 
-    $this->token = Smarty_Internal_Configfileparser::TPC_NAKED_STRING;
-    $this->yypopstate();
+        $this->token = Smarty_Internal_Configfileparser::TPC_NAKED_STRING;
+        $this->yypopstate();
     }
 
-
-
     public function yylex4()
     {
-        $tokenMap = array (
-              1 => 0,
-              2 => 0,
-              3 => 0,
-            );
-        if ($this->counter >=  strlen($this->data)) {
+        if (!isset($this->yy_global_pattern4)) {
+            $this->yy_global_pattern4 = "/\G([ \t\r]+)|\G([^\n]+?(?=[ \t\r]*\n))|\G(\n)/iS";
+        }
+        if ($this->counter >= strlen($this->data)) {
             return false; // end of input
         }
-        $yy_global_pattern = "/\G([ \t\r]+)|\G([^\n]+?(?=[ \t\r]*\n))|\G(\n)/iS";
 
         do {
-            if (preg_match($yy_global_pattern,$this->data, $yymatches, null, $this->counter)) {
+            if (preg_match($this->yy_global_pattern4, $this->data, $yymatches, null, $this->counter)) {
                 $yysubmatches = $yymatches;
                 $yymatches = preg_grep("/(.|\s)+/", $yysubmatches);
-                if (!count($yymatches)) {
-                    throw new Exception('Error: lexing failed because a rule matched' .
-                        ' an empty string.  Input "' . substr($this->data,
-                        $this->counter, 5) . '... state COMMENT');
+                if (empty($yymatches)) {
+                    throw new Exception('Error: lexing failed because a rule matched' . ' an empty string.  Input "' . substr($this->data, $this->counter, 5) . '... state COMMENT');
                 }
                 next($yymatches); // skip global match
                 $this->token = key($yymatches); // token number
-                if ($tokenMap[$this->token]) {
-                    // extract sub-patterns for passing to lex function
-                    $yysubmatches = array_slice($yysubmatches, $this->token + 1,
-                        $tokenMap[$this->token]);
-                } else {
-                    $yysubmatches = array();
-                }
                 $this->value = current($yymatches); // token value
-                $r = $this->{'yy_r4_' . $this->token}($yysubmatches);
+                $r = $this->{'yy_r4_' . $this->token}();
                 if ($r === null) {
                     $this->counter += strlen($this->value);
                     $this->line += substr_count($this->value, "\n");
@@ -531,72 +507,60 @@ class Smarty_Internal_Configfilelexer
                 } elseif ($r === false) {
                     $this->counter += strlen($this->value);
                     $this->line += substr_count($this->value, "\n");
-                    if ($this->counter >=  strlen($this->data)) {
+                    if ($this->counter >= strlen($this->data)) {
                         return false; // end of input
                     }
                     // skip this token
                     continue;
-                }            } else {
-                throw new Exception('Unexpected input at line' . $this->line .
-                    ': ' . $this->data[$this->counter]);
+                }
+            } else {
+                throw new Exception('Unexpected input at line' . $this->line . ': ' . $this->data[$this->counter]);
             }
             break;
         } while (true);
-
     } // end function
 
-
     const COMMENT = 4;
-    function yy_r4_1($yy_subpatterns)
+
+    function yy_r4_1()
     {
 
-    return false;
+        return false;
     }
-    function yy_r4_2($yy_subpatterns)
+
+    function yy_r4_2()
     {
 
-    $this->token = Smarty_Internal_Configfileparser::TPC_NAKED_STRING;
+        $this->token = Smarty_Internal_Configfileparser::TPC_NAKED_STRING;
     }
-    function yy_r4_3($yy_subpatterns)
+
+    function yy_r4_3()
     {
 
-    $this->token = Smarty_Internal_Configfileparser::TPC_NEWLINE;
-    $this->yypopstate();
+        $this->token = Smarty_Internal_Configfileparser::TPC_NEWLINE;
+        $this->yypopstate();
     }
 
-
-
     public function yylex5()
     {
-        $tokenMap = array (
-              1 => 0,
-              2 => 0,
-            );
-        if ($this->counter >=  strlen($this->data)) {
+        if (!isset($this->yy_global_pattern5)) {
+            $this->yy_global_pattern5 = "/\G(\\.)|\G(.*?(?=[\.=[\]\r\n]))/iS";
+        }
+        if ($this->counter >= strlen($this->data)) {
             return false; // end of input
         }
-        $yy_global_pattern = "/\G(\\.)|\G(.*?(?=[\.=[\]\r\n]))/iS";
 
         do {
-            if (preg_match($yy_global_pattern,$this->data, $yymatches, null, $this->counter)) {
+            if (preg_match($this->yy_global_pattern5, $this->data, $yymatches, null, $this->counter)) {
                 $yysubmatches = $yymatches;
                 $yymatches = preg_grep("/(.|\s)+/", $yysubmatches);
-                if (!count($yymatches)) {
-                    throw new Exception('Error: lexing failed because a rule matched' .
-                        ' an empty string.  Input "' . substr($this->data,
-                        $this->counter, 5) . '... state SECTION');
+                if (empty($yymatches)) {
+                    throw new Exception('Error: lexing failed because a rule matched' . ' an empty string.  Input "' . substr($this->data, $this->counter, 5) . '... state SECTION');
                 }
                 next($yymatches); // skip global match
                 $this->token = key($yymatches); // token number
-                if ($tokenMap[$this->token]) {
-                    // extract sub-patterns for passing to lex function
-                    $yysubmatches = array_slice($yysubmatches, $this->token + 1,
-                        $tokenMap[$this->token]);
-                } else {
-                    $yysubmatches = array();
-                }
                 $this->value = current($yymatches); // token value
-                $r = $this->{'yy_r5_' . $this->token}($yysubmatches);
+                $r = $this->{'yy_r5_' . $this->token}();
                 if ($r === null) {
                     $this->counter += strlen($this->value);
                     $this->line += substr_count($this->value, "\n");
@@ -609,66 +573,54 @@ class Smarty_Internal_Configfilelexer
                 } elseif ($r === false) {
                     $this->counter += strlen($this->value);
                     $this->line += substr_count($this->value, "\n");
-                    if ($this->counter >=  strlen($this->data)) {
+                    if ($this->counter >= strlen($this->data)) {
                         return false; // end of input
                     }
                     // skip this token
                     continue;
-                }            } else {
-                throw new Exception('Unexpected input at line' . $this->line .
-                    ': ' . $this->data[$this->counter]);
+                }
+            } else {
+                throw new Exception('Unexpected input at line' . $this->line . ': ' . $this->data[$this->counter]);
             }
             break;
         } while (true);
-
     } // end function
 
-
     const SECTION = 5;
-    function yy_r5_1($yy_subpatterns)
+
+    function yy_r5_1()
     {
 
-    $this->token = Smarty_Internal_Configfileparser::TPC_DOT;
+        $this->token = Smarty_Internal_Configfileparser::TPC_DOT;
     }
-    function yy_r5_2($yy_subpatterns)
+
+    function yy_r5_2()
     {
 
-    $this->token = Smarty_Internal_Configfileparser::TPC_SECTION;
-    $this->yypopstate();
+        $this->token = Smarty_Internal_Configfileparser::TPC_SECTION;
+        $this->yypopstate();
     }
 
-
     public function yylex6()
     {
-        $tokenMap = array (
-              1 => 0,
-              2 => 0,
-            );
-        if ($this->counter >=  strlen($this->data)) {
+        if (!isset($this->yy_global_pattern6)) {
+            $this->yy_global_pattern6 = "/\G(\"\"\"(?=[ \t\r]*[\n#;]))|\G([\S\s])/iS";
+        }
+        if ($this->counter >= strlen($this->data)) {
             return false; // end of input
         }
-        $yy_global_pattern = "/\G(\"\"\"(?=[ \t\r]*[\n#;]))|\G([\S\s])/iS";
 
         do {
-            if (preg_match($yy_global_pattern,$this->data, $yymatches, null, $this->counter)) {
+            if (preg_match($this->yy_global_pattern6, $this->data, $yymatches, null, $this->counter)) {
                 $yysubmatches = $yymatches;
                 $yymatches = preg_grep("/(.|\s)+/", $yysubmatches);
-                if (!count($yymatches)) {
-                    throw new Exception('Error: lexing failed because a rule matched' .
-                        ' an empty string.  Input "' . substr($this->data,
-                        $this->counter, 5) . '... state TRIPPLE');
+                if (empty($yymatches)) {
+                    throw new Exception('Error: lexing failed because a rule matched' . ' an empty string.  Input "' . substr($this->data, $this->counter, 5) . '... state TRIPPLE');
                 }
                 next($yymatches); // skip global match
                 $this->token = key($yymatches); // token number
-                if ($tokenMap[$this->token]) {
-                    // extract sub-patterns for passing to lex function
-                    $yysubmatches = array_slice($yysubmatches, $this->token + 1,
-                        $tokenMap[$this->token]);
-                } else {
-                    $yysubmatches = array();
-                }
                 $this->value = current($yymatches); // token value
-                $r = $this->{'yy_r6_' . $this->token}($yysubmatches);
+                $r = $this->{'yy_r6_' . $this->token}();
                 if ($r === null) {
                     $this->counter += strlen($this->value);
                     $this->line += substr_count($this->value, "\n");
@@ -681,42 +633,40 @@ class Smarty_Internal_Configfilelexer
                 } elseif ($r === false) {
                     $this->counter += strlen($this->value);
                     $this->line += substr_count($this->value, "\n");
-                    if ($this->counter >=  strlen($this->data)) {
+                    if ($this->counter >= strlen($this->data)) {
                         return false; // end of input
                     }
                     // skip this token
                     continue;
-                }            } else {
-                throw new Exception('Unexpected input at line' . $this->line .
-                    ': ' . $this->data[$this->counter]);
+                }
+            } else {
+                throw new Exception('Unexpected input at line' . $this->line . ': ' . $this->data[$this->counter]);
             }
             break;
         } while (true);
-
     } // end function
 
-
     const TRIPPLE = 6;
-    function yy_r6_1($yy_subpatterns)
+
+    function yy_r6_1()
     {
 
-    $this->token = Smarty_Internal_Configfileparser::TPC_TRIPPLE_QUOTES_END;
-    $this->yypopstate();
-    $this->yypushstate(self::START);
+        $this->token = Smarty_Internal_Configfileparser::TPC_TRIPPLE_QUOTES_END;
+        $this->yypopstate();
+        $this->yypushstate(self::START);
     }
-    function yy_r6_2($yy_subpatterns)
+
+    function yy_r6_2()
     {
 
-  $to = strlen($this->data);
-  preg_match("/\"\"\"[ \t\r]*[\n#;]/",$this->data,$match,PREG_OFFSET_CAPTURE,$this->counter);
-  if (isset($match[0][1])) {
-    $to = $match[0][1];
-  } else {
-    $this->compiler->trigger_template_error ("missing or misspelled literal closing tag");
-  }  
-  $this->value = substr($this->data,$this->counter,$to-$this->counter);
-  $this->token = Smarty_Internal_Configfileparser::TPC_TRIPPLE_TEXT;
+        $to = strlen($this->data);
+        preg_match("/\"\"\"[ \t\r]*[\n#;]/", $this->data, $match, PREG_OFFSET_CAPTURE, $this->counter);
+        if (isset($match[0][1])) {
+            $to = $match[0][1];
+        } else {
+            $this->compiler->trigger_template_error("missing or misspelled literal closing tag");
+        }
+        $this->value = substr($this->data, $this->counter, $to - $this->counter);
+        $this->token = Smarty_Internal_Configfileparser::TPC_TRIPPLE_TEXT;
     }
-
-
 }
diff --git a/libs/smarty/sysplugins/smarty_internal_configfileparser.php b/libs/smarty/sysplugins/smarty_internal_configfileparser.php
index acb401a80..51e4a9bbf 100644
--- a/libs/smarty/sysplugins/smarty_internal_configfileparser.php
+++ b/libs/smarty/sysplugins/smarty_internal_configfileparser.php
@@ -1,7 +1,10 @@
 <?php
+
 class TPC_yyToken implements ArrayAccess
 {
+
     public $string = '';
+
     public $metadata = array();
 
     public function __construct($s, $m = array())
@@ -38,8 +41,7 @@ class TPC_yyToken implements ArrayAccess
     {
         if ($offset === null) {
             if (isset($value[0])) {
-                $x = ($value instanceof TPC_yyToken) ?
-                    $value->metadata : $value;
+                $x = ($value instanceof TPC_yyToken) ? $value->metadata : $value;
                 $this->metadata = array_merge($this->metadata, $x);
 
                 return;
@@ -66,28 +68,31 @@ class TPC_yyToken implements ArrayAccess
 
 class TPC_yyStackEntry
 {
+
     public $stateno;       /* The state-number */
     public $major;         /* The major token value.  This is the code
                      ** number for the token at this stack level */
     public $minor; /* The user-supplied minor token value.  This
                      ** is the value of the token  */
-};
+}
 
+;
 
 #line 12 "../smarty/lexer/smarty_internal_configfileparser.y"
 
 /**
-* Smarty Internal Plugin Configfileparse
-*
-* This is the config file parser.
-* It is generated from the smarty_internal_configfileparser.y file
-* @package Smarty
-* @subpackage Compiler
-* @author Uwe Tews
-*/
+ * Smarty Internal Plugin Configfileparse
+ *
+ * This is the config file parser.
+ * It is generated from the smarty_internal_configfileparser.y file
+ *
+ * @package    Smarty
+ * @subpackage Compiler
+ * @author     Uwe Tews
+ */
 class Smarty_Internal_Configfileparser
 {
-#line 25 "../smarty/lexer/smarty_internal_configfileparser.y"
+    #line 25 "../smarty/lexer/smarty_internal_configfileparser.y"
 
     /**
      * result status
@@ -95,59 +100,67 @@ class Smarty_Internal_Configfileparser
      * @var bool
      */
     public $successful = true;
+
     /**
      * return value
      *
      * @var mixed
      */
     public $retvalue = 0;
+
     /**
      * @var
      */
     public $yymajor;
+
     /**
      * lexer object
      *
      * @var Smarty_Internal_Configfilelexer
      */
     private $lex;
+
     /**
      * internal error flag
      *
      * @var bool
      */
     private $internalError = false;
+
     /**
      * compiler object
      *
      * @var Smarty_Internal_Config_File_Compiler
      */
     public $compiler = null;
+
     /**
      * smarty object
      *
      * @var Smarty
      */
     public $smarty = null;
+
     /**
      * copy of config_overwrite property
      *
      * @var bool
      */
     private $configOverwrite = false;
+
     /**
      * copy of config_read_hidden property
      *
      * @var bool
      */
     private $configReadHidden = false;
+
     /**
      * helper map
      *
      * @var array
      */
-    private static $escapes_single = Array('\\' => '\\',
-                                           '\'' => '\'');
+    private static $escapes_single = Array('\\' => '\\', '\'' => '\'');
 
     /**
      * constructor
@@ -300,106 +313,86 @@ class Smarty_Internal_Configfileparser
         }
     }
 
-    const TPC_OPENB                          =  1;
-    const TPC_SECTION                        =  2;
-    const TPC_CLOSEB                         =  3;
-    const TPC_DOT                            =  4;
-    const TPC_ID                             =  5;
-    const TPC_EQUAL                          =  6;
-    const TPC_FLOAT                          =  7;
-    const TPC_INT                            =  8;
-    const TPC_BOOL                           =  9;
-    const TPC_SINGLE_QUOTED_STRING           = 10;
-    const TPC_DOUBLE_QUOTED_STRING           = 11;
-    const TPC_TRIPPLE_QUOTES                 = 12;
-    const TPC_TRIPPLE_TEXT                   = 13;
-    const TPC_TRIPPLE_QUOTES_END             = 14;
-    const TPC_NAKED_STRING                   = 15;
-    const TPC_OTHER                          = 16;
-    const TPC_NEWLINE                        = 17;
-    const TPC_COMMENTSTART                   = 18;
+    const TPC_OPENB = 1;
+
+    const TPC_SECTION = 2;
+
+    const TPC_CLOSEB = 3;
+
+    const TPC_DOT = 4;
+
+    const TPC_ID = 5;
+
+    const TPC_EQUAL = 6;
+
+    const TPC_FLOAT = 7;
+
+    const TPC_INT = 8;
+
+    const TPC_BOOL = 9;
+
+    const TPC_SINGLE_QUOTED_STRING = 10;
+
+    const TPC_DOUBLE_QUOTED_STRING = 11;
+
+    const TPC_TRIPPLE_QUOTES = 12;
+
+    const TPC_TRIPPLE_TEXT = 13;
+
+    const TPC_TRIPPLE_QUOTES_END = 14;
+
+    const TPC_NAKED_STRING = 15;
+
+    const TPC_OTHER = 16;
+
+    const TPC_NEWLINE = 17;
+
+    const TPC_COMMENTSTART = 18;
+
     const YY_NO_ACTION = 60;
+
     const YY_ACCEPT_ACTION = 59;
+
     const YY_ERROR_ACTION = 58;
 
     const YY_SZ_ACTTAB = 38;
-static public $yy_action = array(
-     29,   30,   34,   33,   24,   13,   19,   25,   35,   21,
-     59,    8,    3,    1,   20,   12,   14,   31,   20,   12,
-     15,   17,   23,   18,   27,   26,    4,    5,    6,   32,
-      2,   11,   28,   22,   16,    9,    7,   10,
-    );
-    static public $yy_lookahead = array(
-      7,    8,    9,   10,   11,   12,    5,   27,   15,   16,
-     20,   21,   23,   23,   17,   18,   13,   14,   17,   18,
-     15,    2,   17,    4,   25,   26,    6,    3,    3,   14,
-     23,    1,   24,   17,    2,   25,   22,   25,
-);
-    const YY_SHIFT_USE_DFLT = -8;
+
+    static public $yy_action = array(29, 30, 34, 33, 24, 13, 19, 25, 35, 21, 59, 8, 3, 1, 20, 12, 14, 31, 20, 12, 15, 17, 23, 18, 27, 26, 4, 5, 6, 32, 2, 11, 28, 22, 16, 9, 7, 10,);
+
+    static public $yy_lookahead = array(7, 8, 9, 10, 11, 12, 5, 27, 15, 16, 20, 21, 23, 23, 17, 18, 13, 14, 17, 18, 15, 2, 17, 4, 25, 26, 6, 3, 3, 14, 23, 1, 24, 17, 2, 25, 22, 25,);
+
+    const YY_SHIFT_USE_DFLT = - 8;
+
     const YY_SHIFT_MAX = 19;
-    static public $yy_shift_ofst = array(
-     -8,    1,    1,    1,   -7,   -3,   -3,   30,   -8,   -8,
-     -8,   19,    5,    3,   15,   16,   24,   25,   32,   20,
-);
-    const YY_REDUCE_USE_DFLT = -21;
+
+    static public $yy_shift_ofst = array(- 8, 1, 1, 1, - 7, - 3, - 3, 30, - 8, - 8, - 8, 19, 5, 3, 15, 16, 24, 25, 32, 20,);
+
+    const YY_REDUCE_USE_DFLT = - 21;
+
     const YY_REDUCE_MAX = 10;
-    static public $yy_reduce_ofst = array(
-    -10,   -1,   -1,   -1,  -20,   10,   12,    8,   14,    7,
-    -11,
-);
-    static public $yyExpectedTokens = array(
-         array(),
-         array(5, 17, 18, ),
-         array(5, 17, 18, ),
-         array(5, 17, 18, ),
-         array(7, 8, 9, 10, 11, 12, 15, 16, ),
-         array(17, 18, ),
-         array(17, 18, ),
-         array(1, ),
-         array(),
-         array(),
-         array(),
-         array(2, 4, ),
-         array(15, 17, ),
-         array(13, 14, ),
-         array(14, ),
-         array(17, ),
-         array(3, ),
-         array(3, ),
-         array(2, ),
-         array(6, ),
-         array(),
-         array(),
-         array(),
-         array(),
-         array(),
-         array(),
-         array(),
-         array(),
-         array(),
-         array(),
-         array(),
-         array(),
-         array(),
-         array(),
-         array(),
-         array(),
-);
-    static public $yy_default = array(
-     44,   37,   41,   40,   58,   58,   58,   36,   39,   44,
-     44,   58,   58,   58,   58,   58,   58,   58,   58,   58,
-     55,   54,   57,   56,   50,   45,   43,   42,   38,   46,
-     47,   52,   51,   49,   48,   53,
-);
+
+    static public $yy_reduce_ofst = array(- 10, - 1, - 1, - 1, - 20, 10, 12, 8, 14, 7, - 11,);
+
+    static public $yyExpectedTokens = array(array(), array(5, 17, 18,), array(5, 17, 18,), array(5, 17, 18,), array(7, 8, 9, 10, 11, 12, 15, 16,), array(17, 18,), array(17, 18,), array(1,), array(), array(), array(), array(2, 4,), array(15, 17,), array(13, 14,), array(14,), array(17,), array(3,), array(3,), array(2,), array(6,), array(), array(), array(), array(), array(), array(), array(), array(), array(), array(), array(), array(), array(), array(), array(), array(),);
+
+    static public $yy_default = array(44, 37, 41, 40, 58, 58, 58, 36, 39, 44, 44, 58, 58, 58, 58, 58, 58, 58, 58, 58, 55, 54, 57, 56, 50, 45, 43, 42, 38, 46, 47, 52, 51, 49, 48, 53,);
+
     const YYNOCODE = 29;
+
     const YYSTACKDEPTH = 100;
+
     const YYNSTATE = 36;
+
     const YYNRULE = 22;
+
     const YYERRORSYMBOL = 19;
+
     const YYERRSYMDT = 'yy0';
+
     const YYFALLBACK = 0;
-    public static $yyFallback = array(
-    );
+
+    public static $yyFallback = array();
+
     public function Trace($TraceFILE, $zTracePrompt)
     {
         if (!$TraceFILE) {
@@ -418,45 +411,16 @@ static public $yy_action = array(
     }
 
     public $yyTraceFILE;
+
     public $yyTracePrompt;
+
     public $yyidx;                    /* Index of top element in stack */
     public $yyerrcnt;                 /* Shifts left before out of the error */
     public $yystack = array();  /* The parser's stack */
 
-    public $yyTokenName = array(
-  '$',             'OPENB',         'SECTION',       'CLOSEB',      
-  'DOT',           'ID',            'EQUAL',         'FLOAT',       
-  'INT',           'BOOL',          'SINGLE_QUOTED_STRING',  'DOUBLE_QUOTED_STRING',
-  'TRIPPLE_QUOTES',  'TRIPPLE_TEXT',  'TRIPPLE_QUOTES_END',  'NAKED_STRING',
-  'OTHER',         'NEWLINE',       'COMMENTSTART',  'error',       
-  'start',         'global_vars',   'sections',      'var_list',    
-  'section',       'newline',       'var',           'value',       
-    );
+    public $yyTokenName = array('$', 'OPENB', 'SECTION', 'CLOSEB', 'DOT', 'ID', 'EQUAL', 'FLOAT', 'INT', 'BOOL', 'SINGLE_QUOTED_STRING', 'DOUBLE_QUOTED_STRING', 'TRIPPLE_QUOTES', 'TRIPPLE_TEXT', 'TRIPPLE_QUOTES_END', 'NAKED_STRING', 'OTHER', 'NEWLINE', 'COMMENTSTART', 'error', 'start', 'global_vars', 'sections', 'var_list', 'section', 'newline', 'var', 'value',);
 
-    public static $yyRuleName = array(
-  "start ::= global_vars sections",
-  "global_vars ::= var_list",
-  "sections ::= sections section",
-  "sections ::=",
-  "section ::= OPENB SECTION CLOSEB newline var_list",
-  "section ::= OPENB DOT SECTION CLOSEB newline var_list",
-  "var_list ::= var_list newline",
-  "var_list ::= var_list var",
-  "var_list ::=",
-  "var ::= ID EQUAL value",
-  "value ::= FLOAT",
-  "value ::= INT",
-  "value ::= BOOL",
-  "value ::= SINGLE_QUOTED_STRING",
-  "value ::= DOUBLE_QUOTED_STRING",
-  "value ::= TRIPPLE_QUOTES TRIPPLE_TEXT TRIPPLE_QUOTES_END",
-  "value ::= TRIPPLE_QUOTES TRIPPLE_QUOTES_END",
-  "value ::= NAKED_STRING",
-  "value ::= OTHER",
-  "newline ::= NEWLINE",
-  "newline ::= COMMENTSTART NEWLINE",
-  "newline ::= COMMENTSTART NAKED_STRING NEWLINE",
-    );
+    public static $yyRuleName = array('start ::= global_vars sections', 'global_vars ::= var_list', 'sections ::= sections section', 'sections ::=', 'section ::= OPENB SECTION CLOSEB newline var_list', 'section ::= OPENB DOT SECTION CLOSEB newline var_list', 'var_list ::= var_list newline', 'var_list ::= var_list var', 'var_list ::=', 'var ::= ID EQUAL value', 'value ::= FLOAT', 'value ::= INT', 'value ::= BOOL', 'value ::= SINGLE_QUOTED_STRING', 'value ::= DOUBLE_QUOTED_STRING', 'value ::= TRIPPLE_QUOTES TRIPPLE_TEXT TRIPPLE_QUOTES_END', 'value ::= TRIPPLE_QUOTES TRIPPLE_QUOTES_END', 'value ::= NAKED_STRING', 'value ::= OTHER', 'newline ::= NEWLINE', 'newline ::= COMMENTSTART NEWLINE', 'newline ::= COMMENTSTART NAKED_STRING NEWLINE',);
 
     public function tokenName($tokenType)
     {
@@ -473,24 +437,23 @@ static public $yy_action = array(
     public static function yy_destructor($yymajor, $yypminor)
     {
         switch ($yymajor) {
-            default:  break;   /* If no destructor action specified: do nothing */
+            default:
+                break;   /* If no destructor action specified: do nothing */
         }
     }
 
     public function yy_pop_parser_stack()
     {
-        if (!count($this->yystack)) {
+        if (empty($this->yystack)) {
             return;
         }
         $yytos = array_pop($this->yystack);
         if ($this->yyTraceFILE && $this->yyidx >= 0) {
-            fwrite($this->yyTraceFILE,
-                $this->yyTracePrompt . 'Popping ' . $this->yyTokenName[$yytos->major] .
-                    "\n");
+            fwrite($this->yyTraceFILE, $this->yyTracePrompt . 'Popping ' . $this->yyTokenName[$yytos->major] . "\n");
         }
         $yymajor = $yytos->major;
         self::yy_destructor($yymajor, $yytos->minor);
-        $this->yyidx--;
+        $this->yyidx --;
 
         return $yymajor;
     }
@@ -507,10 +470,18 @@ static public $yy_action = array(
 
     public function yy_get_expected_tokens($token)
     {
+        static $res3 = array();
+        static $res4 = array();
         $state = $this->yystack[$this->yyidx]->stateno;
         $expected = self::$yyExpectedTokens[$state];
-        if (in_array($token, self::$yyExpectedTokens[$state], true)) {
-            return $expected;
+        if (isset($res3[$state][$token])) {
+            if ($res3[$state][$token]) {
+                return $expected;
+            }
+        } else {
+            if ($res3[$state][$token] = in_array($token, self::$yyExpectedTokens[$state], true)) {
+                return $expected;
+            }
         }
         $stack = $this->yystack;
         $yyidx = $this->yyidx;
@@ -520,7 +491,7 @@ static public $yy_action = array(
                 // reduce action
                 $done = 0;
                 do {
-                    if ($done++ == 100) {
+                    if ($done ++ == 100) {
                         $this->yyidx = $yyidx;
                         $this->yystack = $stack;
                         // too much recursion prevents proper detection
@@ -529,22 +500,26 @@ static public $yy_action = array(
                     }
                     $yyruleno = $yyact - self::YYNSTATE;
                     $this->yyidx -= self::$yyRuleInfo[$yyruleno][1];
-                    $nextstate = $this->yy_find_reduce_action(
-                        $this->yystack[$this->yyidx]->stateno,
-                        self::$yyRuleInfo[$yyruleno][0]);
+                    $nextstate = $this->yy_find_reduce_action($this->yystack[$this->yyidx]->stateno, self::$yyRuleInfo[$yyruleno][0]);
                     if (isset(self::$yyExpectedTokens[$nextstate])) {
-                $expected = array_merge($expected, self::$yyExpectedTokens[$nextstate]);
-                            if (in_array($token,
-                                  self::$yyExpectedTokens[$nextstate], true)) {
-                            $this->yyidx = $yyidx;
-                            $this->yystack = $stack;
-
-                            return array_unique($expected);
+                        $expected = array_merge($expected, self::$yyExpectedTokens[$nextstate]);
+                        if (isset($res4[$nextstate][$token])) {
+                            if ($res4[$nextstate][$token]) {
+                                $this->yyidx = $yyidx;
+                                $this->yystack = $stack;
+                                return array_unique($expected);
+                            }
+                        } else {
+                            if ($res4[$nextstate][$token] = in_array($token, self::$yyExpectedTokens[$nextstate], true)) {
+                                $this->yyidx = $yyidx;
+                                $this->yystack = $stack;
+                                return array_unique($expected);
+                            }
                         }
                     }
                     if ($nextstate < self::YYNSTATE) {
                         // we need to shift a non-terminal
-                        $this->yyidx++;
+                        $this->yyidx ++;
                         $x = new TPC_yyStackEntry;
                         $x->stateno = $nextstate;
                         $x->major = self::$yyRuleInfo[$yyruleno][0];
@@ -569,20 +544,28 @@ static public $yy_action = array(
             }
             break;
         } while (true);
-    $this->yyidx = $yyidx;
-    $this->yystack = $stack;
+        $this->yyidx = $yyidx;
+        $this->yystack = $stack;
 
         return array_unique($expected);
     }
 
     public function yy_is_expected_token($token)
     {
+        static $res = array();
+        static $res2 = array();
         if ($token === 0) {
             return true; // 0 is not part of this
         }
         $state = $this->yystack[$this->yyidx]->stateno;
-        if (in_array($token, self::$yyExpectedTokens[$state], true)) {
-            return true;
+        if (isset($res[$state][$token])) {
+            if ($res[$state][$token]) {
+                return true;
+            }
+        } else {
+            if ($res[$state][$token] = in_array($token, self::$yyExpectedTokens[$state], true)) {
+                return true;
+            }
         }
         $stack = $this->yystack;
         $yyidx = $this->yyidx;
@@ -592,7 +575,7 @@ static public $yy_action = array(
                 // reduce action
                 $done = 0;
                 do {
-                    if ($done++ == 100) {
+                    if ($done ++ == 100) {
                         $this->yyidx = $yyidx;
                         $this->yystack = $stack;
                         // too much recursion prevents proper detection
@@ -601,19 +584,23 @@ static public $yy_action = array(
                     }
                     $yyruleno = $yyact - self::YYNSTATE;
                     $this->yyidx -= self::$yyRuleInfo[$yyruleno][1];
-                    $nextstate = $this->yy_find_reduce_action(
-                        $this->yystack[$this->yyidx]->stateno,
-                        self::$yyRuleInfo[$yyruleno][0]);
-                    if (isset(self::$yyExpectedTokens[$nextstate]) &&
-                          in_array($token, self::$yyExpectedTokens[$nextstate], true)) {
-                        $this->yyidx = $yyidx;
-                        $this->yystack = $stack;
-
-                        return true;
+                    $nextstate = $this->yy_find_reduce_action($this->yystack[$this->yyidx]->stateno, self::$yyRuleInfo[$yyruleno][0]);
+                    if (isset($res2[$nextstate][$token])) {
+                        if ($res2[$nextstate][$token]) {
+                            $this->yyidx = $yyidx;
+                            $this->yystack = $stack;
+                            return true;
+                        }
+                    } else {
+                        if ($res2[$nextstate][$token] = (isset(self::$yyExpectedTokens[$nextstate]) && in_array($token, self::$yyExpectedTokens[$nextstate], true))) {
+                            $this->yyidx = $yyidx;
+                            $this->yystack = $stack;
+                            return true;
+                        }
                     }
                     if ($nextstate < self::YYNSTATE) {
                         // we need to shift a non-terminal
-                        $this->yyidx++;
+                        $this->yyidx ++;
                         $x = new TPC_yyStackEntry;
                         $x->stateno = $nextstate;
                         $x->major = self::$yyRuleInfo[$yyruleno][0];
@@ -648,7 +635,7 @@ static public $yy_action = array(
         return true;
     }
 
-   public function yy_find_shift_action($iLookAhead)
+    public function yy_find_shift_action($iLookAhead)
     {
         $stateno = $this->yystack[$this->yyidx]->stateno;
 
@@ -665,14 +652,10 @@ static public $yy_action = array(
             return self::YY_NO_ACTION;
         }
         $i += $iLookAhead;
-        if ($i < 0 || $i >= self::YY_SZ_ACTTAB ||
-              self::$yy_lookahead[$i] != $iLookAhead) {
-            if (count(self::$yyFallback) && $iLookAhead < count(self::$yyFallback)
-                   && ($iFallback = self::$yyFallback[$iLookAhead]) != 0) {
+        if ($i < 0 || $i >= self::YY_SZ_ACTTAB || self::$yy_lookahead[$i] != $iLookAhead) {
+            if (count(self::$yyFallback) && $iLookAhead < count(self::$yyFallback) && ($iFallback = self::$yyFallback[$iLookAhead]) != 0) {
                 if ($this->yyTraceFILE) {
-                    fwrite($this->yyTraceFILE, $this->yyTracePrompt . "FALLBACK " .
-                        $this->yyTokenName[$iLookAhead] . " => " .
-                        $this->yyTokenName[$iFallback] . "\n");
+                    fwrite($this->yyTraceFILE, $this->yyTracePrompt . "FALLBACK " . $this->yyTokenName[$iLookAhead] . " => " . $this->yyTokenName[$iFallback] . "\n");
                 }
 
                 return $this->yy_find_shift_action($iFallback);
@@ -699,8 +682,7 @@ static public $yy_action = array(
             return self::YY_NO_ACTION;
         }
         $i += $iLookAhead;
-        if ($i < 0 || $i >= self::YY_SZ_ACTTAB ||
-              self::$yy_lookahead[$i] != $iLookAhead) {
+        if ($i < 0 || $i >= self::YY_SZ_ACTTAB || self::$yy_lookahead[$i] != $iLookAhead) {
             return self::$yy_default[$stateno];
         } else {
             return self::$yy_action[$i];
@@ -709,19 +691,19 @@ static public $yy_action = array(
 
     public function yy_shift($yyNewState, $yyMajor, $yypMinor)
     {
-        $this->yyidx++;
+        $this->yyidx ++;
         if ($this->yyidx >= self::YYSTACKDEPTH) {
-            $this->yyidx--;
+            $this->yyidx --;
             if ($this->yyTraceFILE) {
                 fprintf($this->yyTraceFILE, "%sStack Overflow!\n", $this->yyTracePrompt);
             }
             while ($this->yyidx >= 0) {
                 $this->yy_pop_parser_stack();
             }
-#line 255 "../smarty/lexer/smarty_internal_configfileparser.y"
+            #line 255 "../smarty/lexer/smarty_internal_configfileparser.y"
 
-    $this->internalError = true;
-    $this->compiler->trigger_config_file_error("Stack overflow in configfile parser");
+            $this->internalError = true;
+            $this->compiler->trigger_config_file_error("Stack overflow in configfile parser");
 
             return;
         }
@@ -729,152 +711,132 @@ static public $yy_action = array(
         $yytos->stateno = $yyNewState;
         $yytos->major = $yyMajor;
         $yytos->minor = $yypMinor;
-        array_push($this->yystack, $yytos);
+        $this->yystack[] = $yytos;
         if ($this->yyTraceFILE && $this->yyidx > 0) {
-            fprintf($this->yyTraceFILE, "%sShift %d\n", $this->yyTracePrompt,
-                $yyNewState);
+            fprintf($this->yyTraceFILE, "%sShift %d\n", $this->yyTracePrompt, $yyNewState);
             fprintf($this->yyTraceFILE, "%sStack:", $this->yyTracePrompt);
-            for ($i = 1; $i <= $this->yyidx; $i++) {
-                fprintf($this->yyTraceFILE, " %s",
-                    $this->yyTokenName[$this->yystack[$i]->major]);
+            for ($i = 1; $i <= $this->yyidx; $i ++) {
+                fprintf($this->yyTraceFILE, " %s", $this->yyTokenName[$this->yystack[$i]->major]);
             }
-            fwrite($this->yyTraceFILE,"\n");
+            fwrite($this->yyTraceFILE, "\n");
         }
     }
 
-    public static $yyRuleInfo = array(
-  array( 0 => 20, 1 => 2 ),
-  array( 0 => 21, 1 => 1 ),
-  array( 0 => 22, 1 => 2 ),
-  array( 0 => 22, 1 => 0 ),
-  array( 0 => 24, 1 => 5 ),
-  array( 0 => 24, 1 => 6 ),
-  array( 0 => 23, 1 => 2 ),
-  array( 0 => 23, 1 => 2 ),
-  array( 0 => 23, 1 => 0 ),
-  array( 0 => 26, 1 => 3 ),
-  array( 0 => 27, 1 => 1 ),
-  array( 0 => 27, 1 => 1 ),
-  array( 0 => 27, 1 => 1 ),
-  array( 0 => 27, 1 => 1 ),
-  array( 0 => 27, 1 => 1 ),
-  array( 0 => 27, 1 => 3 ),
-  array( 0 => 27, 1 => 2 ),
-  array( 0 => 27, 1 => 1 ),
-  array( 0 => 27, 1 => 1 ),
-  array( 0 => 25, 1 => 1 ),
-  array( 0 => 25, 1 => 2 ),
-  array( 0 => 25, 1 => 3 ),
-    );
+    public static $yyRuleInfo = array(array(0 => 20, 1 => 2), array(0 => 21, 1 => 1), array(0 => 22, 1 => 2), array(0 => 22, 1 => 0), array(0 => 24, 1 => 5), array(0 => 24, 1 => 6), array(0 => 23, 1 => 2), array(0 => 23, 1 => 2), array(0 => 23, 1 => 0), array(0 => 26, 1 => 3), array(0 => 27, 1 => 1), array(0 => 27, 1 => 1), array(0 => 27, 1 => 1), array(0 => 27, 1 => 1), array(0 => 27, 1 => 1), array(0 => 27, 1 => 3), array(0 => 27, 1 => 2), array(0 => 27, 1 => 1), array(0 => 27, 1 => 1), array(0 => 25, 1 => 1), array(0 => 25, 1 => 2), array(0 => 25, 1 => 3),);
 
-    public static $yyReduceMap = array(
-        0 => 0,
-        2 => 0,
-        3 => 0,
-        19 => 0,
-        20 => 0,
-        21 => 0,
-        1 => 1,
-        4 => 4,
-        5 => 5,
-        6 => 6,
-        7 => 7,
-        8 => 8,
-        9 => 9,
-        10 => 10,
-        11 => 11,
-        12 => 12,
-        13 => 13,
-        14 => 14,
-        15 => 15,
-        16 => 16,
-        17 => 17,
-        18 => 17,
-    );
-#line 261 "../smarty/lexer/smarty_internal_configfileparser.y"
-    function yy_r0(){
-    $this->_retvalue = null;
+    public static $yyReduceMap = array(0 => 0, 2 => 0, 3 => 0, 19 => 0, 20 => 0, 21 => 0, 1 => 1, 4 => 4, 5 => 5, 6 => 6, 7 => 7, 8 => 8, 9 => 9, 10 => 10, 11 => 11, 12 => 12, 13 => 13, 14 => 14, 15 => 15, 16 => 16, 17 => 17, 18 => 17,);
+
+    #line 261 "../smarty/lexer/smarty_internal_configfileparser.y"
+    function yy_r0()
+    {
+        $this->_retvalue = null;
     }
-#line 266 "../smarty/lexer/smarty_internal_configfileparser.y"
-    function yy_r1(){
-    $this->add_global_vars($this->yystack[$this->yyidx + 0]->minor);
-    $this->_retvalue = null;
+
+    #line 266 "../smarty/lexer/smarty_internal_configfileparser.y"
+    function yy_r1()
+    {
+        $this->add_global_vars($this->yystack[$this->yyidx + 0]->minor);
+        $this->_retvalue = null;
     }
-#line 280 "../smarty/lexer/smarty_internal_configfileparser.y"
-    function yy_r4(){
-    $this->add_section_vars($this->yystack[$this->yyidx + -3]->minor, $this->yystack[$this->yyidx + 0]->minor);
-    $this->_retvalue = null;
+
+    #line 280 "../smarty/lexer/smarty_internal_configfileparser.y"
+    function yy_r4()
+    {
+        $this->add_section_vars($this->yystack[$this->yyidx + - 3]->minor, $this->yystack[$this->yyidx + 0]->minor);
+        $this->_retvalue = null;
     }
-#line 285 "../smarty/lexer/smarty_internal_configfileparser.y"
-    function yy_r5(){
-    if ($this->configReadHidden) {
-        $this->add_section_vars($this->yystack[$this->yyidx + -3]->minor, $this->yystack[$this->yyidx + 0]->minor);
+
+    #line 285 "../smarty/lexer/smarty_internal_configfileparser.y"
+    function yy_r5()
+    {
+        if ($this->configReadHidden) {
+            $this->add_section_vars($this->yystack[$this->yyidx + - 3]->minor, $this->yystack[$this->yyidx + 0]->minor);
+        }
+        $this->_retvalue = null;
     }
-    $this->_retvalue = null;
+
+    #line 293 "../smarty/lexer/smarty_internal_configfileparser.y"
+    function yy_r6()
+    {
+        $this->_retvalue = $this->yystack[$this->yyidx + - 1]->minor;
     }
-#line 293 "../smarty/lexer/smarty_internal_configfileparser.y"
-    function yy_r6(){
-    $this->_retvalue = $this->yystack[$this->yyidx + -1]->minor;
+
+    #line 297 "../smarty/lexer/smarty_internal_configfileparser.y"
+    function yy_r7()
+    {
+        $this->_retvalue = array_merge($this->yystack[$this->yyidx + - 1]->minor, Array($this->yystack[$this->yyidx + 0]->minor));
     }
-#line 297 "../smarty/lexer/smarty_internal_configfileparser.y"
-    function yy_r7(){
-    $this->_retvalue = array_merge($this->yystack[$this->yyidx + -1]->minor, Array($this->yystack[$this->yyidx + 0]->minor));
+
+    #line 301 "../smarty/lexer/smarty_internal_configfileparser.y"
+    function yy_r8()
+    {
+        $this->_retvalue = Array();
     }
-#line 301 "../smarty/lexer/smarty_internal_configfileparser.y"
-    function yy_r8(){
-    $this->_retvalue = Array();
+
+    #line 307 "../smarty/lexer/smarty_internal_configfileparser.y"
+    function yy_r9()
+    {
+        $this->_retvalue = Array("key" => $this->yystack[$this->yyidx + - 2]->minor, "value" => $this->yystack[$this->yyidx + 0]->minor);
     }
-#line 307 "../smarty/lexer/smarty_internal_configfileparser.y"
-    function yy_r9(){
-    $this->_retvalue = Array("key" => $this->yystack[$this->yyidx + -2]->minor, "value" => $this->yystack[$this->yyidx + 0]->minor);
+
+    #line 312 "../smarty/lexer/smarty_internal_configfileparser.y"
+    function yy_r10()
+    {
+        $this->_retvalue = (float) $this->yystack[$this->yyidx + 0]->minor;
     }
-#line 312 "../smarty/lexer/smarty_internal_configfileparser.y"
-    function yy_r10(){
-    $this->_retvalue = (float) $this->yystack[$this->yyidx + 0]->minor;
+
+    #line 316 "../smarty/lexer/smarty_internal_configfileparser.y"
+    function yy_r11()
+    {
+        $this->_retvalue = (int) $this->yystack[$this->yyidx + 0]->minor;
     }
-#line 316 "../smarty/lexer/smarty_internal_configfileparser.y"
-    function yy_r11(){
-    $this->_retvalue = (int) $this->yystack[$this->yyidx + 0]->minor;
+
+    #line 320 "../smarty/lexer/smarty_internal_configfileparser.y"
+    function yy_r12()
+    {
+        $this->_retvalue = $this->parse_bool($this->yystack[$this->yyidx + 0]->minor);
     }
-#line 320 "../smarty/lexer/smarty_internal_configfileparser.y"
-    function yy_r12(){
-    $this->_retvalue = $this->parse_bool($this->yystack[$this->yyidx + 0]->minor);
+
+    #line 324 "../smarty/lexer/smarty_internal_configfileparser.y"
+    function yy_r13()
+    {
+        $this->_retvalue = self::parse_single_quoted_string($this->yystack[$this->yyidx + 0]->minor);
     }
-#line 324 "../smarty/lexer/smarty_internal_configfileparser.y"
-    function yy_r13(){
-    $this->_retvalue = self::parse_single_quoted_string($this->yystack[$this->yyidx + 0]->minor);
+
+    #line 328 "../smarty/lexer/smarty_internal_configfileparser.y"
+    function yy_r14()
+    {
+        $this->_retvalue = self::parse_double_quoted_string($this->yystack[$this->yyidx + 0]->minor);
     }
-#line 328 "../smarty/lexer/smarty_internal_configfileparser.y"
-    function yy_r14(){
-    $this->_retvalue = self::parse_double_quoted_string($this->yystack[$this->yyidx + 0]->minor);
+
+    #line 332 "../smarty/lexer/smarty_internal_configfileparser.y"
+    function yy_r15()
+    {
+        $this->_retvalue = self::parse_tripple_double_quoted_string($this->yystack[$this->yyidx + - 1]->minor);
     }
-#line 332 "../smarty/lexer/smarty_internal_configfileparser.y"
-    function yy_r15(){
-    $this->_retvalue = self::parse_tripple_double_quoted_string($this->yystack[$this->yyidx + -1]->minor);
+
+    #line 336 "../smarty/lexer/smarty_internal_configfileparser.y"
+    function yy_r16()
+    {
+        $this->_retvalue = '';
     }
-#line 336 "../smarty/lexer/smarty_internal_configfileparser.y"
-    function yy_r16(){
-    $this->_retvalue = '';
-    }
-#line 340 "../smarty/lexer/smarty_internal_configfileparser.y"
-    function yy_r17(){
-    $this->_retvalue = $this->yystack[$this->yyidx + 0]->minor;
+
+    #line 340 "../smarty/lexer/smarty_internal_configfileparser.y"
+    function yy_r17()
+    {
+        $this->_retvalue = $this->yystack[$this->yyidx + 0]->minor;
     }
 
     private $_retvalue;
 
     public function yy_reduce($yyruleno)
     {
-        $yymsp = $this->yystack[$this->yyidx];
-        if ($this->yyTraceFILE && $yyruleno >= 0
-              && $yyruleno < count(self::$yyRuleName)) {
-            fprintf($this->yyTraceFILE, "%sReduce (%d) [%s].\n",
-                $this->yyTracePrompt, $yyruleno,
-                self::$yyRuleName[$yyruleno]);
+        if ($this->yyTraceFILE && $yyruleno >= 0 && $yyruleno < count(self::$yyRuleName)) {
+            fprintf($this->yyTraceFILE, "%sReduce (%d) [%s].\n", $this->yyTracePrompt, $yyruleno, self::$yyRuleName[$yyruleno]);
         }
 
         $this->_retvalue = $yy_lefthand_side = null;
-        if (array_key_exists($yyruleno, self::$yyReduceMap)) {
+        if (isset(self::$yyReduceMap[$yyruleno])) {
             // call the action
             $this->_retvalue = null;
             $this->{'yy_r' . self::$yyReduceMap[$yyruleno]}();
@@ -883,14 +845,14 @@ static public $yy_action = array(
         $yygoto = self::$yyRuleInfo[$yyruleno][0];
         $yysize = self::$yyRuleInfo[$yyruleno][1];
         $this->yyidx -= $yysize;
-        for ($i = $yysize; $i; $i--) {
+        for ($i = $yysize; $i; $i --) {
             // pop all of the right-hand side parameters
             array_pop($this->yystack);
         }
         $yyact = $this->yy_find_reduce_action($this->yystack[$this->yyidx]->stateno, $yygoto);
         if ($yyact < self::YYNSTATE) {
             if (!$this->yyTraceFILE && $yysize) {
-                $this->yyidx++;
+                $this->yyidx ++;
                 $x = new TPC_yyStackEntry;
                 $x->stateno = $yyact;
                 $x->major = $yygoto;
@@ -908,32 +870,34 @@ static public $yy_action = array(
     {
         if ($this->yyTraceFILE) {
             fprintf($this->yyTraceFILE, "%sFail!\n", $this->yyTracePrompt);
-        } while ($this->yyidx >= 0) {
+        }
+        while ($this->yyidx >= 0) {
             $this->yy_pop_parser_stack();
         }
     }
 
     public function yy_syntax_error($yymajor, $TOKEN)
     {
-#line 248 "../smarty/lexer/smarty_internal_configfileparser.y"
+        #line 248 "../smarty/lexer/smarty_internal_configfileparser.y"
 
-    $this->internalError = true;
-    $this->yymajor = $yymajor;
-    $this->compiler->trigger_config_file_error();
+        $this->internalError = true;
+        $this->yymajor = $yymajor;
+        $this->compiler->trigger_config_file_error();
     }
 
     public function yy_accept()
     {
         if ($this->yyTraceFILE) {
             fprintf($this->yyTraceFILE, "%sAccept!\n", $this->yyTracePrompt);
-        } while ($this->yyidx >= 0) {
+        }
+        while ($this->yyidx >= 0) {
             $this->yy_pop_parser_stack();
         }
-#line 241 "../smarty/lexer/smarty_internal_configfileparser.y"
+        #line 241 "../smarty/lexer/smarty_internal_configfileparser.y"
 
-    $this->successful = !$this->internalError;
-    $this->internalError = false;
-    $this->retvalue = $this->_retvalue;
+        $this->successful = !$this->internalError;
+        $this->internalError = false;
+        $this->retvalue = $this->_retvalue;
     }
 
     public function doParse($yymajor, $yytokenvalue)
@@ -942,30 +906,28 @@ static public $yy_action = array(
 
         if ($this->yyidx === null || $this->yyidx < 0) {
             $this->yyidx = 0;
-            $this->yyerrcnt = -1;
+            $this->yyerrcnt = - 1;
             $x = new TPC_yyStackEntry;
             $x->stateno = 0;
             $x->major = 0;
             $this->yystack = array();
-            array_push($this->yystack, $x);
+            $this->yystack[] = $x;
         }
-        $yyendofinput = ($yymajor==0);
+        $yyendofinput = ($yymajor == 0);
 
         if ($this->yyTraceFILE) {
-            fprintf($this->yyTraceFILE, "%sInput %s\n",
-                $this->yyTracePrompt, $this->yyTokenName[$yymajor]);
+            fprintf($this->yyTraceFILE, "%sInput %s\n", $this->yyTracePrompt, $this->yyTokenName[$yymajor]);
         }
 
         do {
             $yyact = $this->yy_find_shift_action($yymajor);
-            if ($yymajor < self::YYERRORSYMBOL &&
-                  !$this->yy_is_expected_token($yymajor)) {
+            if ($yymajor < self::YYERRORSYMBOL && !$this->yy_is_expected_token($yymajor)) {
                 // force a syntax error
                 $yyact = self::YY_ERROR_ACTION;
             }
             if ($yyact < self::YYNSTATE) {
                 $this->yy_shift($yyact, $yymajor, $yytokenvalue);
-                $this->yyerrcnt--;
+                $this->yyerrcnt --;
                 if ($yyendofinput && $this->yyidx >= 0) {
                     $yymajor = 0;
                 } else {
@@ -975,8 +937,7 @@ static public $yy_action = array(
                 $this->yy_reduce($yyact - self::YYNSTATE);
             } elseif ($yyact == self::YY_ERROR_ACTION) {
                 if ($this->yyTraceFILE) {
-                    fprintf($this->yyTraceFILE, "%sSyntax Error!\n",
-                        $this->yyTracePrompt);
+                    fprintf($this->yyTraceFILE, "%sSyntax Error!\n", $this->yyTracePrompt);
                 }
                 if (self::YYERRORSYMBOL) {
                     if ($this->yyerrcnt < 0) {
@@ -985,19 +946,15 @@ static public $yy_action = array(
                     $yymx = $this->yystack[$this->yyidx]->major;
                     if ($yymx == self::YYERRORSYMBOL || $yyerrorhit) {
                         if ($this->yyTraceFILE) {
-                            fprintf($this->yyTraceFILE, "%sDiscard input token %s\n",
-                                $this->yyTracePrompt, $this->yyTokenName[$yymajor]);
+                            fprintf($this->yyTraceFILE, "%sDiscard input token %s\n", $this->yyTracePrompt, $this->yyTokenName[$yymajor]);
                         }
                         $this->yy_destructor($yymajor, $yytokenvalue);
                         $yymajor = self::YYNOCODE;
                     } else {
-                        while ($this->yyidx >= 0 &&
-                                 $yymx != self::YYERRORSYMBOL &&
-        ($yyact = $this->yy_find_shift_action(self::YYERRORSYMBOL)) >= self::YYNSTATE
-                              ){
+                        while ($this->yyidx >= 0 && $yymx != self::YYERRORSYMBOL && ($yyact = $this->yy_find_shift_action(self::YYERRORSYMBOL)) >= self::YYNSTATE) {
                             $this->yy_pop_parser_stack();
                         }
-                        if ($this->yyidx < 0 || $yymajor==0) {
+                        if ($this->yyidx < 0 || $yymajor == 0) {
                             $this->yy_destructor($yymajor, $yytokenvalue);
                             $this->yy_parse_failed();
                             $yymajor = self::YYNOCODE;
diff --git a/libs/smarty/sysplugins/smarty_internal_debug.php b/libs/smarty/sysplugins/smarty_internal_debug.php
index 3241e6c5a..89eb9f3ab 100644
--- a/libs/smarty/sysplugins/smarty_internal_debug.php
+++ b/libs/smarty/sysplugins/smarty_internal_debug.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * Smarty Internal Plugin Debug
- * Class to collect data for the Smarty Debugging Consol
+ * Class to collect data for the Smarty Debugging Console
  *
  * @package    Smarty
  * @subpackage Debug
@@ -31,38 +31,67 @@ class Smarty_Internal_Debug extends Smarty_Internal_Data
     public static $ignore_uid = array();
 
     /**
-     * Ignore template
+     * Index of display() and fetch() calls
      *
-     * @param object $template
+     * @var int
      */
-    public static function ignore($template)
+    public static $index = 0;
+
+    /**
+     * Counter for window offset
+     *
+     * @var int
+     */
+    public static $offset = 0;
+
+    /**
+     * Start logging template
+     *
+     * @param \Smarty_Internal_Template $template template
+     * @param null                                $mode true: display   false: fetch  null: subtemolate
+     */
+    public static function start_template(Smarty_Internal_Template $template, $mode = null)
     {
-        // calculate Uid if not already done
-        if ($template->source->uid == '') {
-            $template->source->filepath;
+        if (isset($mode)) {
+            self::$index ++;
+            self::$offset ++;
+            self::$template_data[self::$index] = null;
         }
-        self::$ignore_uid[$template->source->uid] = true;
+        $key = self::get_key($template);
+        self::$template_data[self::$index][$key]['start_template_time'] = microtime(true);
+    }
+
+    /**
+     * End logging of cache time
+     *
+     * @param \Smarty_Internal_Template $template cached template
+     */
+    public static function end_template(Smarty_Internal_Template $template)
+    {
+        $key = self::get_key($template);
+        self::$template_data[self::$index][$key]['total_time'] += microtime(true) - self::$template_data[self::$index][$key]['start_template_time'];
+        self::$template_data[self::$index][$key]['properties'] = $template->properties;
     }
 
     /**
      * Start logging of compile time
      *
-     * @param object $template
+     * @param \Smarty_Internal_Template $template
      */
-    public static function start_compile($template)
+    public static function start_compile(Smarty_Internal_Template $template)
     {
         static $_is_stringy = array('string' => true, 'eval' => true);
         if (!empty($template->compiler->trace_uid)) {
             $key = $template->compiler->trace_uid;
-            if (!isset(self::$template_data[$key])) {
+            if (!isset(self::$template_data[self::$index][$key])) {
                 if (isset($_is_stringy[$template->source->type])) {
-                    self::$template_data[$key]['name'] = '\'' . substr($template->source->name, 0, 25) . '...\'';
+                    self::$template_data[self::$index][$key]['name'] = '\'' . substr($template->source->name, 0, 25) . '...\'';
                 } else {
-                    self::$template_data[$key]['name'] = $template->source->filepath;
+                    self::$template_data[self::$index][$key]['name'] = $template->source->filepath;
                 }
-                self::$template_data[$key]['compile_time'] = 0;
-                self::$template_data[$key]['render_time'] = 0;
-                self::$template_data[$key]['cache_time'] = 0;
+                self::$template_data[self::$index][$key]['compile_time'] = 0;
+                self::$template_data[self::$index][$key]['render_time'] = 0;
+                self::$template_data[self::$index][$key]['cache_time'] = 0;
             }
         } else {
             if (isset(self::$ignore_uid[$template->source->uid])) {
@@ -70,15 +99,15 @@ class Smarty_Internal_Debug extends Smarty_Internal_Data
             }
             $key = self::get_key($template);
         }
-        self::$template_data[$key]['start_time'] = microtime(true);
+        self::$template_data[self::$index][$key]['start_time'] = microtime(true);
     }
 
     /**
      * End logging of compile time
      *
-     * @param object $template
+     * @param \Smarty_Internal_Template $template
      */
-    public static function end_compile($template)
+    public static function end_compile(Smarty_Internal_Template $template)
     {
         if (!empty($template->compiler->trace_uid)) {
             $key = $template->compiler->trace_uid;
@@ -89,143 +118,142 @@ class Smarty_Internal_Debug extends Smarty_Internal_Data
 
             $key = self::get_key($template);
         }
-        self::$template_data[$key]['compile_time'] += microtime(true) - self::$template_data[$key]['start_time'];
+        self::$template_data[self::$index][$key]['compile_time'] += microtime(true) - self::$template_data[self::$index][$key]['start_time'];
     }
 
     /**
      * Start logging of render time
      *
-     * @param object $template
+     * @param \Smarty_Internal_Template $template
      */
-    public static function start_render($template)
+    public static function start_render(Smarty_Internal_Template $template)
     {
         $key = self::get_key($template);
-        self::$template_data[$key]['start_time'] = microtime(true);
+        self::$template_data[self::$index][$key]['start_time'] = microtime(true);
     }
 
     /**
      * End logging of compile time
      *
-     * @param object $template
+     * @param \Smarty_Internal_Template $template
      */
-    public static function end_render($template)
+    public static function end_render(Smarty_Internal_Template $template)
     {
         $key = self::get_key($template);
-        self::$template_data[$key]['render_time'] += microtime(true) - self::$template_data[$key]['start_time'];
+        self::$template_data[self::$index][$key]['render_time'] += microtime(true) - self::$template_data[self::$index][$key]['start_time'];
     }
 
     /**
      * Start logging of cache time
      *
-     * @param object $template cached template
+     * @param \Smarty_Internal_Template $template cached template
      */
-    public static function start_cache($template)
+    public static function start_cache(Smarty_Internal_Template $template)
     {
         $key = self::get_key($template);
-        self::$template_data[$key]['start_time'] = microtime(true);
+        self::$template_data[self::$index][$key]['start_time'] = microtime(true);
     }
 
     /**
      * End logging of cache time
      *
-     * @param object $template cached template
+     * @param \Smarty_Internal_Template $template cached template
      */
-    public static function end_cache($template)
+    public static function end_cache(Smarty_Internal_Template $template)
     {
         $key = self::get_key($template);
-        self::$template_data[$key]['cache_time'] += microtime(true) - self::$template_data[$key]['start_time'];
-    }
-
-    /**
-     * Start logging of cache time
-     *
-     * @param object $template cached template
-     */
-    public static function start_template($template)
-    {
-        $key = self::get_key($template);
-        self::$template_data[$key]['start_template_time'] = microtime(true);
-    }
-
-    /**
-     * End logging of cache time
-     *
-     * @param object $template cached template
-     */
-    public static function end_template($template)
-    {
-        $key = self::get_key($template);
-        self::$template_data[$key]['total_time'] += microtime(true) - self::$template_data[$key]['start_template_time'];
-        self::$template_data[$key]['properties'] = $template->properties;
-
+        self::$template_data[self::$index][$key]['cache_time'] += microtime(true) - self::$template_data[self::$index][$key]['start_time'];
     }
 
     /**
      * Register template object
      *
-     * @param object $template cached template
+     * @param \Smarty_Internal_Template $template cached template
      */
-    public static function register_template($template)
+    public static function register_template(Smarty_Internal_Template $template)
     {
     }
 
     /**
      * Register data object
      *
-     * @param object $data data object
+     * @param \Smarty_Data $data data object
      */
-    public static function register_data($data)
+    public static function register_data(Smarty_Data $data)
     {
     }
 
     /**
-     * Opens a window for the Smarty Debugging Consol and display the data
+     * Opens a window for the Smarty Debugging Console and display the data
      *
      * @param Smarty_Internal_Template|Smarty $obj object to debug
+     * @param bool                            $full
      */
     public static function display_debug($obj, $full = false)
     {
+        if (!$full) {
+            self::$offset ++;
+            $savedIndex = self::$index;
+            self::$index = 9999;
+        }
+        if ($obj instanceof Smarty) {
+            $smarty = $obj;
+        } else {
+            $smarty = $obj->smarty;
+        }
+        // create fresh instance of smarty for displaying the debug console
+        // to avoid problems if the application did overload the Smarty class
+        $debObj = new Smarty();
+        // copy the working dirs from application
+        $debObj->setCompileDir($smarty->getCompileDir());
+        // init properties by hand as user may have edited the original Smarty class
+        $debObj->setPluginsDir(is_dir(__DIR__ . '/../plugins') ? __DIR__ . '/../plugins' : $smarty->getPluginsDir());
+        $debObj->force_compile = false;
+        $debObj->compile_check = true;
+        $debObj->left_delimiter = '{';
+        $debObj->right_delimiter = '}';
+        $debObj->security_policy = null;
+        $debObj->debugging = false;
+        $debObj->debugging_ctrl = 'NONE';
+        $debObj->error_reporting = E_ALL & ~E_NOTICE;
+        $debObj->debug_tpl = isset($smarty->debug_tpl) ? $smarty->debug_tpl : 'file:' . __DIR__ . '/../debug.tpl';
+        $debObj->registered_plugins = array();
+        $debObj->registered_resources = array();
+        $debObj->registered_filters = array();
+        $debObj->autoload_filters = array();
+        $debObj->default_modifiers = array();
+        $debObj->escape_html = true;
+        $debObj->caching = false;
+        $debObj->compile_id = null;
+        $debObj->cache_id = null;
         // prepare information of assigned variables
         $ptr = self::get_debug_vars($obj);
-        if ($obj instanceof Smarty) {
-            $smarty = clone $obj;
-        } else {
-            $smarty = clone $obj->smarty;
-        }
         $_assigned_vars = $ptr->tpl_vars;
         ksort($_assigned_vars);
         $_config_vars = $ptr->config_vars;
         ksort($_config_vars);
-        $smarty->registered_filters = array();
-        $smarty->autoload_filters = array();
-        $smarty->default_modifiers = array();
-        $smarty->force_compile = false;
-        $smarty->left_delimiter = '{';
-        $smarty->right_delimiter = '}';
-        $smarty->debugging = false;
-        $smarty->debugging_ctrl = 'NONE';
-        $smarty->force_compile = false;
-        $_template = new Smarty_Internal_Template($smarty->debug_tpl, $smarty);
-        $_template->caching = false;
-        $_template->disableSecurity();
-        $_template->cache_id = null;
-        $_template->compile_id = null;
+        $debugging = $smarty->debugging;
+
+        $_template = new Smarty_Internal_Template($debObj->debug_tpl, $debObj);
         if ($obj instanceof Smarty_Internal_Template) {
             $_template->assign('template_name', $obj->source->type . ':' . $obj->source->name);
         }
         if ($obj instanceof Smarty || $full) {
-            $_template->assign('template_data', self::$template_data);
+            $_template->assign('template_data', self::$template_data[self::$index]);
         } else {
             $_template->assign('template_data', null);
         }
         $_template->assign('assigned_vars', $_assigned_vars);
         $_template->assign('config_vars', $_config_vars);
         $_template->assign('execution_time', microtime(true) - $smarty->start_time);
-        $_template->assign('display_mode', $smarty->debugging == 2 || !$full);
+        $_template->assign('display_mode', $debugging == 2 || !$full);
+        $_template->assign('offset', self::$offset * 50);
         echo $_template->fetch();
-        if ($full) {
-            self::$ignore_uid = array();
-            self::$template_data = array();
+        if (isset($full)) {
+            self::$index --;
+        }
+        if (!$full) {
+            self::$index = $savedIndex;
         }
     }
 
@@ -254,13 +282,16 @@ class Smarty_Internal_Debug extends Smarty_Internal_Data
             foreach ($var as $varkey => $varvalue) {
                 if ($varkey == 'value') {
                     $tpl_vars[$key][$varkey] = $varvalue;
-                } else if ($varkey == 'nocache') {
-                    if ($varvalue == true) {
-                        $tpl_vars[$key][$varkey] = $varvalue;
-                    }
                 } else {
-                    if ($varkey != 'scope' || $varvalue !== 0)
-                    $tpl_vars[$key]['attributes'][$varkey] = $varvalue;
+                    if ($varkey == 'nocache') {
+                        if ($varvalue == true) {
+                            $tpl_vars[$key][$varkey] = $varvalue;
+                        }
+                    } else {
+                        if ($varkey != 'scope' || $varvalue !== 0) {
+                            $tpl_vars[$key]['attributes'][$varkey] = $varvalue;
+                        }
+                    }
                 }
             }
             if ($obj instanceof Smarty_Internal_Template) {
@@ -274,14 +305,14 @@ class Smarty_Internal_Debug extends Smarty_Internal_Data
 
         if (isset($obj->parent)) {
             $parent = self::get_debug_vars($obj->parent);
-            foreach($parent->tpl_vars as $name => $pvar){
+            foreach ($parent->tpl_vars as $name => $pvar) {
                 if (isset($tpl_vars[$name]) && $tpl_vars[$name]['value'] === $pvar['value']) {
                     $tpl_vars[$name]['scope'] = $pvar['scope'];
                 }
             }
             $tpl_vars = array_merge($parent->tpl_vars, $tpl_vars);
 
-            foreach($parent->config_vars as $name => $pvar){
+            foreach ($parent->config_vars as $name => $pvar) {
                 if (isset($config_vars[$name]) && $config_vars[$name]['value'] === $pvar['value']) {
                     $config_vars[$name]['scope'] = $pvar['scope'];
                 }
@@ -316,11 +347,11 @@ class Smarty_Internal_Debug extends Smarty_Internal_Data
     /**
      * Return key into $template_data for template
      *
-     * @param  object $template template object
+     * @param \Smarty_Internal_Template $template template object
      *
      * @return string key into $template_data
      */
-    private static function get_key($template)
+    private static function get_key(Smarty_Internal_Template $template)
     {
         static $_is_stringy = array('string' => true, 'eval' => true);
         // calculate Uid if not already done
@@ -328,29 +359,44 @@ class Smarty_Internal_Debug extends Smarty_Internal_Data
             $template->source->filepath;
         }
         $key = $template->source->uid;
-        if (isset(self::$template_data[$key])) {
+        if (isset(self::$template_data[self::$index][$key])) {
             return $key;
         } else {
             if (isset($_is_stringy[$template->source->type])) {
-                self::$template_data[$key]['name'] = '\'' . substr($template->source->name, 0, 25) . '...\'';
+                self::$template_data[self::$index][$key]['name'] = '\'' . substr($template->source->name, 0, 25) . '...\'';
             } else {
-                self::$template_data[$key]['name'] = $template->source->filepath;
+                self::$template_data[self::$index][$key]['name'] = $template->source->filepath;
             }
-            self::$template_data[$key]['compile_time'] = 0;
-            self::$template_data[$key]['render_time'] = 0;
-            self::$template_data[$key]['cache_time'] = 0;
-            self::$template_data[$key]['total_time'] = 0;
+            self::$template_data[self::$index][$key]['compile_time'] = 0;
+            self::$template_data[self::$index][$key]['render_time'] = 0;
+            self::$template_data[self::$index][$key]['cache_time'] = 0;
+            self::$template_data[self::$index][$key]['total_time'] = 0;
 
             return $key;
         }
     }
 
+    /**
+     * Ignore template
+     *
+     * @param \Smarty_Internal_Template $template
+     */
+    public static function ignore(Smarty_Internal_Template $template)
+    {
+        // calculate Uid if not already done
+        if ($template->source->uid == '') {
+            $template->source->filepath;
+        }
+        self::$ignore_uid[$template->source->uid] = true;
+    }
+
     /**
      * handle 'URL' debugging mode
      *
      * @param Smarty_Internal_Template $_template
      */
-    public static function debugUrl(Smarty_Internal_Template $_template) {
+    public static function debugUrl(Smarty_Internal_Template $_template)
+    {
         if (isset($_SERVER['QUERY_STRING'])) {
             $_query_string = $_SERVER['QUERY_STRING'];
         } else {
diff --git a/libs/smarty/sysplugins/smarty_internal_extension_codeframe.php b/libs/smarty/sysplugins/smarty_internal_extension_codeframe.php
index 129d12950..0474378ce 100644
--- a/libs/smarty/sysplugins/smarty_internal_extension_codeframe.php
+++ b/libs/smarty/sysplugins/smarty_internal_extension_codeframe.php
@@ -11,7 +11,6 @@
 /**
  * Class Smarty_Internal_Extension_CodeFrame
  * Create code frame for compiled and cached templates
-
  */
 class Smarty_Internal_Extension_CodeFrame
 {
@@ -78,11 +77,19 @@ class Smarty_Internal_Extension_CodeFrame
                 $output .= "?>/*/%%SmartyNocache:{$_template->properties['nocache_hash']}%%*/';\n";
             }
         }
-        $output .= "?>\n" . $content;
-        $output .= "<?php }\n}\n?>";
-        return $output;
+        $output .= "?>\n";
+        $output = self::appendCode($output, $content);
+        return self::appendCode($output, "<?php }\n}\n?>");
     }
 
+    /**
+     * Create code frame of compiled template function
+     *
+     * @param \Smarty_Internal_Template $_template
+     * @param string                    $content
+     *
+     * @return string
+     */
     public static function createFunctionFrame(Smarty_Internal_Template $_template, $content = '')
     {
         if (!isset($_template->properties['unifunc'])) {
@@ -98,4 +105,23 @@ class Smarty_Internal_Extension_CodeFrame
         $output .= "}\n}\n?>";
         return $output;
     }
+
+    /**
+     * Append code segments and remove unneeded ?> <?php transitions
+     *
+     * @param string $left
+     * @param string $right
+     *
+     * @return string
+     */
+    public static function appendCode($left, $right)
+    {
+        if (preg_match('/\s*\?>$/', $left) && preg_match('/^<\?php\s+/', $right)) {
+            $left = preg_replace('/\s*\?>$/', "\n", $left);
+            $left .= preg_replace('/^<\?php\s+/', '', $right);
+        } else {
+            $left .= $right;
+        }
+        return $left;
+    }
 }
\ No newline at end of file
diff --git a/libs/smarty/sysplugins/smarty_internal_extension_config.php b/libs/smarty/sysplugins/smarty_internal_extension_config.php
index 8cef300d2..a30bb22da 100644
--- a/libs/smarty/sysplugins/smarty_internal_extension_config.php
+++ b/libs/smarty/sysplugins/smarty_internal_extension_config.php
@@ -133,7 +133,7 @@ class Smarty_Internal_Extension_Config
             // not found, try at parent
             $_ptr = $_ptr->parent;
         }
-        if ($smarty->error_unassigned && $error_enable) {
+        if ($obj->error_unassigned && $error_enable) {
             // force a notice
             $x = $$variable;
         }
diff --git a/libs/smarty/sysplugins/smarty_internal_extension_defaulttemplatehandler.php b/libs/smarty/sysplugins/smarty_internal_extension_defaulttemplatehandler.php
index bf25eb915..ed6029204 100644
--- a/libs/smarty/sysplugins/smarty_internal_extension_defaulttemplatehandler.php
+++ b/libs/smarty/sysplugins/smarty_internal_extension_defaulttemplatehandler.php
@@ -35,8 +35,10 @@ class Smarty_Internal_Extension_DefaultTemplateHandler
         $_return = call_user_func_array($default_handler,
                                         array($source->type, $source->name, &$_content, &$_timestamp, $source->smarty));
         if (is_string($_return)) {
-            $source->timestamp = @filemtime($_return);
-            $source->exists = !!$source->timestamp;
+            $source->exists = is_file($_return);
+            if ($source->exists) {
+                $source->timestamp = filemtime($_return);
+            }
             $source->filepath = $_return;
         } elseif ($_return === true) {
             $source->content = $_content;
diff --git a/libs/smarty/sysplugins/smarty_internal_parsetree.php b/libs/smarty/sysplugins/smarty_internal_parsetree.php
index 1e306c8c9..c96731ed9 100644
--- a/libs/smarty/sysplugins/smarty_internal_parsetree.php
+++ b/libs/smarty/sysplugins/smarty_internal_parsetree.php
@@ -16,12 +16,14 @@
  */
 abstract class Smarty_Internal_ParseTree
 {
+
     /**
      * Parser object
      *
      * @var object
      */
     public $parser;
+
     /**
      * Buffer content
      *
diff --git a/libs/smarty/sysplugins/smarty_internal_parsetree_code.php b/libs/smarty/sysplugins/smarty_internal_parsetree_code.php
index c4a7daecd..a44ae499c 100644
--- a/libs/smarty/sysplugins/smarty_internal_parsetree_code.php
+++ b/libs/smarty/sysplugins/smarty_internal_parsetree_code.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Smarty Internal Plugin Templateparser Parsetrees
- * These are classes to build parsetrees in the template parser
+ * Smarty Internal Plugin Templateparser Parse Tree
+ * These are classes to build parse trees in the template parser
  *
  * @package    Smarty
  * @subpackage Compiler
diff --git a/libs/smarty/sysplugins/smarty_internal_parsetree_dq.php b/libs/smarty/sysplugins/smarty_internal_parsetree_dq.php
index 4de327612..bdfa4c48f 100644
--- a/libs/smarty/sysplugins/smarty_internal_parsetree_dq.php
+++ b/libs/smarty/sysplugins/smarty_internal_parsetree_dq.php
@@ -7,6 +7,7 @@
  * @subpackage Compiler
  * @ignore
  */
+
 /**
  * Double quoted string inside a tag.
  *
@@ -19,8 +20,8 @@ class Smarty_Internal_ParseTree_Dq extends Smarty_Internal_ParseTree
     /**
      * Create parse tree buffer for double quoted string subtrees
      *
-     * @param object            $parser  parser object
-     * @param Smarty_Internal_ParseTree $subtree parsetree buffer
+     * @param object                    $parser  parser object
+     * @param Smarty_Internal_ParseTree $subtree parse tree buffer
      */
     public function __construct($parser, Smarty_Internal_ParseTree $subtree)
     {
@@ -34,18 +35,18 @@ class Smarty_Internal_ParseTree_Dq extends Smarty_Internal_ParseTree
     /**
      * Append buffer to subtree
      *
-     * @param Smarty_Internal_ParseTree $subtree parsetree buffer
+     * @param Smarty_Internal_ParseTree $subtree parse tree buffer
      */
     public function append_subtree(Smarty_Internal_ParseTree $subtree)
     {
         $last_subtree = count($this->subtrees) - 1;
         if ($last_subtree >= 0 && $this->subtrees[$last_subtree] instanceof Smarty_Internal_ParseTree_Tag && $this->subtrees[$last_subtree]->saved_block_nesting < $this->parser->block_nesting_level) {
             if ($subtree instanceof Smarty_Internal_ParseTree_Code) {
-                $this->subtrees[$last_subtree]->data .= '<?php echo ' . $subtree->data . ';?>';
+                $this->subtrees[$last_subtree]->data = $this->parser->compiler->appendCode($this->subtrees[$last_subtree]->data, '<?php echo ' . $subtree->data . ';?>');
             } elseif ($subtree instanceof Smarty_Internal_ParseTree_DqContent) {
-                $this->subtrees[$last_subtree]->data .= '<?php echo "' . $subtree->data . '";?>';
+                $this->subtrees[$last_subtree]->data = $this->parser->compiler->appendCode($this->subtrees[$last_subtree]->data, '<?php echo "' . $subtree->data . '";?>');
             } else {
-                $this->subtrees[$last_subtree]->data .= $subtree->data;
+                $this->subtrees[$last_subtree]->data = $this->parser->compiler->appendCode($this->subtrees[$last_subtree]->data, $subtree->data);
             }
         } else {
             $this->subtrees[] = $subtree;
diff --git a/libs/smarty/sysplugins/smarty_internal_parsetree_dqcontent.php b/libs/smarty/sysplugins/smarty_internal_parsetree_dqcontent.php
index 53ba1bcc0..3197772d1 100644
--- a/libs/smarty/sysplugins/smarty_internal_parsetree_dqcontent.php
+++ b/libs/smarty/sysplugins/smarty_internal_parsetree_dqcontent.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Smarty Internal Plugin Templateparser Parsetrees
- * These are classes to build parsetrees in the template parser
+ * Smarty Internal Plugin Templateparser Parse Tree
+ * These are classes to build parse tree  in the template parser
  *
  * @package    Smarty
  * @subpackage Compiler
@@ -9,7 +9,6 @@
  * @author     Uwe Tews
  */
 
-
 /**
  * Raw chars as part of a double quoted string.
  *
diff --git a/libs/smarty/sysplugins/smarty_internal_parsetree_tag.php b/libs/smarty/sysplugins/smarty_internal_parsetree_tag.php
index 28bbb938a..81475b5f0 100644
--- a/libs/smarty/sysplugins/smarty_internal_parsetree_tag.php
+++ b/libs/smarty/sysplugins/smarty_internal_parsetree_tag.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Smarty Internal Plugin Templateparser Parsetrees
- * These are classes to build parsetrees in the template parser
+ * Smarty Internal Plugin Templateparser Parse Tree
+ * These are classes to build parse tree in the template parser
  *
  * @package    Smarty
  * @subpackage Compiler
@@ -18,6 +18,7 @@
  */
 class Smarty_Internal_ParseTree_Tag extends Smarty_Internal_ParseTree
 {
+
     /**
      * Saved block nesting level
      *
@@ -56,7 +57,9 @@ class Smarty_Internal_ParseTree_Tag extends Smarty_Internal_ParseTree
     public function assign_to_var()
     {
         $var = sprintf('$_tmp%d', ++ Smarty_Internal_Templateparser::$prefix_number);
-        $this->parser->compiler->prefix_code[] = sprintf("<?php ob_start();?>%s<?php %s=ob_get_clean();?>", $this->data, $var);
+        $tmp = $this->parser->compiler->appendCode('<?php ob_start();?>', $this->data);
+        $tmp = $this->parser->compiler->appendCode($tmp, "<?php {$var}=ob_get_clean();?>");
+        $this->parser->compiler->prefix_code[] = sprintf("%s", $tmp);
 
         return $var;
     }
diff --git a/libs/smarty/sysplugins/smarty_internal_parsetree_template.php b/libs/smarty/sysplugins/smarty_internal_parsetree_template.php
index 2bb76c197..7d814edaa 100644
--- a/libs/smarty/sysplugins/smarty_internal_parsetree_template.php
+++ b/libs/smarty/sysplugins/smarty_internal_parsetree_template.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Smarty Internal Plugin Templateparser Parsetrees
- * These are classes to build parsetrees in the template parser
+ * Smarty Internal Plugin Templateparser Parse Tree
+ * These are classes to build parse tree in the template parser
  *
  * @package    Smarty
  * @subpackage Compiler
@@ -18,6 +18,7 @@
  */
 class Smarty_Internal_ParseTree_Template extends Smarty_Internal_ParseTree
 {
+
     /**
      * Array of template elements
      *
@@ -44,8 +45,10 @@ class Smarty_Internal_ParseTree_Template extends Smarty_Internal_ParseTree
     {
         if (!empty($subtree->subtrees)) {
             $this->subtrees = array_merge($this->subtrees, $subtree->subtrees);
-        } else if ($subtree->data !== '') {
-            $this->subtrees[] = $subtree;
+        } else {
+            if ($subtree->data !== '') {
+                $this->subtrees[] = $subtree;
+            }
         }
     }
 
@@ -70,7 +73,7 @@ class Smarty_Internal_ParseTree_Template extends Smarty_Internal_ParseTree
                 if ($subtree == '') {
                     continue;
                 }
-                $code .= preg_replace('/(<%|%>|<\?php|<\?|\?>|<\/?script)/', "<?php echo '\$1'; ?>\n", $subtree);
+                $code .= preg_replace('/((<%)|(%>)|(<\?php)|(<\?)|(\?>)|(<\/?script))/', "<?php echo '\$1'; ?>\n", $subtree);
                 continue;
             }
             if ($this->subtrees[$key] instanceof Smarty_Internal_ParseTree_Tag) {
@@ -80,13 +83,7 @@ class Smarty_Internal_ParseTree_Template extends Smarty_Internal_ParseTree
                     if ($this->subtrees[$key]->data == '') {
                         continue;
                     }
-                    $newCode = $this->subtrees[$key]->to_smarty_php();
-                    if ((preg_match('/^\s*<\?php\s+/', $newCode) && preg_match('/\s*\?>\s*$/', $subtree))) {
-                        $subtree = preg_replace('/\s*\?>\s*$/', "\n", $subtree);
-                        $subtree .= preg_replace('/^\s*<\?php\s+/', '', $newCode);
-                    } else {
-                        $subtree .= $newCode;
-                    }
+                    $subtree = $this->parser->compiler->appendCode($subtree, $this->subtrees[$key]->to_smarty_php());
                 }
                 if ($subtree == '') {
                     continue;
diff --git a/libs/smarty/sysplugins/smarty_internal_parsetree_text.php b/libs/smarty/sysplugins/smarty_internal_parsetree_text.php
index fb79660ff..42d5bd299 100644
--- a/libs/smarty/sysplugins/smarty_internal_parsetree_text.php
+++ b/libs/smarty/sysplugins/smarty_internal_parsetree_text.php
@@ -1,8 +1,8 @@
 <?php
 
 /**
- * Smarty Internal Plugin Templateparser Parsetrees
- * These are classes to build parsetrees in the template parser
+ * Smarty Internal Plugin Templateparser Parse Tree
+ * These are classes to build parse tree in the template parser
  *
  * @package    Smarty
  * @subpackage Compiler
diff --git a/libs/smarty/sysplugins/smarty_internal_resource_file.php b/libs/smarty/sysplugins/smarty_internal_resource_file.php
index a97ed46b5..95d229652 100644
--- a/libs/smarty/sysplugins/smarty_internal_resource_file.php
+++ b/libs/smarty/sysplugins/smarty_internal_resource_file.php
@@ -169,8 +169,10 @@ class Smarty_Internal_Resource_File extends Smarty_Resource
 
             $source->uid = sha1(getcwd() . $source->filepath);
             if ($source->smarty->compile_check && !isset($source->timestamp)) {
-                $source->timestamp = @filemtime($source->filepath);
-                $source->exists = !!$source->timestamp;
+                $source->timestamp = $source->exists = is_file($source->filepath);
+                if ($source->exists) {
+                    $source->timestamp = @filemtime($source->filepath);
+                }
             }
         } else {
             $source->timestamp = false;
@@ -185,8 +187,10 @@ class Smarty_Internal_Resource_File extends Smarty_Resource
      */
     public function populateTimestamp(Smarty_Template_Source $source)
     {
-        $source->timestamp = @filemtime($source->filepath);
-        $source->exists = !!$source->timestamp;
+        $source->timestamp = $source->exists = is_file($source->filepath);
+        if ($source->exists) {
+            $source->timestamp = @filemtime($source->filepath);
+        }
     }
 
     /**
diff --git a/libs/smarty/sysplugins/smarty_internal_template.php b/libs/smarty/sysplugins/smarty_internal_template.php
index 59fdae759..4721f3086 100644
--- a/libs/smarty/sysplugins/smarty_internal_template.php
+++ b/libs/smarty/sysplugins/smarty_internal_template.php
@@ -139,7 +139,7 @@ class Smarty_Internal_Template extends Smarty_Internal_TemplateBase
      */
     public function fetch()
     {
-        return $this->render(true, false);
+        return $this->render(true, false, false);
     }
 
     /**
@@ -155,17 +155,17 @@ class Smarty_Internal_Template extends Smarty_Internal_TemplateBase
      *
      * @param  bool $merge_tpl_vars   if true parent template variables merged in to local scope
      * @param  bool $no_output_filter if true do not run output filter
-     * @param  bool $display          true: display, false: fetch
+     * @param  bool $display          true: display, false: fetch null: subtemplate
      *
      * @throws Exception
      * @throws SmartyException
      * @return string rendered template output
      */
-    public function render($merge_tpl_vars = false, $no_output_filter = true, $display = false)
+    public function render($merge_tpl_vars = false, $no_output_filter = true, $display = null)
     {
         $parentIsTpl = $this->parent instanceof Smarty_Internal_Template;
         if ($this->smarty->debugging) {
-            Smarty_Internal_Debug::start_template($this);
+            Smarty_Internal_Debug::start_template($this, $display);
         }
         $save_tpl_vars = null;
         $save_config_vars = null;
@@ -223,10 +223,13 @@ class Smarty_Internal_Template extends Smarty_Internal_TemplateBase
             $this->caching = false;
         }
         // read from cache or render
-        if ($this->caching && !isset($this->cached)) {
-            $this->cached = Smarty_Template_Cached::load($this);
-        }
         $isCacheTpl = $this->caching == Smarty::CACHING_LIFETIME_CURRENT || $this->caching == Smarty::CACHING_LIFETIME_SAVED;
+        if ($isCacheTpl) {
+            if (!isset($this->cached)) {
+                $this->loadCached();
+            }
+            $this->cached->isCached($this);
+        }
         if (!($isCacheTpl) || !$this->cached->valid) {
             if ($isCacheTpl) {
                 $this->properties['tpl_function'] = array();
@@ -238,7 +241,7 @@ class Smarty_Internal_Template extends Smarty_Internal_TemplateBase
             if (!$this->source->uncompiled) {
                 // render compiled code
                 if (!isset($this->compiled)) {
-                    $this->compiled = Smarty_Template_Compiled::load($this);
+                    $this->loadCompiled();
                 }
                 $content = $this->compiled->render($this);
             } else {
@@ -324,6 +327,11 @@ class Smarty_Internal_Template extends Smarty_Internal_TemplateBase
             if ($this->smarty->debugging) {
                 Smarty_Internal_Debug::end_template($this);
             }
+            if ($this->smarty->debugging == 2 and $display === false) {
+                if ($this->smarty->debugging) {
+                    Smarty_Internal_Debug::display_debug($this, true);
+                }
+            }
             if ($parentIsTpl) {
                 $this->parent->properties['tpl_function'] = array_merge($this->parent->properties['tpl_function'], $this->properties['tpl_function']);
                 foreach ($this->required_plugins as $code => $tmp1) {
@@ -599,7 +607,7 @@ class Smarty_Internal_Template extends Smarty_Internal_TemplateBase
                         $mtime = $this->source->timestamp;
                     } else {
                         // file and php types can be checked without loading the respective resource handlers
-                        $mtime = @filemtime($_file_to_check[0]);
+                        $mtime = is_file($_file_to_check[0]) ? @filemtime($_file_to_check[0]) : false;
                     }
                 } elseif ($_file_to_check[2] == 'string') {
                     continue;
@@ -766,7 +774,7 @@ class Smarty_Internal_Template extends Smarty_Internal_TemplateBase
     {
         Smarty_CacheResource::invalidLoadedCache($this->smarty);
 
-        return $this->cached->handler->clear($this->smarty, $this->template_name, $this->cache_id, $this->compile_id, $exp_time);
+        return $this->cached->handler->clear($this->smarty, $this->template_resource, $this->cache_id, $this->compile_id, $exp_time);
     }
 
     /**
@@ -782,12 +790,52 @@ class Smarty_Internal_Template extends Smarty_Internal_TemplateBase
         }
     }
 
+    /**
+     * Load compiled object
+     *
+     */
+    public function loadCompiled()
+    {
+        if (!isset($this->compiled)) {
+            if (!class_exists('Smarty_Template_Compiled', false)) {
+                require SMARTY_SYSPLUGINS_DIR . 'smarty_template_compiled.php';
+            }
+            $this->compiled = Smarty_Template_Compiled::load($this);
+        }
+    }
+
+    /**
+     * Load cached object
+     *
+     */
+    public function loadCached()
+    {
+        if (!isset($this->cached)) {
+            if (!class_exists('Smarty_Template_Cached', false)) {
+                require SMARTY_SYSPLUGINS_DIR . 'smarty_template_cached.php';
+            }
+            $this->cached = Smarty_Template_Cached::load($this);
+        }
+    }
+
+    /**
+     * Load compiler object
+     *
+     * @throws \SmartyException
+     */
+    public function loadCompiler()
+    {
+        $this->smarty->loadPlugin($this->source->compiler_class);
+        $this->compiler = new $this->source->compiler_class($this->source->template_lexer_class, $this->source->template_parser_class, $this->smarty);
+    }
+
     /**
      * Handle unknown class methods
      *
      * @param string $name unknown method-name
      * @param array  $args argument array
      *
+     * @return mixed
      * @throws SmartyException
      */
     public function __call($name, $args)
@@ -816,18 +864,14 @@ class Smarty_Internal_Template extends Smarty_Internal_TemplateBase
             case 'cached':
             case 'compiler':
                 $this->$property_name = $value;
-
                 return;
-
-            // FIXME: routing of template -> smarty attributes
             default:
+                // Smarty property ?
                 if (property_exists($this->smarty, $property_name)) {
                     $this->smarty->$property_name = $value;
-
                     return;
                 }
         }
-
         throw new SmartyException("invalid template property '$property_name'.");
     }
 
@@ -847,26 +891,22 @@ class Smarty_Internal_Template extends Smarty_Internal_TemplateBase
                 return $this->source;
 
             case 'compiled':
-                $this->compiled = Smarty_Template_Compiled::load($this);
+                $this->loadCompiled();
                 return $this->compiled;
 
             case 'cached':
-                $this->cached = Smarty_Template_Cached::load($this);
+                $this->loadCached();
                 return $this->cached;
 
             case 'compiler':
-                $this->smarty->loadPlugin($this->source->compiler_class);
-                $this->compiler = new $this->source->compiler_class($this->source->template_lexer_class, $this->source->template_parser_class, $this->smarty);
-
+                $this->loadCompiler();
                 return $this->compiler;
-
-            // FIXME: routing of template -> smarty attributes
             default:
+                // Smarty property ?
                 if (property_exists($this->smarty, $property_name)) {
                     return $this->smarty->$property_name;
                 }
         }
-
         throw new SmartyException("template property '$property_name' does not exist.");
     }
 
diff --git a/libs/smarty/sysplugins/smarty_internal_templatebase.php b/libs/smarty/sysplugins/smarty_internal_templatebase.php
index f0c3fd408..68fd4be2e 100644
--- a/libs/smarty/sysplugins/smarty_internal_templatebase.php
+++ b/libs/smarty/sysplugins/smarty_internal_templatebase.php
@@ -56,17 +56,21 @@ abstract class Smarty_Internal_TemplateBase extends Smarty_Internal_Data
     public function isCached($template = null, $cache_id = null, $compile_id = null, $parent = null)
     {
         if ($template === null && $this instanceof $this->template_class) {
-            return $this->cached->valid;
-        }
-        if (!($template instanceof $this->template_class)) {
-            if ($parent === null) {
-                $parent = $this;
+            $template = $this;
+        } else {
+            if (!($template instanceof $this->template_class)) {
+                if ($parent === null) {
+                    $parent = $this;
+                }
+                $smarty = isset($this->smarty) ? $this->smarty : $this;
+                $template = $smarty->createTemplate($template, $cache_id, $compile_id, $parent, false);
             }
-            $smarty = isset($this->smarty) ? $this->smarty : $this;
-            $template = $smarty->createTemplate($template, $cache_id, $compile_id, $parent, false);
         }
         // return cache status of template
-        return $template->cached->valid;
+        if (!isset($template->cached)) {
+            $template->loadCached();
+        }
+        return $template->cached->isCached($template);
     }
 
     /**
@@ -120,7 +124,8 @@ abstract class Smarty_Internal_TemplateBase extends Smarty_Internal_Data
      * @param  boolean  $cacheable  if true (default) this fuction is cachable
      * @param  array    $cache_attr caching attributes if any
      *
-     * @return Smarty_Internal_Templatebase current Smarty_Internal_Templatebase (or Smarty or Smarty_Internal_Template) instance for chaining
+     * @return Smarty_Internal_Templatebase current Smarty_Internal_Templatebase (or Smarty or
+     *                                      Smarty_Internal_Template) instance for chaining
      * @throws SmartyException              when the plugin tag is invalid
      */
     public function registerPlugin($type, $tag, $callback, $cacheable = true, $cache_attr = null)
@@ -143,7 +148,8 @@ abstract class Smarty_Internal_TemplateBase extends Smarty_Internal_Data
      * @param  string $type of plugin
      * @param  string $tag  name of plugin
      *
-     * @return Smarty_Internal_Templatebase current Smarty_Internal_Templatebase (or Smarty or Smarty_Internal_Template) instance for chaining
+     * @return Smarty_Internal_Templatebase current Smarty_Internal_Templatebase (or Smarty or
+     *                                      Smarty_Internal_Template) instance for chaining
      */
     public function unregisterPlugin($type, $tag)
     {
@@ -159,9 +165,11 @@ abstract class Smarty_Internal_TemplateBase extends Smarty_Internal_Data
      * Registers a resource to fetch a template
      *
      * @param  string                $type     name of resource type
-     * @param  Smarty_Resource|array $callback or instance of Smarty_Resource, or array of callbacks to handle resource (deprecated)
+     * @param  Smarty_Resource|array $callback or instance of Smarty_Resource, or array of callbacks to handle resource
+     *                                         (deprecated)
      *
-     * @return Smarty_Internal_Templatebase current Smarty_Internal_Templatebase (or Smarty or Smarty_Internal_Template) instance for chaining
+     * @return Smarty_Internal_Templatebase current Smarty_Internal_Templatebase (or Smarty or
+     *                                      Smarty_Internal_Template) instance for chaining
      */
     public function registerResource($type, $callback)
     {
@@ -176,7 +184,8 @@ abstract class Smarty_Internal_TemplateBase extends Smarty_Internal_Data
      *
      * @param  string $type name of resource type
      *
-     * @return Smarty_Internal_Templatebase current Smarty_Internal_Templatebase (or Smarty or Smarty_Internal_Template) instance for chaining
+     * @return Smarty_Internal_Templatebase current Smarty_Internal_Templatebase (or Smarty or
+     *                                      Smarty_Internal_Template) instance for chaining
      */
     public function unregisterResource($type)
     {
@@ -194,7 +203,8 @@ abstract class Smarty_Internal_TemplateBase extends Smarty_Internal_Data
      * @param  string               $type     name of cache resource type
      * @param  Smarty_CacheResource $callback instance of Smarty_CacheResource to handle output caching
      *
-     * @return Smarty_Internal_Templatebase current Smarty_Internal_Templatebase (or Smarty or Smarty_Internal_Template) instance for chaining
+     * @return Smarty_Internal_Templatebase current Smarty_Internal_Templatebase (or Smarty or
+     *                                      Smarty_Internal_Template) instance for chaining
      */
     public function registerCacheResource($type, Smarty_CacheResource $callback)
     {
@@ -209,7 +219,8 @@ abstract class Smarty_Internal_TemplateBase extends Smarty_Internal_Data
      *
      * @param  string $type name of cache resource type
      *
-     * @return Smarty_Internal_Templatebase current Smarty_Internal_Templatebase (or Smarty or Smarty_Internal_Template) instance for chaining
+     * @return Smarty_Internal_Templatebase current Smarty_Internal_Templatebase (or Smarty or
+     *                                      Smarty_Internal_Template) instance for chaining
      */
     public function unregisterCacheResource($type)
     {
@@ -231,7 +242,8 @@ abstract class Smarty_Internal_TemplateBase extends Smarty_Internal_Data
      * @param  array   $block_methods list of block-methods
      *
      * @throws SmartyException
-     * @return Smarty_Internal_Templatebase current Smarty_Internal_Templatebase (or Smarty or Smarty_Internal_Template) instance for chaining
+     * @return Smarty_Internal_Templatebase current Smarty_Internal_Templatebase (or Smarty or
+     *                                      Smarty_Internal_Template) instance for chaining
      */
     public function registerObject($object_name, $object_impl, $allowed = array(), $smarty_args = true, $block_methods = array())
     {
@@ -285,7 +297,8 @@ abstract class Smarty_Internal_TemplateBase extends Smarty_Internal_Data
      *
      * @param  string $name object name
      *
-     * @return Smarty_Internal_Templatebase current Smarty_Internal_Templatebase (or Smarty or Smarty_Internal_Template) instance for chaining
+     * @return Smarty_Internal_Templatebase current Smarty_Internal_Templatebase (or Smarty or
+     *                                      Smarty_Internal_Template) instance for chaining
      */
     public function unregisterObject($name)
     {
@@ -304,7 +317,8 @@ abstract class Smarty_Internal_TemplateBase extends Smarty_Internal_Data
      * @param  string $class_impl the referenced PHP class to register
      *
      * @throws SmartyException
-     * @return Smarty_Internal_Templatebase current Smarty_Internal_Templatebase (or Smarty or Smarty_Internal_Template) instance for chaining
+     * @return Smarty_Internal_Templatebase current Smarty_Internal_Templatebase (or Smarty or
+     *                                      Smarty_Internal_Template) instance for chaining
      */
     public function registerClass($class_name, $class_impl)
     {
@@ -324,7 +338,8 @@ abstract class Smarty_Internal_TemplateBase extends Smarty_Internal_Data
      *
      * @param  callable $callback class/method name
      *
-     * @return Smarty_Internal_Templatebase current Smarty_Internal_Templatebase (or Smarty or Smarty_Internal_Template) instance for chaining
+     * @return Smarty_Internal_Templatebase current Smarty_Internal_Templatebase (or Smarty or
+     *                                      Smarty_Internal_Template) instance for chaining
      * @throws SmartyException              if $callback is not callable
      */
     public function registerDefaultPluginHandler($callback)
@@ -344,7 +359,8 @@ abstract class Smarty_Internal_TemplateBase extends Smarty_Internal_Data
      *
      * @param  callable $callback class/method name
      *
-     * @return Smarty_Internal_Templatebase current Smarty_Internal_Templatebase (or Smarty or Smarty_Internal_Template) instance for chaining
+     * @return Smarty_Internal_Templatebase current Smarty_Internal_Templatebase (or Smarty or
+     *                                      Smarty_Internal_Template) instance for chaining
      * @throws SmartyException              if $callback is not callable
      */
     public function registerDefaultTemplateHandler($callback)
@@ -358,7 +374,8 @@ abstract class Smarty_Internal_TemplateBase extends Smarty_Internal_Data
      *
      * @param  callable $callback class/method name
      *
-     * @return Smarty_Internal_Templatebase current Smarty_Internal_Templatebase (or Smarty or Smarty_Internal_Template) instance for chaining
+     * @return Smarty_Internal_Templatebase current Smarty_Internal_Templatebase (or Smarty or
+     *                                      Smarty_Internal_Template) instance for chaining
      * @throws SmartyException              if $callback is not callable
      */
     public function registerDefaultConfigHandler($callback)
@@ -373,7 +390,8 @@ abstract class Smarty_Internal_TemplateBase extends Smarty_Internal_Data
      * @param  string   $type filter type
      * @param  callback $callback
      *
-     * @return Smarty_Internal_Templatebase current Smarty_Internal_Templatebase (or Smarty or Smarty_Internal_Template) instance for chaining
+     * @return Smarty_Internal_Templatebase current Smarty_Internal_Templatebase (or Smarty or
+     *                                      Smarty_Internal_Template) instance for chaining
      */
     public function registerFilter($type, $callback)
     {
@@ -389,7 +407,8 @@ abstract class Smarty_Internal_TemplateBase extends Smarty_Internal_Data
      * @param  string   $type filter type
      * @param  callback $callback
      *
-     * @return Smarty_Internal_Templatebase current Smarty_Internal_Templatebase (or Smarty or Smarty_Internal_Template) instance for chaining
+     * @return Smarty_Internal_Templatebase current Smarty_Internal_Templatebase (or Smarty or
+     *                                      Smarty_Internal_Template) instance for chaining
      */
     public function unregisterFilter($type, $callback)
     {
@@ -453,7 +472,8 @@ abstract class Smarty_Internal_TemplateBase extends Smarty_Internal_Data
      * @param  string $type filter type
      * @param  string $name filter name
      *
-     * @return Smarty_Internal_Templatebase current Smarty_Internal_Templatebase (or Smarty or Smarty_Internal_Template) instance for chaining
+     * @return Smarty_Internal_Templatebase current Smarty_Internal_Templatebase (or Smarty or
+     *                                      Smarty_Internal_Template) instance for chaining
      */
     public function unloadFilter($type, $name)
     {
diff --git a/libs/smarty/sysplugins/smarty_internal_templatecompilerbase.php b/libs/smarty/sysplugins/smarty_internal_templatecompilerbase.php
index 97802d673..218428eed 100644
--- a/libs/smarty/sysplugins/smarty_internal_templatecompilerbase.php
+++ b/libs/smarty/sysplugins/smarty_internal_templatecompilerbase.php
@@ -17,6 +17,14 @@
  */
 abstract class Smarty_Internal_TemplateCompilerBase
 {
+
+    /**
+     * Smarty object
+     *
+     * @var Smarty
+     */
+    public $smarty = null;
+
     /**
      * hash for nocache sections
      *
@@ -121,6 +129,7 @@ abstract class Smarty_Internal_TemplateCompilerBase
      * @var string
      */
     public $trace_filepath = '';
+
     /**
      * stack for tracing file and line of nested {block} tags
      *
@@ -197,6 +206,14 @@ abstract class Smarty_Internal_TemplateCompilerBase
      * @var string
      */
     public $templateFunctionCode = '';
+
+    /**
+     * php_handling setting either from Smarty or security
+     *
+     * @var int
+     */
+    public $php_handling = 0;
+
     /**
      * flags for used modifier plugins
      *
@@ -218,6 +235,62 @@ abstract class Smarty_Internal_TemplateCompilerBase
      */
     public $parent_compiler = null;
 
+    /**
+     * Flag true when compiling nocache section
+     *
+     * @var bool
+     */
+    public $nocache = false;
+
+    /**
+     * Flag true when tag is compiled as nocache
+     *
+     * @var bool
+     */
+    public $tag_nocache = false;
+
+    /**
+     * Flag to restart parsing
+     *
+     * @var bool
+     */
+    public $abort_and_recompile = false;
+
+    /**
+     * Compiled tag prefix code
+     *
+     * @var array
+     */
+    public $prefix_code = array();
+
+    /**
+     * Prefix code  stack
+     *
+     * @var array
+     */
+    public $prefixCodeStack = array();
+
+    /**
+     * Tag has compiled code
+     *
+     * @var bool
+     */
+    public $has_code = false;
+
+    /**
+     * A variable string was compiled
+     *
+     * @var bool
+     */
+    public $has_variable_string = false;
+
+    /**
+     * Tag creates output
+     *
+     * @var bool
+     */
+    public $has_output = false;
+
     /**
      * Strip preg pattern
      *
@@ -245,13 +318,21 @@ abstract class Smarty_Internal_TemplateCompilerBase
     /**
      * Method to compile a Smarty template
      *
-     * @param  Smarty_Internal_Template $template template object to compile
-     * @param  bool                     $nocache  true is shall be compiled in nocache mode
+     * @param  Smarty_Internal_Template                 $template template object to compile
+     * @param  bool                                     $nocache  true is shall be compiled in nocache mode
+     * @param null|Smarty_Internal_TemplateCompilerBase $parent_compiler
      *
-     * @return bool             true if compiling succeeded, false if it failed
+     * @return bool true if compiling succeeded, false if it failed
      */
     public function compileTemplate(Smarty_Internal_Template $template, $nocache = null, $parent_compiler = null)
     {
+        // save template object in compiler class
+        $this->template = $template;
+        if (isset($this->template->smarty->security_policy)) {
+            $this->php_handling = $this->template->smarty->security_policy->php_handling;
+        } else {
+            $this->php_handling = $this->template->smarty->php_handling;
+        }
         $this->parent_compiler = $parent_compiler ? $parent_compiler : $this;
         $nocache = isset($nocache) ? $nocache : false;
         if (empty($template->properties['nocache_hash'])) {
@@ -262,8 +343,6 @@ abstract class Smarty_Internal_TemplateCompilerBase
         // flag for nochache sections
         $this->nocache = $nocache;
         $this->tag_nocache = false;
-        // save template object in compiler class
-        $this->template = $template;
         // reset has nocache code flag
         $this->template->has_nocache_code = false;
         $save_source = $this->template->source;
@@ -296,6 +375,13 @@ abstract class Smarty_Internal_TemplateCompilerBase
                 $this->inheritance_child = false;
             }
             do {
+                // flag for nochache sections
+                $this->nocache = $nocache;
+                $this->tag_nocache = false;
+                // reset has nocache code flag
+                $this->template->has_nocache_code = false;
+                $this->has_variable_string = false;
+                $this->prefix_code = array();
                 $_compiled_code = '';
                 // flag for aborting current and start recompile
                 $this->abort_and_recompile = false;
@@ -355,7 +441,11 @@ abstract class Smarty_Internal_TemplateCompilerBase
     /**
      * Compile Tag
      * This is a call back from the lexer/parser
-     * It executes the required compile plugin for the Smarty tag
+     *
+     * Save current prefix code
+     * Compile tag
+     * Merge tag prefix code with saved one
+     * (required nested tags in attributes)
      *
      * @param  string $tag       tag name
      * @param  array  $args      array with tag attributes
@@ -367,6 +457,27 @@ abstract class Smarty_Internal_TemplateCompilerBase
      */
     public function compileTag($tag, $args, $parameter = array())
     {
+        $this->prefixCodeStack[] = $this->prefix_code;
+        $this->prefix_code = array();
+        $result = $this->compileTag2($tag, $args, $parameter);
+        $this->prefix_code = array_merge($this->prefix_code, array_pop($this->prefixCodeStack));
+        return $result;
+    }
+
+    /**
+     * Compile Tag
+     *
+     * @param  string $tag       tag name
+     * @param  array  $args      array with tag attributes
+     * @param  array  $parameter array with compilation parameter
+     *
+     * @throws SmartyCompilerException
+     * @throws SmartyException
+     * @return string compiled code
+     */
+    private function compileTag2($tag, $args, $parameter)
+    {
+        $plugin_type = '';
         // $args contains the attributes parsed and compiled by the lexer/parser
         // assume that tag does compile into code, but creates no HTML output
         $this->has_code = true;
@@ -376,8 +487,7 @@ abstract class Smarty_Internal_TemplateCompilerBase
             $this->template->used_tags[] = array($tag, $args);
         }
         // check nocache option flag
-        if (in_array("'nocache'", $args) || in_array(array('nocache' => 'true'), $args)
-            || in_array(array('nocache' => '"true"'), $args) || in_array(array('nocache' => "'true'"), $args)
+        if (in_array("'nocache'", $args) || in_array(array('nocache' => 'true'), $args) || in_array(array('nocache' => '"true"'), $args) || in_array(array('nocache' => "'true'"), $args)
         ) {
             $this->tag_nocache = true;
         }
@@ -417,8 +527,7 @@ abstract class Smarty_Internal_TemplateCompilerBase
                 // check if tag is a registered object
                 if (isset($this->smarty->registered_objects[$tag]) && isset($parameter['object_method'])) {
                     $method = $parameter['object_method'];
-                    if (!in_array($method, $this->smarty->registered_objects[$tag][3]) &&
-                        (empty($this->smarty->registered_objects[$tag][1]) || in_array($method, $this->smarty->registered_objects[$tag][1]))
+                    if (!in_array($method, $this->smarty->registered_objects[$tag][3]) && (empty($this->smarty->registered_objects[$tag][1]) || in_array($method, $this->smarty->registered_objects[$tag][1]))
                     ) {
                         return $this->callTagCompiler('private_object_function', $args, $parameter, $tag, $method);
                     } elseif (in_array($method, $this->smarty->registered_objects[$tag][3])) {
@@ -611,16 +720,13 @@ abstract class Smarty_Internal_TemplateCompilerBase
      *
      * @return null|\Smarty_Internal_ParseTree_Text
      */
-    public function processText($text) {
-        if ($this->inheritance_child && !$this->blockTagNestingLevel) {
-            return null;
-        }
+    public function processText($text)
+    {
         if ($this->parser->strip) {
             return new Smarty_Internal_ParseTree_Text($this->parser, preg_replace($this->stripRegEx, '', $text));
         } else {
             return new Smarty_Internal_ParseTree_Text($this->parser, $text);
         }
-
     }
 
     /**
@@ -641,11 +747,11 @@ abstract class Smarty_Internal_TemplateCompilerBase
     {
         // check if tag allowed by security
         if (!isset($this->smarty->security_policy) || $this->smarty->security_policy->isTrustedTag($tag, $this)) {
-        	// re-use object if already exists
+            // re-use object if already exists
             if (!isset(self::$_tag_objects[$tag])) {
-        		// lazy load internal compiler plugin
-        		$class_name = 'Smarty_Internal_Compile_' . $tag;
-        		if ($this->smarty->loadPlugin($class_name)) {
+                // lazy load internal compiler plugin
+                $class_name = 'Smarty_Internal_Compile_' . $tag;
+                if ($this->smarty->loadPlugin($class_name)) {
                     self::$_tag_objects[$tag] = new $class_name;
                 } else {
                     return false;
@@ -730,9 +836,7 @@ abstract class Smarty_Internal_TemplateCompilerBase
         $callback = null;
         $script = null;
         $cacheable = true;
-        $result = call_user_func_array(
-            $this->smarty->default_plugin_handler_func, array($tag, $plugin_type, $this->template, &$callback, &$script, &$cacheable)
-        );
+        $result = call_user_func_array($this->smarty->default_plugin_handler_func, array($tag, $plugin_type, $this->template, &$callback, &$script, &$cacheable));
         if ($result) {
             $this->tag_nocache = $this->tag_nocache || !$cacheable;
             if ($script !== null) {
@@ -764,6 +868,25 @@ abstract class Smarty_Internal_TemplateCompilerBase
         return false;
     }
 
+    /**
+     * Append code segments and remove unneeded ?> <?php transitions
+     *
+     * @param string $left
+     * @param string $right
+     *
+     * @return string
+     */
+    public function appendCode($left, $right)
+    {
+        if (preg_match('/\s*\?>\s*$/', $left) && preg_match('/^\s*<\?php\s+/', $right)) {
+            $left = preg_replace('/\s*\?>\s*$/', "\n", $left);
+            $left .= preg_replace('/^\s*<\?php\s+/', '', $right);
+        } else {
+            $left .= $right;
+        }
+        return $left;
+    }
+
     /**
      * Inject inline code for nocache template sections
      * This method gets the content of each template element from the parser.
@@ -780,8 +903,7 @@ abstract class Smarty_Internal_TemplateCompilerBase
         // If the template is not evaluated and we have a nocache section and or a nocache tag
         if ($is_code && !empty($content)) {
             // generate replacement code
-            if ((!($this->template->source->recompiled) || $this->forceNocache) && $this->template->caching && !$this->suppressNocacheProcessing &&
-                ($this->nocache || $this->tag_nocache)
+            if ((!($this->template->source->recompiled) || $this->forceNocache) && $this->template->caching && !$this->suppressNocacheProcessing && ($this->nocache || $this->tag_nocache)
             ) {
                 $this->template->has_nocache_code = true;
                 $_output = addcslashes($content, '\'\\');
@@ -842,7 +964,6 @@ abstract class Smarty_Internal_TemplateCompilerBase
 
     /**
      *  restore file and line offset
-
      */
     public function popTrace()
     {
@@ -883,6 +1004,7 @@ abstract class Smarty_Internal_TemplateCompilerBase
             // individual error message
             $error_text .= $args;
         } else {
+            $expect = array();
             // expected token from parser
             $error_text .= ' - Unexpected "' . $this->lex->value . '"';
             if (count($this->parser->yy_get_expected_tokens($this->parser->yymajor)) <= 4) {
diff --git a/libs/smarty/sysplugins/smarty_internal_templatelexer.php b/libs/smarty/sysplugins/smarty_internal_templatelexer.php
index dd9f9a4f1..9b0ade35b 100644
--- a/libs/smarty/sysplugins/smarty_internal_templatelexer.php
+++ b/libs/smarty/sysplugins/smarty_internal_templatelexer.php
@@ -19,170 +19,177 @@
  */
 class Smarty_Internal_Templatelexer
 {
+
     /**
      * Source
      *
      * @var string
      */
     public $data;
+
     /**
      * byte counter
      *
      * @var int
      */
     public $counter;
+
     /**
      * token number
      *
      * @var int
      */
     public $token;
+
     /**
      * token value
      *
      * @var string
      */
     public $value;
+
     /**
      * current line
      *
      * @var int
      */
     public $line;
+
     /**
      * tag start line
      *
      * @var
      */
     public $taglineno;
+
     /**
-     * flag if parsing php script
+     * php code type
      *
-     * @var bool
+     * @var string
      */
-    public $is_phpScript = false;
+    public $phpType = '';
+
     /**
      * escaped left delimiter
      *
      * @var string
      */
     public $ldel = '';
+
     /**
      * escaped left delimiter length
      *
      * @var int
      */
     public $ldel_length = 0;
+
     /**
      * escaped right delimiter
      *
      * @var string
      */
     public $rdel = '';
+
     /**
      * escaped right delimiter length
      *
      * @var int
      */
     public $rdel_length = 0;
+
     /**
      * state number
      *
      * @var int
      */
     public $state = 1;
+
     /**
      * Smarty object
      *
      * @var Smarty
      */
     public $smarty = null;
+
     /**
      * compiler object
      *
      * @var Smarty_Internal_TemplateCompilerBase
      */
-    private $compiler = null;
+    public $compiler = null;
+
     /**
      * literal tag nesting level
      *
      * @var int
      */
     private $literal_cnt = 0;
+
+    /**
+     * PHP start tag string
+     *
+     * @var string
+     */
+
     /**
      * trace file
      *
      * @var resource
      */
     public $yyTraceFILE;
+
     /**
      * trace prompt
      *
      * @var string
      */
+
     public $yyTracePrompt;
+
     /**
      * state names
      *
      * @var array
      */
-    public $state_name = array(1 => 'TEXT', 2 => 'SMARTY', 3 => 'LITERAL', 4 => 'DOUBLEQUOTEDSTRING', 5 => 'CHILDBODY');
+    public $state_name = array(1 => 'TEXT', 2 => 'TAG', 3 => 'TAGBODY', 4 => 'LITERAL', 5 => 'DOUBLEQUOTEDSTRING',
+                               6 => 'CHILDBODY', 7 => 'CHILDBLOCK', 8 => 'CHILDLITERAL');
+
+    /**
+     * storage for assembled token patterns
+     *
+     * @var string
+     */
+    private $yy_global_pattern1 = null;
+
+    private $yy_global_pattern2 = null;
+
+    private $yy_global_pattern3 = null;
+
+    private $yy_global_pattern4 = null;
+
+    private $yy_global_pattern5 = null;
+
+    private $yy_global_pattern6 = null;
+
+    private $yy_global_pattern7 = null;
+
+    private $yy_global_pattern8 = null;
+
     /**
      * token names
      *
      * @var array
      */
     public $smarty_token_names = array(        // Text for parser error messages
-                                               'IDENTITY'        => '===',
-                                               'NONEIDENTITY'    => '!==',
-                                               'EQUALS'          => '==',
-                                               'NOTEQUALS'       => '!=',
-                                               'GREATEREQUAL'    => '(>=,ge)',
-                                               'LESSEQUAL'       => '(<=,le)',
-                                               'GREATERTHAN'     => '(>,gt)',
-                                               'LESSTHAN'        => '(<,lt)',
-                                               'MOD'             => '(%,mod)',
-                                               'NOT'             => '(!,not)',
-                                               'LAND'            => '(&&,and)',
-                                               'LOR'             => '(||,or)',
-                                               'LXOR'            => 'xor',
-                                               'OPENP'           => '(',
-                                               'CLOSEP'          => ')',
-                                               'OPENB'           => '[',
-                                               'CLOSEB'          => ']',
-                                               'PTR'             => '->',
-                                               'APTR'            => '=>',
-                                               'EQUAL'           => '=',
-                                               'NUMBER'          => 'number',
-                                               'UNIMATH'         => '+" , "-',
-                                               'MATH'            => '*" , "/" , "%',
-                                               'INCDEC'          => '++" , "--',
-                                               'SPACE'           => ' ',
-                                               'DOLLAR'          => '$',
-                                               'SEMICOLON'       => ';',
-                                               'COLON'           => ':',
-                                               'DOUBLECOLON'     => '::',
-                                               'AT'              => '@',
-                                               'HATCH'           => '#',
-                                               'QUOTE'           => '"',
-                                               'BACKTICK'        => '`',
-                                               'VERT'            => '|',
-                                               'DOT'             => '.',
-                                               'COMMA'           => '","',
-                                               'ANDSYM'          => '"&"',
-                                               'QMARK'           => '"?"',
-                                               'ID'              => 'identifier',
-                                               'TEXT'            => 'text',
-                                               'FAKEPHPSTARTTAG' => 'Fake PHP start tag',
-                                               'PHPSTARTTAG'     => 'PHP start tag',
-                                               'PHPENDTAG'       => 'PHP end tag',
-                                               'LITERALSTART'    => 'Literal start',
-                                               'LITERALEND'      => 'Literal end',
-                                               'LDELSLASH'       => 'closing tag',
-                                               'COMMENT'         => 'comment',
-                                               'AS'              => 'as',
-                                               'TO'              => 'to',
-    );
+        'NOT'         => '(!,not)', 'OPENP' => '(', 'CLOSEP' => ')', 'OPENB' => '[', 'CLOSEB' => ']', 'PTR' => '->',
+        'APTR'        => '=>', 'EQUAL' => '=', 'NUMBER' => 'number', 'UNIMATH' => '+" , "-', 'MATH' => '*" , "/" , "%',
+        'INCDEC'      => '++" , "--', 'SPACE' => ' ', 'DOLLAR' => '$', 'SEMICOLON' => ';', 'COLON' => ':',
+        'DOUBLECOLON' => '::', 'AT' => '@', 'HATCH' => '#', 'QUOTE' => '"', 'BACKTICK' => '`', 'VERT' => '"|" modifier',
+        'DOT'         => '.', 'COMMA' => '","', 'QMARK' => '"?"', 'ID' => 'id, name', 'TEXT' => 'text',
+        'LDELSLASH'   => '{/..} closing tag', 'LDEL' => '{...} Smarty tag', 'COMMENT' => 'comment', 'AS' => 'as',
+        'TO'          => 'to', 'PHP' => '"<?php", "<%", "{php}" tag', 'LOGOP' => '"<", "==" ... logical operator',
+        'TLOGOP'      => '"lt", "eq" ... logical operator; "is div by" ... if condition',
+        'SCOND'       => '"is even" ... if condition',);
 
     /**
      * constructor
@@ -194,15 +201,15 @@ class Smarty_Internal_Templatelexer
     {
         $this->data = $data;
         $this->counter = 0;
-        if (preg_match('/^\xEF\xBB\xBF/', $this->data, $match)) {
+        if (preg_match('~^\xEF\xBB\xBF~i', $this->data, $match)) {
             $this->counter += strlen($match[0]);
         }
         $this->line = 1;
         $this->smarty = $compiler->smarty;
         $this->compiler = $compiler;
-        $this->ldel = preg_quote($this->smarty->left_delimiter, '/');
+        $this->ldel = preg_quote($this->smarty->left_delimiter, '~');
         $this->ldel_length = strlen($this->smarty->left_delimiter);
-        $this->rdel = preg_quote($this->smarty->right_delimiter, '/');
+        $this->rdel = preg_quote($this->smarty->right_delimiter, '~');
         $this->rdel_length = strlen($this->smarty->right_delimiter);
         $this->smarty_token_names['LDEL'] = $this->smarty->left_delimiter;
         $this->smarty_token_names['RDEL'] = $this->smarty->right_delimiter;
@@ -214,7 +221,16 @@ class Smarty_Internal_Templatelexer
         $this->yyTracePrompt = '<br>';
     }
 
+    /*
+     * Check if this tag is autoliteral
+     */
+    public function isAutoLiteral()
+    {
+        return $this->smarty->auto_literal && isset($this->value[$this->ldel_length]) ? strpos(" \n\t\r", $this->value[$this->ldel_length]) !== false : false;
+    }
+
     private $_yy_state = 1;
+
     private $_yy_stack = array();
 
     public function yylex()
@@ -255,51 +271,24 @@ class Smarty_Internal_Templatelexer
 
     public function yylex1()
     {
-        $tokenMap = array(
-            1  => 0,
-            2  => 1,
-            4  => 0,
-            5  => 0,
-            6  => 0,
-            7  => 1,
-            9  => 0,
-            10 => 0,
-            11 => 0,
-            12 => 0,
-            13 => 0,
-            14 => 2,
-            17 => 0,
-            18 => 0,
-            19 => 0,
-            20 => 0,
-            21 => 0,
-            22 => 0,
-        );
+        if (!isset($this->yy_global_pattern1)) {
+            $this->yy_global_pattern1 = "/\G([{][}])|\G(" . $this->ldel . "[*])|\G((<[?]((php\\s+|=)|\\s+))|(<[%])|(<[?]xml\\s+)|(<script\\s+language\\s*=\\s*[\"']?\\s*php\\s*[\"']?\\s*>)|([?][>])|([%][>])|(" . $this->ldel . "\\s*php(.*?)" . $this->rdel . ")|(" . $this->ldel . "\\s*[\/]php" . $this->rdel . "))|\G(" . $this->ldel . "\\s*literal\\s*" . $this->rdel . ")|\G(" . $this->ldel . "\\s*)|\G(\\s*" . $this->rdel . ")|\G([\S\s])/isS";
+        }
         if ($this->counter >= strlen($this->data)) {
             return false; // end of input
         }
-        $yy_global_pattern = "/\G(\\{\\})|\G(" . $this->ldel . "\\*([\S\s]*?)\\*" . $this->rdel . ")|\G(" . $this->ldel . "\\s*strip\\s*" . $this->rdel . ")|\G(" . $this->ldel . "\\s*\/strip\\s*" . $this->rdel . ")|\G(" . $this->ldel . "\\s*literal\\s*" . $this->rdel . ")|\G(" . $this->ldel . "\\s*(if|elseif|else if|while)\\s+)|\G(" . $this->ldel . "\\s*for\\s+)|\G(" . $this->ldel . "\\s*foreach(?![^\s]))|\G(" . $this->ldel . "\\s*setfilter\\s+)|\G(" . $this->ldel . "\\s*\/)|\G(" . $this->ldel . "\\s*)|\G((<script\\s+language\\s*=\\s*[\"']?\\s*php\\s*[\"']?\\s*>)|(<\\?(?:php\\w+|=|[a-zA-Z]+)?))|\G(\\?>)|\G(<\/script>)|\G(\\s*" . $this->rdel . ")|\G(<%)|\G(%>)|\G([\S\s])/iS";
 
         do {
-            if (preg_match($yy_global_pattern, $this->data, $yymatches, null, $this->counter)) {
+            if (preg_match($this->yy_global_pattern1, $this->data, $yymatches, null, $this->counter)) {
                 $yysubmatches = $yymatches;
                 $yymatches = preg_grep("/(.|\s)+/", $yysubmatches);
-                if (!count($yymatches)) {
-                    throw new Exception('Error: lexing failed because a rule matched' .
-                                        ' an empty string.  Input "' . substr($this->data,
-                                                                              $this->counter, 5) . '... state TEXT');
+                if (empty($yymatches)) {
+                    throw new Exception('Error: lexing failed because a rule matched' . ' an empty string.  Input "' . substr($this->data, $this->counter, 5) . '... state TEXT');
                 }
                 next($yymatches); // skip global match
                 $this->token = key($yymatches); // token number
-                if ($tokenMap[$this->token]) {
-                    // extract sub-patterns for passing to lex function
-                    $yysubmatches = array_slice($yysubmatches, $this->token + 1,
-                                                $tokenMap[$this->token]);
-                } else {
-                    $yysubmatches = array();
-                }
                 $this->value = current($yymatches); // token value
-                $r = $this->{'yy_r1_' . $this->token}($yysubmatches);
+                $r = $this->{'yy_r1_' . $this->token}();
                 if ($r === null) {
                     $this->counter += strlen($this->value);
                     $this->line += substr_count($this->value, "\n");
@@ -319,8 +308,7 @@ class Smarty_Internal_Templatelexer
                     continue;
                 }
             } else {
-                throw new Exception('Unexpected input at line' . $this->line .
-                                    ': ' . $this->data[$this->counter]);
+                throw new Exception('Unexpected input at line' . $this->line . ': ' . $this->data[$this->counter]);
             }
             break;
         } while (true);
@@ -328,39 +316,34 @@ class Smarty_Internal_Templatelexer
 
     const TEXT = 1;
 
-    function yy_r1_1($yy_subpatterns)
+    function yy_r1_1()
     {
 
         $this->token = Smarty_Internal_Templateparser::TP_TEXT;
     }
 
-    function yy_r1_2($yy_subpatterns)
+    function yy_r1_2()
     {
 
-        $this->token = Smarty_Internal_Templateparser::TP_COMMENT;
-    }
-
-    function yy_r1_4($yy_subpatterns)
-    {
-
-        if ($this->smarty->auto_literal && isset($this->value[$this->ldel_length]) ? strpos(" \n\t\r", $this->value[$this->ldel_length]) !== false : false) {
-            $this->token = Smarty_Internal_Templateparser::TP_TEXT;
+        preg_match("~[*]{$this->rdel}~", $this->data, $match, PREG_OFFSET_CAPTURE, $this->counter);
+        if (isset($match[0][1])) {
+            $to = $match[0][1] + strlen($match[0][0]);
         } else {
-            $this->token = Smarty_Internal_Templateparser::TP_STRIPON;
+            $this->compiler->trigger_template_error("missing or misspelled comment closing tag '*{$this->smarty->right_delimiter}'");
         }
+        $this->value = substr($this->data, $this->counter, $to - $this->counter);
+        return false;
     }
 
-    function yy_r1_5($yy_subpatterns)
+    function yy_r1_3()
     {
 
-        if ($this->smarty->auto_literal && isset($this->value[$this->ldel_length]) ? strpos(" \n\t\r", $this->value[$this->ldel_length]) !== false : false) {
-            $this->token = Smarty_Internal_Templateparser::TP_TEXT;
-        } else {
-            $this->token = Smarty_Internal_Templateparser::TP_STRIPOFF;
-        }
+        $obj = new Smarty_Internal_Compile_Private_Php();
+        $obj->parsePhp($this);
+        $this->token = Smarty_Internal_Templateparser::TP_PHP;
     }
 
-    function yy_r1_6($yy_subpatterns)
+    function yy_r1_15()
     {
 
         if ($this->smarty->auto_literal && isset($this->value[$this->ldel_length]) ? strpos(" \n\t\r", $this->value[$this->ldel_length]) !== false : false) {
@@ -371,130 +354,28 @@ class Smarty_Internal_Templatelexer
         }
     }
 
-    function yy_r1_7($yy_subpatterns)
+    function yy_r1_16()
     {
 
         if ($this->smarty->auto_literal && isset($this->value[$this->ldel_length]) ? strpos(" \n\t\r", $this->value[$this->ldel_length]) !== false : false) {
             $this->token = Smarty_Internal_Templateparser::TP_TEXT;
         } else {
-            $this->token = Smarty_Internal_Templateparser::TP_LDELIF;
-            $this->yypushstate(self::SMARTY);
-            $this->taglineno = $this->line;
+            $this->yypushstate(self::TAG);
+            return true;
         }
     }
 
-    function yy_r1_9($yy_subpatterns)
-    {
-
-        if ($this->smarty->auto_literal && isset($this->value[$this->ldel_length]) ? strpos(" \n\t\r", $this->value[$this->ldel_length]) !== false : false) {
-            $this->token = Smarty_Internal_Templateparser::TP_TEXT;
-        } else {
-            $this->token = Smarty_Internal_Templateparser::TP_LDELFOR;
-            $this->yypushstate(self::SMARTY);
-            $this->taglineno = $this->line;
-        }
-    }
-
-    function yy_r1_10($yy_subpatterns)
-    {
-
-        if ($this->smarty->auto_literal && isset($this->value[$this->ldel_length]) ? strpos(" \n\t\r", $this->value[$this->ldel_length]) !== false : false) {
-            $this->token = Smarty_Internal_Templateparser::TP_TEXT;
-        } else {
-            $this->token = Smarty_Internal_Templateparser::TP_LDELFOREACH;
-            $this->yypushstate(self::SMARTY);
-            $this->taglineno = $this->line;
-        }
-    }
-
-    function yy_r1_11($yy_subpatterns)
-    {
-
-        if ($this->smarty->auto_literal && isset($this->value[$this->ldel_length]) ? strpos(" \n\t\r", $this->value[$this->ldel_length]) !== false : false) {
-            $this->token = Smarty_Internal_Templateparser::TP_TEXT;
-        } else {
-            $this->token = Smarty_Internal_Templateparser::TP_LDELSETFILTER;
-            $this->yypushstate(self::SMARTY);
-            $this->taglineno = $this->line;
-        }
-    }
-
-    function yy_r1_12($yy_subpatterns)
-    {
-
-        if ($this->smarty->auto_literal && isset($this->value[$this->ldel_length]) ? strpos(" \n\t\r", $this->value[$this->ldel_length]) !== false : false) {
-            $this->token = Smarty_Internal_Templateparser::TP_TEXT;
-        } else {
-            $this->token = Smarty_Internal_Templateparser::TP_LDELSLASH;
-            $this->yypushstate(self::SMARTY);
-            $this->taglineno = $this->line;
-        }
-    }
-
-    function yy_r1_13($yy_subpatterns)
-    {
-
-        if ($this->smarty->auto_literal && isset($this->value[$this->ldel_length]) ? strpos(" \n\t\r", $this->value[$this->ldel_length]) !== false : false) {
-            $this->token = Smarty_Internal_Templateparser::TP_TEXT;
-        } else {
-            $this->token = Smarty_Internal_Templateparser::TP_LDEL;
-            $this->yypushstate(self::SMARTY);
-            $this->taglineno = $this->line;
-        }
-    }
-
-    function yy_r1_14($yy_subpatterns)
-    {
-
-        if (($script = strpos($this->value, '<s') === 0) || in_array($this->value, Array('<?', '<?=', '<?php'))) {
-            if ($script) {
-                $this->is_phpScript = true;
-            }
-            $this->token = Smarty_Internal_Templateparser::TP_PHPSTARTTAG;
-        } elseif ($this->value == '<?xml') {
-            $this->token = Smarty_Internal_Templateparser::TP_XMLTAG;
-        } else {
-            $this->token = Smarty_Internal_Templateparser::TP_TEXT;
-            //$this->value = substr($this->value, 0, 2);
-        }
-    }
-
-    function yy_r1_17($yy_subpatterns)
-    {
-
-        $this->token = Smarty_Internal_Templateparser::TP_PHPENDTAG;
-    }
-
-    function yy_r1_18($yy_subpatterns)
-    {
-
-        $this->token = Smarty_Internal_Templateparser::TP_PHPENDSCRIPT;
-    }
-
-    function yy_r1_19($yy_subpatterns)
+    function yy_r1_17()
     {
 
         $this->token = Smarty_Internal_Templateparser::TP_TEXT;
     }
 
-    function yy_r1_20($yy_subpatterns)
+    function yy_r1_18()
     {
 
-        $this->token = Smarty_Internal_Templateparser::TP_ASPSTARTTAG;
-    }
-
-    function yy_r1_21($yy_subpatterns)
-    {
-
-        $this->token = Smarty_Internal_Templateparser::TP_ASPENDTAG;
-    }
-
-    function yy_r1_22($yy_subpatterns)
-    {
-
-        $phpEndScript = $this->is_phpScript ? '|<\\/script>' : '';
         $to = strlen($this->data);
-        preg_match("/{$this->ldel}|<\?|<%|\?>|%>|<script\s+language\s*=\s*[\"\']?\s*php\s*[\"\']?\s*>{$phpEndScript}/", $this->data, $match, PREG_OFFSET_CAPTURE, $this->counter);
+        preg_match("~($this->ldel)|([<]script\s+language\s*=\s*[\"\']?\s*php\s*[\"\']?\s*[>])|([<][?])|([<][%])|([?][>])|([%][>])~i", $this->data, $match, PREG_OFFSET_CAPTURE, $this->counter);
         if (isset($match[0][1])) {
             $to = $match[0][1];
         }
@@ -504,100 +385,24 @@ class Smarty_Internal_Templatelexer
 
     public function yylex2()
     {
-        $tokenMap = array(
-            1  => 0,
-            2  => 0,
-            3  => 1,
-            5  => 0,
-            6  => 0,
-            7  => 0,
-            8  => 0,
-            9  => 0,
-            10 => 0,
-            11 => 0,
-            12 => 0,
-            13 => 0,
-            14 => 0,
-            15 => 1,
-            17 => 1,
-            19 => 1,
-            21 => 0,
-            22 => 0,
-            23 => 0,
-            24 => 0,
-            25 => 0,
-            26 => 0,
-            27 => 0,
-            28 => 0,
-            29 => 0,
-            30 => 0,
-            31 => 0,
-            32 => 0,
-            33 => 0,
-            34 => 0,
-            35 => 0,
-            36 => 0,
-            37 => 0,
-            38 => 3,
-            42 => 0,
-            43 => 0,
-            44 => 0,
-            45 => 0,
-            46 => 0,
-            47 => 0,
-            48 => 0,
-            49 => 0,
-            50 => 1,
-            52 => 1,
-            54 => 0,
-            55 => 0,
-            56 => 0,
-            57 => 2,
-            60 => 0,
-            61 => 0,
-            62 => 0,
-            63 => 0,
-            64 => 0,
-            65 => 0,
-            66 => 0,
-            67 => 0,
-            68 => 0,
-            69 => 0,
-            70 => 0,
-            71 => 0,
-            72 => 0,
-            73 => 1,
-            75 => 0,
-            76 => 0,
-            77 => 0,
-            78 => 0,
-            79 => 0,
-        );
+        if (!isset($this->yy_global_pattern2)) {
+            $this->yy_global_pattern2 = "/\G(" . $this->ldel . "\\s*(if|elseif|else if|while)\\s+)|\G(" . $this->ldel . "\\s*for\\s+)|\G(" . $this->ldel . "\\s*foreach(?![^\s]))|\G(" . $this->ldel . "\\s*setfilter\\s+)|\G(" . $this->ldel . "\\s*[0-9]*[a-zA-Z_]\\w*(\\s+nocache)?\\s*" . $this->rdel . ")|\G(" . $this->ldel . "\\s*[\/](?:(?!block)[0-9]*[a-zA-Z_]\\w*)\\s*" . $this->rdel . ")|\G(" . $this->ldel . "\\s*[$][0-9]*[a-zA-Z_]\\w*(\\s+nocache)?\\s*" . $this->rdel . ")|\G(" . $this->ldel . "\\s*[\/])|\G(" . $this->ldel . "\\s*)/isS";
+        }
         if ($this->counter >= strlen($this->data)) {
             return false; // end of input
         }
-        $yy_global_pattern = "/\G(\")|\G('[^'\\\\]*(?:\\\\.[^'\\\\]*)*')|\G([$]smarty\\.block\\.(child|parent))|\G(\\$)|\G(\\s*" . $this->rdel . ")|\G(\\s+is\\s+in\\s+)|\G(\\s+as\\s+)|\G(\\s+to\\s+)|\G(\\s+step\\s+)|\G(\\s+instanceof\\s+)|\G(\\s*===\\s*)|\G(\\s*!==\\s*)|\G(\\s*==\\s*|\\s+eq\\s+)|\G(\\s*!=\\s*|\\s*<>\\s*|\\s+(ne|neq)\\s+)|\G(\\s*>=\\s*|\\s+(ge|gte)\\s+)|\G(\\s*<=\\s*|\\s+(le|lte)\\s+)|\G(\\s*>\\s*|\\s+gt\\s+)|\G(\\s*<\\s*|\\s+lt\\s+)|\G(\\s+mod\\s+)|\G(!\\s*|not\\s+)|\G(\\s*&&\\s*|\\s*and\\s+)|\G(\\s*\\|\\|\\s*|\\s*or\\s+)|\G(\\s*xor\\s+)|\G(\\s+is\\s+odd\\s+by\\s+)|\G(\\s+is\\s+not\\s+odd\\s+by\\s+)|\G(\\s+is\\s+odd)|\G(\\s+is\\s+not\\s+odd)|\G(\\s+is\\s+even\\s+by\\s+)|\G(\\s+is\\s+not\\s+even\\s+by\\s+)|\G(\\s+is\\s+even)|\G(\\s+is\\s+not\\s+even)|\G(\\s+is\\s+div\\s+by\\s+)|\G(\\s+is\\s+not\\s+div\\s+by\\s+)|\G(\\((int(eger)?|bool(ean)?|float|double|real|string|binary|array|object)\\)\\s*)|\G(\\s*\\(\\s*)|\G(\\s*\\))|\G(\\[\\s*)|\G(\\s*\\])|\G(\\s*->\\s*)|\G(\\s*=>\\s*)|\G(\\s*=\\s*)|\G(\\+\\+|--)|\G(\\s*(\\+|-)\\s*)|\G(\\s*(\\*|\/|%)\\s*)|\G(@)|\G(#)|\G(\\s+[0-9]*[a-zA-Z_][a-zA-Z0-9_\-:]*\\s*=\\s*)|\G(([0-9]*[a-zA-Z_]\\w*)?(\\\\[0-9]*[a-zA-Z_]\\w*)+)|\G([0-9]*[a-zA-Z_]\\w*)|\G(\\d+)|\G(`)|\G(\\|)|\G(\\.)|\G(\\s*,\\s*)|\G(\\s*;)|\G(::)|\G(\\s*:\\s*)|\G(\\s*&\\s*)|\G(\\s*\\?\\s*)|\G(0[xX][0-9a-fA-F]+)|\G(\\s+)|\G(" . $this->ldel . "\\s*(if|elseif|else if|while)\\s+)|\G(" . $this->ldel . "\\s*for\\s+)|\G(" . $this->ldel . "\\s*foreach(?![^\s]))|\G(" . $this->ldel . "\\s*\/)|\G(" . $this->ldel . "\\s*)|\G([\S\s])/iS";
 
         do {
-            if (preg_match($yy_global_pattern, $this->data, $yymatches, null, $this->counter)) {
+            if (preg_match($this->yy_global_pattern2, $this->data, $yymatches, null, $this->counter)) {
                 $yysubmatches = $yymatches;
                 $yymatches = preg_grep("/(.|\s)+/", $yysubmatches);
-                if (!count($yymatches)) {
-                    throw new Exception('Error: lexing failed because a rule matched' .
-                                        ' an empty string.  Input "' . substr($this->data,
-                                                                              $this->counter, 5) . '... state SMARTY');
+                if (empty($yymatches)) {
+                    throw new Exception('Error: lexing failed because a rule matched' . ' an empty string.  Input "' . substr($this->data, $this->counter, 5) . '... state TAG');
                 }
                 next($yymatches); // skip global match
                 $this->token = key($yymatches); // token number
-                if ($tokenMap[$this->token]) {
-                    // extract sub-patterns for passing to lex function
-                    $yysubmatches = array_slice($yysubmatches, $this->token + 1,
-                                                $tokenMap[$this->token]);
-                } else {
-                    $yysubmatches = array();
-                }
                 $this->value = current($yymatches); // token value
-                $r = $this->{'yy_r2_' . $this->token}($yysubmatches);
+                $r = $this->{'yy_r2_' . $this->token}();
                 if ($r === null) {
                     $this->counter += strlen($this->value);
                     $this->line += substr_count($this->value, "\n");
@@ -617,300 +422,310 @@ class Smarty_Internal_Templatelexer
                     continue;
                 }
             } else {
-                throw new Exception('Unexpected input at line' . $this->line .
-                                    ': ' . $this->data[$this->counter]);
+                throw new Exception('Unexpected input at line' . $this->line . ': ' . $this->data[$this->counter]);
             }
             break;
         } while (true);
     } // end function
 
-    const SMARTY = 2;
+    const TAG = 2;
 
-    function yy_r2_1($yy_subpatterns)
+    function yy_r2_1()
     {
 
-        $this->token = Smarty_Internal_Templateparser::TP_QUOTE;
-        $this->yypushstate(self::DOUBLEQUOTEDSTRING);
-    }
-
-    function yy_r2_2($yy_subpatterns)
-    {
-
-        $this->token = Smarty_Internal_Templateparser::TP_SINGLEQUOTESTRING;
-    }
-
-    function yy_r2_3($yy_subpatterns)
-    {
-
-        $this->token = Smarty_Internal_Templateparser::TP_SMARTYBLOCKCHILDPARENT;
+        $this->token = Smarty_Internal_Templateparser::TP_LDELIF;
+        $this->yybegin(self::TAGBODY);
         $this->taglineno = $this->line;
     }
 
-    function yy_r2_5($yy_subpatterns)
+    function yy_r2_3()
     {
 
-        $this->token = Smarty_Internal_Templateparser::TP_DOLLAR;
+        $this->token = Smarty_Internal_Templateparser::TP_LDELFOR;
+        $this->yybegin(self::TAGBODY);
+        $this->taglineno = $this->line;
     }
 
-    function yy_r2_6($yy_subpatterns)
+    function yy_r2_4()
+    {
+
+        $this->token = Smarty_Internal_Templateparser::TP_LDELFOREACH;
+        $this->yybegin(self::TAGBODY);
+        $this->taglineno = $this->line;
+    }
+
+    function yy_r2_5()
+    {
+
+        $this->token = Smarty_Internal_Templateparser::TP_LDELSETFILTER;
+        $this->yybegin(self::TAGBODY);
+        $this->taglineno = $this->line;
+    }
+
+    function yy_r2_6()
+    {
+
+        $this->yypopstate();
+        $this->token = Smarty_Internal_Templateparser::TP_SIMPLETAG;
+        $this->taglineno = $this->line;
+    }
+
+    function yy_r2_8()
+    {
+
+        $this->yypopstate();
+        $this->token = Smarty_Internal_Templateparser::TP_CLOSETAG;
+        $this->taglineno = $this->line;
+    }
+
+    function yy_r2_9()
+    {
+
+        $this->yypopstate();
+        $this->token = Smarty_Internal_Templateparser::TP_SIMPELOUTPUT;
+        $this->taglineno = $this->line;
+    }
+
+    function yy_r2_11()
+    {
+
+        $this->token = Smarty_Internal_Templateparser::TP_LDELSLASH;
+        $this->yybegin(self::TAGBODY);
+        $this->taglineno = $this->line;
+    }
+
+    function yy_r2_12()
+    {
+
+        $this->token = Smarty_Internal_Templateparser::TP_LDEL;
+        $this->yybegin(self::TAGBODY);
+        $this->taglineno = $this->line;
+    }
+
+    public function yylex3()
+    {
+        if (!isset($this->yy_global_pattern3)) {
+            $this->yy_global_pattern3 = "/\G(\\s*" . $this->rdel . ")|\G([\"])|\G('[^'\\\\]*(?:\\\\.[^'\\\\]*)*')|\G([$]smarty\\.block\\.(child|parent))|\G([$][0-9]*[a-zA-Z_]\\w*)|\G([$])|\G(\\s+is\\s+in\\s+)|\G(\\s+as\\s+)|\G(\\s+to\\s+)|\G(\\s+step\\s+)|\G(\\s+instanceof\\s+)|\G(\\s*(([!=][=]{1,2})|([<][=>]?)|([>][=]?)|[&|]{2})\\s*)|\G(\\s+(eq|ne|neg|gt|ge|gte|lt|le|lte|mod|and|or|xor|(is\\s+(not\\s+)?(odd|even|div)\\s+by))\\s+)|\G(\\s+is\\s+(not\\s+)?(odd|even))|\G(([!]\\s*)|(not\\s+))|\G([(](int(eger)?|bool(ean)?|float|double|real|string|binary|array|object)[)]\\s*)|\G(\\s*[(]\\s*)|\G(\\s*[)])|\G(\\[\\s*)|\G(\\s*\\])|\G(\\s*[-][>]\\s*)|\G(\\s*[=][>]\\s*)|\G(\\s*[=]\\s*)|\G(([+]|[-]){2})|\G(\\s*([+]|[-])\\s*)|\G(\\s*([*]{1,2}|[%\/^&]|[<>]{2})\\s*)|\G([@])|\G([#])|\G(\\s+[0-9]*[a-zA-Z_][a-zA-Z0-9_\-:]*\\s*[=]\\s*)|\G(([0-9]*[a-zA-Z_]\\w*)?(\\\\[0-9]*[a-zA-Z_]\\w*)+)|\G([0-9]*[a-zA-Z_]\\w*)|\G(\\d+)|\G([`])|\G([|])|\G([.])|\G(\\s*[,]\\s*)|\G(\\s*[;]\\s*)|\G([:]{2})|\G(\\s*[:]\\s*)|\G(\\s*[?]\\s*)|\G(0[xX][0-9a-fA-F]+)|\G(\\s+)|\G(" . $this->ldel . "\\s*)|\G([\S\s])/isS";
+        }
+        if ($this->counter >= strlen($this->data)) {
+            return false; // end of input
+        }
+
+        do {
+            if (preg_match($this->yy_global_pattern3, $this->data, $yymatches, null, $this->counter)) {
+                $yysubmatches = $yymatches;
+                $yymatches = preg_grep("/(.|\s)+/", $yysubmatches);
+                if (empty($yymatches)) {
+                    throw new Exception('Error: lexing failed because a rule matched' . ' an empty string.  Input "' . substr($this->data, $this->counter, 5) . '... state TAGBODY     ');
+                }
+                next($yymatches); // skip global match
+                $this->token = key($yymatches); // token number
+                $this->value = current($yymatches); // token value
+                $r = $this->{'yy_r3_' . $this->token}();
+                if ($r === null) {
+                    $this->counter += strlen($this->value);
+                    $this->line += substr_count($this->value, "\n");
+                    // accept this token
+                    return true;
+                } elseif ($r === true) {
+                    // we have changed state
+                    // process this token in the new state
+                    return $this->yylex();
+                } elseif ($r === false) {
+                    $this->counter += strlen($this->value);
+                    $this->line += substr_count($this->value, "\n");
+                    if ($this->counter >= strlen($this->data)) {
+                        return false; // end of input
+                    }
+                    // skip this token
+                    continue;
+                }
+            } else {
+                throw new Exception('Unexpected input at line' . $this->line . ': ' . $this->data[$this->counter]);
+            }
+            break;
+        } while (true);
+    } // end function
+
+    const TAGBODY = 3;
+
+    function yy_r3_1()
     {
 
         $this->token = Smarty_Internal_Templateparser::TP_RDEL;
         $this->yypopstate();
     }
 
-    function yy_r2_7($yy_subpatterns)
+    function yy_r3_2()
+    {
+
+        $this->token = Smarty_Internal_Templateparser::TP_QUOTE;
+        $this->yypushstate(self::DOUBLEQUOTEDSTRING);
+    }
+
+    function yy_r3_3()
+    {
+
+        $this->token = Smarty_Internal_Templateparser::TP_SINGLEQUOTESTRING;
+    }
+
+    function yy_r3_4()
+    {
+
+        $this->token = Smarty_Internal_Templateparser::TP_SMARTYBLOCKCHILDPARENT;
+        $this->taglineno = $this->line;
+    }
+
+    function yy_r3_6()
+    {
+
+        $this->token = Smarty_Internal_Templateparser::TP_DOLLARID;
+    }
+
+    function yy_r3_7()
+    {
+
+        $this->token = Smarty_Internal_Templateparser::TP_DOLLAR;
+    }
+
+    function yy_r3_8()
     {
 
         $this->token = Smarty_Internal_Templateparser::TP_ISIN;
     }
 
-    function yy_r2_8($yy_subpatterns)
+    function yy_r3_9()
     {
 
         $this->token = Smarty_Internal_Templateparser::TP_AS;
     }
 
-    function yy_r2_9($yy_subpatterns)
+    function yy_r3_10()
     {
 
         $this->token = Smarty_Internal_Templateparser::TP_TO;
     }
 
-    function yy_r2_10($yy_subpatterns)
+    function yy_r3_11()
     {
 
         $this->token = Smarty_Internal_Templateparser::TP_STEP;
     }
 
-    function yy_r2_11($yy_subpatterns)
+    function yy_r3_12()
     {
 
         $this->token = Smarty_Internal_Templateparser::TP_INSTANCEOF;
     }
 
-    function yy_r2_12($yy_subpatterns)
+    function yy_r3_13()
     {
 
-        $this->token = Smarty_Internal_Templateparser::TP_IDENTITY;
+        $this->token = Smarty_Internal_Templateparser::TP_LOGOP;
     }
 
-    function yy_r2_13($yy_subpatterns)
+    function yy_r3_18()
     {
 
-        $this->token = Smarty_Internal_Templateparser::TP_NONEIDENTITY;
+        $this->token = Smarty_Internal_Templateparser::TP_TLOGOP;
     }
 
-    function yy_r2_14($yy_subpatterns)
+    function yy_r3_23()
     {
 
-        $this->token = Smarty_Internal_Templateparser::TP_EQUALS;
+        $this->token = Smarty_Internal_Templateparser::TP_SINGLECOND;
     }
 
-    function yy_r2_15($yy_subpatterns)
-    {
-
-        $this->token = Smarty_Internal_Templateparser::TP_NOTEQUALS;
-    }
-
-    function yy_r2_17($yy_subpatterns)
-    {
-
-        $this->token = Smarty_Internal_Templateparser::TP_GREATEREQUAL;
-    }
-
-    function yy_r2_19($yy_subpatterns)
-    {
-
-        $this->token = Smarty_Internal_Templateparser::TP_LESSEQUAL;
-    }
-
-    function yy_r2_21($yy_subpatterns)
-    {
-
-        $this->token = Smarty_Internal_Templateparser::TP_GREATERTHAN;
-    }
-
-    function yy_r2_22($yy_subpatterns)
-    {
-
-        $this->token = Smarty_Internal_Templateparser::TP_LESSTHAN;
-    }
-
-    function yy_r2_23($yy_subpatterns)
-    {
-
-        $this->token = Smarty_Internal_Templateparser::TP_MOD;
-    }
-
-    function yy_r2_24($yy_subpatterns)
+    function yy_r3_26()
     {
 
         $this->token = Smarty_Internal_Templateparser::TP_NOT;
     }
 
-    function yy_r2_25($yy_subpatterns)
-    {
-
-        $this->token = Smarty_Internal_Templateparser::TP_LAND;
-    }
-
-    function yy_r2_26($yy_subpatterns)
-    {
-
-        $this->token = Smarty_Internal_Templateparser::TP_LOR;
-    }
-
-    function yy_r2_27($yy_subpatterns)
-    {
-
-        $this->token = Smarty_Internal_Templateparser::TP_LXOR;
-    }
-
-    function yy_r2_28($yy_subpatterns)
-    {
-
-        $this->token = Smarty_Internal_Templateparser::TP_ISODDBY;
-    }
-
-    function yy_r2_29($yy_subpatterns)
-    {
-
-        $this->token = Smarty_Internal_Templateparser::TP_ISNOTODDBY;
-    }
-
-    function yy_r2_30($yy_subpatterns)
-    {
-
-        $this->token = Smarty_Internal_Templateparser::TP_ISODD;
-    }
-
-    function yy_r2_31($yy_subpatterns)
-    {
-
-        $this->token = Smarty_Internal_Templateparser::TP_ISNOTODD;
-    }
-
-    function yy_r2_32($yy_subpatterns)
-    {
-
-        $this->token = Smarty_Internal_Templateparser::TP_ISEVENBY;
-    }
-
-    function yy_r2_33($yy_subpatterns)
-    {
-
-        $this->token = Smarty_Internal_Templateparser::TP_ISNOTEVENBY;
-    }
-
-    function yy_r2_34($yy_subpatterns)
-    {
-
-        $this->token = Smarty_Internal_Templateparser::TP_ISEVEN;
-    }
-
-    function yy_r2_35($yy_subpatterns)
-    {
-
-        $this->token = Smarty_Internal_Templateparser::TP_ISNOTEVEN;
-    }
-
-    function yy_r2_36($yy_subpatterns)
-    {
-
-        $this->token = Smarty_Internal_Templateparser::TP_ISDIVBY;
-    }
-
-    function yy_r2_37($yy_subpatterns)
-    {
-
-        $this->token = Smarty_Internal_Templateparser::TP_ISNOTDIVBY;
-    }
-
-    function yy_r2_38($yy_subpatterns)
+    function yy_r3_29()
     {
 
         $this->token = Smarty_Internal_Templateparser::TP_TYPECAST;
     }
 
-    function yy_r2_42($yy_subpatterns)
+    function yy_r3_33()
     {
 
         $this->token = Smarty_Internal_Templateparser::TP_OPENP;
     }
 
-    function yy_r2_43($yy_subpatterns)
+    function yy_r3_34()
     {
 
         $this->token = Smarty_Internal_Templateparser::TP_CLOSEP;
     }
 
-    function yy_r2_44($yy_subpatterns)
+    function yy_r3_35()
     {
 
         $this->token = Smarty_Internal_Templateparser::TP_OPENB;
     }
 
-    function yy_r2_45($yy_subpatterns)
+    function yy_r3_36()
     {
 
         $this->token = Smarty_Internal_Templateparser::TP_CLOSEB;
     }
 
-    function yy_r2_46($yy_subpatterns)
+    function yy_r3_37()
     {
 
         $this->token = Smarty_Internal_Templateparser::TP_PTR;
     }
 
-    function yy_r2_47($yy_subpatterns)
+    function yy_r3_38()
     {
 
         $this->token = Smarty_Internal_Templateparser::TP_APTR;
     }
 
-    function yy_r2_48($yy_subpatterns)
+    function yy_r3_39()
     {
 
         $this->token = Smarty_Internal_Templateparser::TP_EQUAL;
     }
 
-    function yy_r2_49($yy_subpatterns)
+    function yy_r3_40()
     {
 
         $this->token = Smarty_Internal_Templateparser::TP_INCDEC;
     }
 
-    function yy_r2_50($yy_subpatterns)
+    function yy_r3_42()
     {
 
         $this->token = Smarty_Internal_Templateparser::TP_UNIMATH;
     }
 
-    function yy_r2_52($yy_subpatterns)
+    function yy_r3_44()
     {
 
         $this->token = Smarty_Internal_Templateparser::TP_MATH;
     }
 
-    function yy_r2_54($yy_subpatterns)
+    function yy_r3_46()
     {
 
         $this->token = Smarty_Internal_Templateparser::TP_AT;
     }
 
-    function yy_r2_55($yy_subpatterns)
+    function yy_r3_47()
     {
 
         $this->token = Smarty_Internal_Templateparser::TP_HATCH;
     }
 
-    function yy_r2_56($yy_subpatterns)
+    function yy_r3_48()
     {
 
         // resolve conflicts with shorttag and right_delimiter starting with '='
         if (substr($this->data, $this->counter + strlen($this->value) - 1, $this->rdel_length) == $this->smarty->right_delimiter) {
-            preg_match("/\s+/", $this->value, $match);
+            preg_match("~\s+~", $this->value, $match);
             $this->value = $match[0];
             $this->token = Smarty_Internal_Templateparser::TP_SPACE;
         } else {
@@ -918,189 +733,122 @@ class Smarty_Internal_Templatelexer
         }
     }
 
-    function yy_r2_57($yy_subpatterns)
+    function yy_r3_49()
     {
 
         $this->token = Smarty_Internal_Templateparser::TP_NAMESPACE;
     }
 
-    function yy_r2_60($yy_subpatterns)
+    function yy_r3_52()
     {
 
         $this->token = Smarty_Internal_Templateparser::TP_ID;
     }
 
-    function yy_r2_61($yy_subpatterns)
+    function yy_r3_53()
     {
 
         $this->token = Smarty_Internal_Templateparser::TP_INTEGER;
     }
 
-    function yy_r2_62($yy_subpatterns)
+    function yy_r3_54()
     {
 
         $this->token = Smarty_Internal_Templateparser::TP_BACKTICK;
         $this->yypopstate();
     }
 
-    function yy_r2_63($yy_subpatterns)
+    function yy_r3_55()
     {
 
         $this->token = Smarty_Internal_Templateparser::TP_VERT;
     }
 
-    function yy_r2_64($yy_subpatterns)
+    function yy_r3_56()
     {
 
         $this->token = Smarty_Internal_Templateparser::TP_DOT;
     }
 
-    function yy_r2_65($yy_subpatterns)
+    function yy_r3_57()
     {
 
         $this->token = Smarty_Internal_Templateparser::TP_COMMA;
     }
 
-    function yy_r2_66($yy_subpatterns)
+    function yy_r3_58()
     {
 
         $this->token = Smarty_Internal_Templateparser::TP_SEMICOLON;
     }
 
-    function yy_r2_67($yy_subpatterns)
+    function yy_r3_59()
     {
 
         $this->token = Smarty_Internal_Templateparser::TP_DOUBLECOLON;
     }
 
-    function yy_r2_68($yy_subpatterns)
+    function yy_r3_60()
     {
 
         $this->token = Smarty_Internal_Templateparser::TP_COLON;
     }
 
-    function yy_r2_69($yy_subpatterns)
-    {
-
-        $this->token = Smarty_Internal_Templateparser::TP_ANDSYM;
-    }
-
-    function yy_r2_70($yy_subpatterns)
+    function yy_r3_61()
     {
 
         $this->token = Smarty_Internal_Templateparser::TP_QMARK;
     }
 
-    function yy_r2_71($yy_subpatterns)
+    function yy_r3_62()
     {
 
         $this->token = Smarty_Internal_Templateparser::TP_HEX;
     }
 
-    function yy_r2_72($yy_subpatterns)
+    function yy_r3_63()
     {
 
         $this->token = Smarty_Internal_Templateparser::TP_SPACE;
     }
 
-    function yy_r2_73($yy_subpatterns)
+    function yy_r3_64()
     {
 
         if ($this->smarty->auto_literal && isset($this->value[$this->ldel_length]) ? strpos(" \n\t\r", $this->value[$this->ldel_length]) !== false : false) {
             $this->token = Smarty_Internal_Templateparser::TP_TEXT;
         } else {
-            $this->token = Smarty_Internal_Templateparser::TP_LDELIF;
-            $this->yypushstate(self::SMARTY);
-            $this->taglineno = $this->line;
+            $this->yypushstate(self::TAG);
+            return true;
         }
     }
 
-    function yy_r2_75($yy_subpatterns)
-    {
-
-        if ($this->smarty->auto_literal && isset($this->value[$this->ldel_length]) ? strpos(" \n\t\r", $this->value[$this->ldel_length]) !== false : false) {
-            $this->token = Smarty_Internal_Templateparser::TP_TEXT;
-        } else {
-            $this->token = Smarty_Internal_Templateparser::TP_LDELFOR;
-            $this->yypushstate(self::SMARTY);
-            $this->taglineno = $this->line;
-        }
-    }
-
-    function yy_r2_76($yy_subpatterns)
-    {
-
-        if ($this->smarty->auto_literal && isset($this->value[$this->ldel_length]) ? strpos(" \n\t\r", $this->value[$this->ldel_length]) !== false : false) {
-            $this->token = Smarty_Internal_Templateparser::TP_TEXT;
-        } else {
-            $this->token = Smarty_Internal_Templateparser::TP_LDELFOREACH;
-            $this->yypushstate(self::SMARTY);
-            $this->taglineno = $this->line;
-        }
-    }
-
-    function yy_r2_77($yy_subpatterns)
-    {
-
-        if ($this->smarty->auto_literal && isset($this->value[$this->ldel_length]) ? strpos(" \n\t\r", $this->value[$this->ldel_length]) !== false : false) {
-            $this->token = Smarty_Internal_Templateparser::TP_TEXT;
-        } else {
-            $this->token = Smarty_Internal_Templateparser::TP_LDELSLASH;
-            $this->yypushstate(self::SMARTY);
-            $this->taglineno = $this->line;
-        }
-    }
-
-    function yy_r2_78($yy_subpatterns)
-    {
-
-        if ($this->smarty->auto_literal && isset($this->value[$this->ldel_length]) ? strpos(" \n\t\r", $this->value[$this->ldel_length]) !== false : false) {
-            $this->token = Smarty_Internal_Templateparser::TP_TEXT;
-        } else {
-            $this->token = Smarty_Internal_Templateparser::TP_LDEL;
-            $this->yypushstate(self::SMARTY);
-            $this->taglineno = $this->line;
-        }
-    }
-
-    function yy_r2_79($yy_subpatterns)
+    function yy_r3_65()
     {
 
         $this->token = Smarty_Internal_Templateparser::TP_TEXT;
     }
 
-    public function yylex3()
+    public function yylex4()
     {
-        $tokenMap = array(
-            1 => 0,
-            2 => 0,
-            3 => 0,
-        );
+        if (!isset($this->yy_global_pattern4)) {
+            $this->yy_global_pattern4 = "/\G(" . $this->ldel . "\\s*literal\\s*" . $this->rdel . ")|\G(" . $this->ldel . "\\s*[\/]literal\\s*" . $this->rdel . ")|\G([\S\s])/isS";
+        }
         if ($this->counter >= strlen($this->data)) {
             return false; // end of input
         }
-        $yy_global_pattern = "/\G(" . $this->ldel . "\\s*literal\\s*" . $this->rdel . ")|\G(" . $this->ldel . "\\s*\/literal\\s*" . $this->rdel . ")|\G([\S\s])/iS";
 
         do {
-            if (preg_match($yy_global_pattern, $this->data, $yymatches, null, $this->counter)) {
+            if (preg_match($this->yy_global_pattern4, $this->data, $yymatches, null, $this->counter)) {
                 $yysubmatches = $yymatches;
                 $yymatches = preg_grep("/(.|\s)+/", $yysubmatches);
-                if (!count($yymatches)) {
-                    throw new Exception('Error: lexing failed because a rule matched' .
-                                        ' an empty string.  Input "' . substr($this->data,
-                                                                              $this->counter, 5) . '... state LITERAL');
+                if (empty($yymatches)) {
+                    throw new Exception('Error: lexing failed because a rule matched' . ' an empty string.  Input "' . substr($this->data, $this->counter, 5) . '... state LITERAL');
                 }
                 next($yymatches); // skip global match
                 $this->token = key($yymatches); // token number
-                if ($tokenMap[$this->token]) {
-                    // extract sub-patterns for passing to lex function
-                    $yysubmatches = array_slice($yysubmatches, $this->token + 1,
-                                                $tokenMap[$this->token]);
-                } else {
-                    $yysubmatches = array();
-                }
                 $this->value = current($yymatches); // token value
-                $r = $this->{'yy_r3_' . $this->token}($yysubmatches);
+                $r = $this->{'yy_r4_' . $this->token}();
                 if ($r === null) {
                     $this->counter += strlen($this->value);
                     $this->line += substr_count($this->value, "\n");
@@ -1120,23 +868,22 @@ class Smarty_Internal_Templatelexer
                     continue;
                 }
             } else {
-                throw new Exception('Unexpected input at line' . $this->line .
-                                    ': ' . $this->data[$this->counter]);
+                throw new Exception('Unexpected input at line' . $this->line . ': ' . $this->data[$this->counter]);
             }
             break;
         } while (true);
     } // end function
 
-    const LITERAL = 3;
+    const LITERAL = 4;
 
-    function yy_r3_1($yy_subpatterns)
+    function yy_r4_1()
     {
 
         $this->literal_cnt ++;
         $this->token = Smarty_Internal_Templateparser::TP_LITERAL;
     }
 
-    function yy_r3_2($yy_subpatterns)
+    function yy_r4_2()
     {
 
         if ($this->literal_cnt) {
@@ -1148,11 +895,11 @@ class Smarty_Internal_Templatelexer
         }
     }
 
-    function yy_r3_3($yy_subpatterns)
+    function yy_r4_3()
     {
 
         $to = strlen($this->data);
-        preg_match("/{$this->ldel}\/?literal{$this->rdel}/", $this->data, $match, PREG_OFFSET_CAPTURE, $this->counter);
+        preg_match("~{$this->ldel}[/]?literal{$this->rdel}~i", $this->data, $match, PREG_OFFSET_CAPTURE, $this->counter);
         if (isset($match[0][1])) {
             $to = $match[0][1];
         } else {
@@ -1162,48 +909,26 @@ class Smarty_Internal_Templatelexer
         $this->token = Smarty_Internal_Templateparser::TP_LITERAL;
     }
 
-    public function yylex4()
+    public function yylex5()
     {
-        $tokenMap = array(
-            1  => 1,
-            3  => 0,
-            4  => 0,
-            5  => 0,
-            6  => 0,
-            7  => 0,
-            8  => 0,
-            9  => 0,
-            10 => 0,
-            11 => 0,
-            12 => 0,
-            13 => 3,
-            17 => 0,
-        );
+        if (!isset($this->yy_global_pattern5)) {
+            $this->yy_global_pattern5 = "/\G(" . $this->ldel . "\\s*literal\\s*" . $this->rdel . ")|\G(" . $this->ldel . "\\s*[\/]literal\\s*" . $this->rdel . ")|\G(" . $this->ldel . "\\s*[\/])|\G(" . $this->ldel . "\\s*[0-9]*[a-zA-Z_]\\w*)|\G(" . $this->ldel . "\\s*)|\G([\"])|\G([`][$])|\G([$][0-9]*[a-zA-Z_]\\w*)|\G([$])|\G(([^\"\\\\]*?)((?:\\\\.[^\"\\\\]*?)*?)(?=(" . $this->ldel . "|\\$|`\\$|\")))|\G([\S\s])/isS";
+        }
         if ($this->counter >= strlen($this->data)) {
             return false; // end of input
         }
-        $yy_global_pattern = "/\G(" . $this->ldel . "\\s*(if|elseif|else if|while)\\s+)|\G(" . $this->ldel . "\\s*for\\s+)|\G(" . $this->ldel . "\\s*foreach(?![^\s]))|\G(" . $this->ldel . "\\s*literal\\s*" . $this->rdel . ")|\G(" . $this->ldel . "\\s*\/literal\\s*" . $this->rdel . ")|\G(" . $this->ldel . "\\s*\/)|\G(" . $this->ldel . "\\s*)|\G(\")|\G(`\\$)|\G(\\$[0-9]*[a-zA-Z_]\\w*)|\G(\\$)|\G(([^\"\\\\]*?)((?:\\\\.[^\"\\\\]*?)*?)(?=(" . $this->ldel . "|\\$|`\\$|\")))|\G([\S\s])/iS";
 
         do {
-            if (preg_match($yy_global_pattern, $this->data, $yymatches, null, $this->counter)) {
+            if (preg_match($this->yy_global_pattern5, $this->data, $yymatches, null, $this->counter)) {
                 $yysubmatches = $yymatches;
                 $yymatches = preg_grep("/(.|\s)+/", $yysubmatches);
-                if (!count($yymatches)) {
-                    throw new Exception('Error: lexing failed because a rule matched' .
-                                        ' an empty string.  Input "' . substr($this->data,
-                                                                              $this->counter, 5) . '... state DOUBLEQUOTEDSTRING');
+                if (empty($yymatches)) {
+                    throw new Exception('Error: lexing failed because a rule matched' . ' an empty string.  Input "' . substr($this->data, $this->counter, 5) . '... state DOUBLEQUOTEDSTRING');
                 }
                 next($yymatches); // skip global match
                 $this->token = key($yymatches); // token number
-                if ($tokenMap[$this->token]) {
-                    // extract sub-patterns for passing to lex function
-                    $yysubmatches = array_slice($yysubmatches, $this->token + 1,
-                                                $tokenMap[$this->token]);
-                } else {
-                    $yysubmatches = array();
-                }
                 $this->value = current($yymatches); // token value
-                $r = $this->{'yy_r4_' . $this->token}($yysubmatches);
+                $r = $this->{'yy_r5_' . $this->token}();
                 if ($r === null) {
                     $this->counter += strlen($this->value);
                     $this->line += substr_count($this->value, "\n");
@@ -1223,122 +948,95 @@ class Smarty_Internal_Templatelexer
                     continue;
                 }
             } else {
-                throw new Exception('Unexpected input at line' . $this->line .
-                                    ': ' . $this->data[$this->counter]);
+                throw new Exception('Unexpected input at line' . $this->line . ': ' . $this->data[$this->counter]);
             }
             break;
         } while (true);
     } // end function
 
-    const DOUBLEQUOTEDSTRING = 4;
+    const DOUBLEQUOTEDSTRING = 5;
 
-    function yy_r4_1($yy_subpatterns)
-    {
-
-        if ($this->smarty->auto_literal && isset($this->value[$this->ldel_length]) ? strpos(" \n\t\r", $this->value[$this->ldel_length]) !== false : false) {
-            $this->token = Smarty_Internal_Templateparser::TP_TEXT;
-        } else {
-            $this->token = Smarty_Internal_Templateparser::TP_LDELIF;
-            $this->yypushstate(self::SMARTY);
-            $this->taglineno = $this->line;
-        }
-    }
-
-    function yy_r4_3($yy_subpatterns)
-    {
-
-        if ($this->smarty->auto_literal && isset($this->value[$this->ldel_length]) ? strpos(" \n\t\r", $this->value[$this->ldel_length]) !== false : false) {
-            $this->token = Smarty_Internal_Templateparser::TP_TEXT;
-        } else {
-            $this->token = Smarty_Internal_Templateparser::TP_LDELFOR;
-            $this->yypushstate(self::SMARTY);
-            $this->taglineno = $this->line;
-        }
-    }
-
-    function yy_r4_4($yy_subpatterns)
-    {
-
-        if ($this->smarty->auto_literal && isset($this->value[$this->ldel_length]) ? strpos(" \n\t\r", $this->value[$this->ldel_length]) !== false : false) {
-            $this->token = Smarty_Internal_Templateparser::TP_TEXT;
-        } else {
-            $this->token = Smarty_Internal_Templateparser::TP_LDELFOREACH;
-            $this->yypushstate(self::SMARTY);
-            $this->taglineno = $this->line;
-        }
-    }
-
-    function yy_r4_5($yy_subpatterns)
+    function yy_r5_1()
     {
 
         $this->token = Smarty_Internal_Templateparser::TP_TEXT;
     }
 
-    function yy_r4_6($yy_subpatterns)
+    function yy_r5_2()
     {
 
         $this->token = Smarty_Internal_Templateparser::TP_TEXT;
     }
 
-    function yy_r4_7($yy_subpatterns)
+    function yy_r5_3()
     {
 
         if ($this->smarty->auto_literal && isset($this->value[$this->ldel_length]) ? strpos(" \n\t\r", $this->value[$this->ldel_length]) !== false : false) {
             $this->token = Smarty_Internal_Templateparser::TP_TEXT;
         } else {
-            $this->token = Smarty_Internal_Templateparser::TP_LDELSLASH;
-            $this->yypushstate(self::SMARTY);
-            $this->taglineno = $this->line;
+            $this->yypushstate(self::TAG);
+            return true;
         }
     }
 
-    function yy_r4_8($yy_subpatterns)
+    function yy_r5_4()
+    {
+
+        if ($this->smarty->auto_literal && isset($this->value[$this->ldel_length]) ? strpos(" \n\t\r", $this->value[$this->ldel_length]) !== false : false) {
+            $this->token = Smarty_Internal_Templateparser::TP_TEXT;
+        } else {
+            $this->yypushstate(self::TAG);
+            return true;
+        }
+    }
+
+    function yy_r5_5()
     {
 
         if ($this->smarty->auto_literal && isset($this->value[$this->ldel_length]) ? strpos(" \n\t\r", $this->value[$this->ldel_length]) !== false : false) {
             $this->token = Smarty_Internal_Templateparser::TP_TEXT;
         } else {
             $this->token = Smarty_Internal_Templateparser::TP_LDEL;
-            $this->yypushstate(self::SMARTY);
             $this->taglineno = $this->line;
+            $this->yypushstate(self::TAGBODY);
         }
     }
 
-    function yy_r4_9($yy_subpatterns)
+    function yy_r5_6()
     {
 
         $this->token = Smarty_Internal_Templateparser::TP_QUOTE;
         $this->yypopstate();
     }
 
-    function yy_r4_10($yy_subpatterns)
+    function yy_r5_7()
     {
 
         $this->token = Smarty_Internal_Templateparser::TP_BACKTICK;
         $this->value = substr($this->value, 0, - 1);
-        $this->yypushstate(self::SMARTY);
+        $this->yypushstate(self::TAGBODY);
         $this->taglineno = $this->line;
     }
 
-    function yy_r4_11($yy_subpatterns)
+    function yy_r5_8()
     {
 
         $this->token = Smarty_Internal_Templateparser::TP_DOLLARID;
     }
 
-    function yy_r4_12($yy_subpatterns)
+    function yy_r5_9()
     {
 
         $this->token = Smarty_Internal_Templateparser::TP_TEXT;
     }
 
-    function yy_r4_13($yy_subpatterns)
+    function yy_r5_10()
     {
 
         $this->token = Smarty_Internal_Templateparser::TP_TEXT;
     }
 
-    function yy_r4_17($yy_subpatterns)
+    function yy_r5_14()
     {
 
         $to = strlen($this->data);
@@ -1346,39 +1044,26 @@ class Smarty_Internal_Templatelexer
         $this->token = Smarty_Internal_Templateparser::TP_TEXT;
     }
 
-    public function yylex5()
+    public function yylex6()
     {
-        $tokenMap = array(
-            1 => 0,
-            2 => 0,
-            3 => 0,
-            4 => 0,
-        );
+        if (!isset($this->yy_global_pattern6)) {
+            $this->yy_global_pattern6 = "/\G(" . $this->ldel . "\\s*strip\\s*" . $this->rdel . ")|\G(" . $this->ldel . "\\s*[\/]strip\\s*" . $this->rdel . ")|\G(" . $this->ldel . "\\s*block)|\G([\S\s])/isS";
+        }
         if ($this->counter >= strlen($this->data)) {
             return false; // end of input
         }
-        $yy_global_pattern = "/\G(" . $this->ldel . "\\s*strip\\s*" . $this->rdel . ")|\G(" . $this->ldel . "\\s*\/strip\\s*" . $this->rdel . ")|\G(" . $this->ldel . "\\s*block)|\G([\S\s])/iS";
 
         do {
-            if (preg_match($yy_global_pattern, $this->data, $yymatches, null, $this->counter)) {
+            if (preg_match($this->yy_global_pattern6, $this->data, $yymatches, null, $this->counter)) {
                 $yysubmatches = $yymatches;
                 $yymatches = preg_grep("/(.|\s)+/", $yysubmatches);
-                if (!count($yymatches)) {
-                    throw new Exception('Error: lexing failed because a rule matched' .
-                                        ' an empty string.  Input "' . substr($this->data,
-                                                                              $this->counter, 5) . '... state CHILDBODY');
+                if (empty($yymatches)) {
+                    throw new Exception('Error: lexing failed because a rule matched' . ' an empty string.  Input "' . substr($this->data, $this->counter, 5) . '... state CHILDBODY');
                 }
                 next($yymatches); // skip global match
                 $this->token = key($yymatches); // token number
-                if ($tokenMap[$this->token]) {
-                    // extract sub-patterns for passing to lex function
-                    $yysubmatches = array_slice($yysubmatches, $this->token + 1,
-                                                $tokenMap[$this->token]);
-                } else {
-                    $yysubmatches = array();
-                }
                 $this->value = current($yymatches); // token value
-                $r = $this->{'yy_r5_' . $this->token}($yysubmatches);
+                $r = $this->{'yy_r6_' . $this->token}();
                 if ($r === null) {
                     $this->counter += strlen($this->value);
                     $this->line += substr_count($this->value, "\n");
@@ -1398,16 +1083,15 @@ class Smarty_Internal_Templatelexer
                     continue;
                 }
             } else {
-                throw new Exception('Unexpected input at line' . $this->line .
-                                    ': ' . $this->data[$this->counter]);
+                throw new Exception('Unexpected input at line' . $this->line . ': ' . $this->data[$this->counter]);
             }
             break;
         } while (true);
     } // end function
 
-    const CHILDBODY = 5;
+    const CHILDBODY = 6;
 
-    function yy_r5_1($yy_subpatterns)
+    function yy_r6_1()
     {
 
         if ($this->smarty->auto_literal && isset($this->value[$this->ldel_length]) ? strpos(" \n\t\r", $this->value[$this->ldel_length]) !== false : false) {
@@ -1417,7 +1101,7 @@ class Smarty_Internal_Templatelexer
         }
     }
 
-    function yy_r5_2($yy_subpatterns)
+    function yy_r6_2()
     {
 
         if ($this->smarty->auto_literal && isset($this->value[$this->ldel_length]) ? strpos(" \n\t\r", $this->value[$this->ldel_length]) !== false : false) {
@@ -1427,7 +1111,7 @@ class Smarty_Internal_Templatelexer
         }
     }
 
-    function yy_r5_3($yy_subpatterns)
+    function yy_r6_3()
     {
 
         if ($this->smarty->auto_literal && isset($this->value[$this->ldel_length]) ? strpos(" \n\t\r", $this->value[$this->ldel_length]) !== false : false) {
@@ -1438,11 +1122,11 @@ class Smarty_Internal_Templatelexer
         }
     }
 
-    function yy_r5_4($yy_subpatterns)
+    function yy_r6_4()
     {
 
         $to = strlen($this->data);
-        preg_match("/" . $this->ldel . "\s*((\/)?strip\s*" . $this->rdel . "|block\s+)/", $this->data, $match, PREG_OFFSET_CAPTURE, $this->counter);
+        preg_match("~" . $this->ldel . "\s*(([/])?strip\s*" . $this->rdel . "|block\s+)~i", $this->data, $match, PREG_OFFSET_CAPTURE, $this->counter);
         if (isset($match[0][1])) {
             $to = $match[0][1];
         }
@@ -1450,40 +1134,26 @@ class Smarty_Internal_Templatelexer
         return false;
     }
 
-    public function yylex6()
+    public function yylex7()
     {
-        $tokenMap = array(
-            1 => 0,
-            2 => 0,
-            3 => 0,
-            4 => 1,
-            6 => 0,
-        );
+        if (!isset($this->yy_global_pattern7)) {
+            $this->yy_global_pattern7 = "/\G(" . $this->ldel . "\\s*literal\\s*" . $this->rdel . ")|\G(" . $this->ldel . "\\s*block)|\G(" . $this->ldel . "\\s*[\/]block)|\G(" . $this->ldel . "\\s*[$]smarty\\.block\\.(child|parent))|\G([\S\s])/isS";
+        }
         if ($this->counter >= strlen($this->data)) {
             return false; // end of input
         }
-        $yy_global_pattern = "/\G(" . $this->ldel . "\\s*literal\\s*" . $this->rdel . ")|\G(" . $this->ldel . "\\s*block)|\G(" . $this->ldel . "\\s*\/block)|\G(" . $this->ldel . "\\s*[$]smarty\\.block\\.(child|parent))|\G([\S\s])/iS";
 
         do {
-            if (preg_match($yy_global_pattern, $this->data, $yymatches, null, $this->counter)) {
+            if (preg_match($this->yy_global_pattern7, $this->data, $yymatches, null, $this->counter)) {
                 $yysubmatches = $yymatches;
                 $yymatches = preg_grep("/(.|\s)+/", $yysubmatches);
-                if (!count($yymatches)) {
-                    throw new Exception('Error: lexing failed because a rule matched' .
-                                        ' an empty string.  Input "' . substr($this->data,
-                                                                              $this->counter, 5) . '... state CHILDBLOCK');
+                if (empty($yymatches)) {
+                    throw new Exception('Error: lexing failed because a rule matched' . ' an empty string.  Input "' . substr($this->data, $this->counter, 5) . '... state CHILDBLOCK');
                 }
                 next($yymatches); // skip global match
                 $this->token = key($yymatches); // token number
-                if ($tokenMap[$this->token]) {
-                    // extract sub-patterns for passing to lex function
-                    $yysubmatches = array_slice($yysubmatches, $this->token + 1,
-                                                $tokenMap[$this->token]);
-                } else {
-                    $yysubmatches = array();
-                }
                 $this->value = current($yymatches); // token value
-                $r = $this->{'yy_r6_' . $this->token}($yysubmatches);
+                $r = $this->{'yy_r7_' . $this->token}();
                 if ($r === null) {
                     $this->counter += strlen($this->value);
                     $this->line += substr_count($this->value, "\n");
@@ -1503,16 +1173,15 @@ class Smarty_Internal_Templatelexer
                     continue;
                 }
             } else {
-                throw new Exception('Unexpected input at line' . $this->line .
-                                    ': ' . $this->data[$this->counter]);
+                throw new Exception('Unexpected input at line' . $this->line . ': ' . $this->data[$this->counter]);
             }
             break;
         } while (true);
     } // end function
 
-    const CHILDBLOCK = 6;
+    const CHILDBLOCK = 7;
 
-    function yy_r6_1($yy_subpatterns)
+    function yy_r7_1()
     {
 
         if ($this->smarty->auto_literal && isset($this->value[$this->ldel_length]) ? strpos(" \n\t\r", $this->value[$this->ldel_length]) !== false : false) {
@@ -1523,7 +1192,7 @@ class Smarty_Internal_Templatelexer
         }
     }
 
-    function yy_r6_2($yy_subpatterns)
+    function yy_r7_2()
     {
 
         if ($this->smarty->auto_literal && isset($this->value[$this->ldel_length]) ? strpos(" \n\t\r", $this->value[$this->ldel_length]) !== false : false) {
@@ -1534,7 +1203,7 @@ class Smarty_Internal_Templatelexer
         }
     }
 
-    function yy_r6_3($yy_subpatterns)
+    function yy_r7_3()
     {
 
         if ($this->smarty->auto_literal && isset($this->value[$this->ldel_length]) ? strpos(" \n\t\r", $this->value[$this->ldel_length]) !== false : false) {
@@ -1545,7 +1214,7 @@ class Smarty_Internal_Templatelexer
         }
     }
 
-    function yy_r6_4($yy_subpatterns)
+    function yy_r7_4()
     {
 
         if ($this->smarty->auto_literal && isset($this->value[$this->ldel_length]) ? strpos(" \n\t\r", $this->value[$this->ldel_length]) !== false : false) {
@@ -1556,11 +1225,11 @@ class Smarty_Internal_Templatelexer
         }
     }
 
-    function yy_r6_6($yy_subpatterns)
+    function yy_r7_6()
     {
 
         $to = strlen($this->data);
-        preg_match("/" . $this->ldel . "\s*(literal\s*" . $this->rdel . "|(\/)?block(\s|" . $this->rdel . ")|[\$]smarty\.block\.(child|parent))/", $this->data, $match, PREG_OFFSET_CAPTURE, $this->counter);
+        preg_match("~" . $this->ldel . "\s*(literal\s*" . $this->rdel . "|([/])?block(\s|" . $this->rdel . ")|[\$]smarty\.block\.(child|parent))~i", $this->data, $match, PREG_OFFSET_CAPTURE, $this->counter);
         if (isset($match[0][1])) {
             $to = $match[0][1];
         }
@@ -1568,38 +1237,26 @@ class Smarty_Internal_Templatelexer
         $this->token = Smarty_Internal_Templateparser::TP_BLOCKSOURCE;
     }
 
-    public function yylex7()
+    public function yylex8()
     {
-        $tokenMap = array(
-            1 => 0,
-            2 => 0,
-            3 => 0,
-        );
+        if (!isset($this->yy_global_pattern8)) {
+            $this->yy_global_pattern8 = "/\G(" . $this->ldel . "\\s*literal\\s*" . $this->rdel . ")|\G(" . $this->ldel . "\\s*[\/]literal\\s*" . $this->rdel . ")|\G([\S\s])/isS";
+        }
         if ($this->counter >= strlen($this->data)) {
             return false; // end of input
         }
-        $yy_global_pattern = "/\G(" . $this->ldel . "\\s*literal\\s*" . $this->rdel . ")|\G(" . $this->ldel . "\\s*\/literal\\s*" . $this->rdel . ")|\G([\S\s])/iS";
 
         do {
-            if (preg_match($yy_global_pattern, $this->data, $yymatches, null, $this->counter)) {
+            if (preg_match($this->yy_global_pattern8, $this->data, $yymatches, null, $this->counter)) {
                 $yysubmatches = $yymatches;
                 $yymatches = preg_grep("/(.|\s)+/", $yysubmatches);
-                if (!count($yymatches)) {
-                    throw new Exception('Error: lexing failed because a rule matched' .
-                                        ' an empty string.  Input "' . substr($this->data,
-                                                                              $this->counter, 5) . '... state CHILDLITERAL');
+                if (empty($yymatches)) {
+                    throw new Exception('Error: lexing failed because a rule matched' . ' an empty string.  Input "' . substr($this->data, $this->counter, 5) . '... state CHILDLITERAL');
                 }
                 next($yymatches); // skip global match
                 $this->token = key($yymatches); // token number
-                if ($tokenMap[$this->token]) {
-                    // extract sub-patterns for passing to lex function
-                    $yysubmatches = array_slice($yysubmatches, $this->token + 1,
-                                                $tokenMap[$this->token]);
-                } else {
-                    $yysubmatches = array();
-                }
                 $this->value = current($yymatches); // token value
-                $r = $this->{'yy_r7_' . $this->token}($yysubmatches);
+                $r = $this->{'yy_r8_' . $this->token}();
                 if ($r === null) {
                     $this->counter += strlen($this->value);
                     $this->line += substr_count($this->value, "\n");
@@ -1619,16 +1276,15 @@ class Smarty_Internal_Templatelexer
                     continue;
                 }
             } else {
-                throw new Exception('Unexpected input at line' . $this->line .
-                                    ': ' . $this->data[$this->counter]);
+                throw new Exception('Unexpected input at line' . $this->line . ': ' . $this->data[$this->counter]);
             }
             break;
         } while (true);
     } // end function
 
-    const CHILDLITERAL = 7;
+    const CHILDLITERAL = 8;
 
-    function yy_r7_1($yy_subpatterns)
+    function yy_r8_1()
     {
 
         if ($this->smarty->auto_literal && isset($this->value[$this->ldel_length]) ? strpos(" \n\t\r", $this->value[$this->ldel_length]) !== false : false) {
@@ -1639,7 +1295,7 @@ class Smarty_Internal_Templatelexer
         }
     }
 
-    function yy_r7_2($yy_subpatterns)
+    function yy_r8_2()
     {
 
         if ($this->smarty->auto_literal && isset($this->value[$this->ldel_length]) ? strpos(" \n\t\r", $this->value[$this->ldel_length]) !== false : false) {
@@ -1650,11 +1306,11 @@ class Smarty_Internal_Templatelexer
         }
     }
 
-    function yy_r7_3($yy_subpatterns)
+    function yy_r8_3()
     {
 
         $to = strlen($this->data);
-        preg_match("/{$this->ldel}\/?literal\s*{$this->rdel}/", $this->data, $match, PREG_OFFSET_CAPTURE, $this->counter);
+        preg_match("~{$this->ldel}[/]?literal\s*{$this->rdel}~i", $this->data, $match, PREG_OFFSET_CAPTURE, $this->counter);
         if (isset($match[0][1])) {
             $to = $match[0][1];
         } else {
diff --git a/libs/smarty/sysplugins/smarty_internal_templateparser.php b/libs/smarty/sysplugins/smarty_internal_templateparser.php
index 5b0a75159..b09c53c41 100644
--- a/libs/smarty/sysplugins/smarty_internal_templateparser.php
+++ b/libs/smarty/sysplugins/smarty_internal_templateparser.php
@@ -1,7 +1,10 @@
 <?php
+
 class TP_yyToken implements ArrayAccess
 {
+
     public $string = '';
+
     public $metadata = array();
 
     public function __construct($s, $m = array())
@@ -38,8 +41,7 @@ class TP_yyToken implements ArrayAccess
     {
         if ($offset === null) {
             if (isset($value[0])) {
-                $x = ($value instanceof TP_yyToken) ?
-                    $value->metadata : $value;
+                $x = ($value instanceof TP_yyToken) ? $value->metadata : $value;
                 $this->metadata = array_merge($this->metadata, $x);
 
                 return;
@@ -66,12 +68,14 @@ class TP_yyToken implements ArrayAccess
 
 class TP_yyStackEntry
 {
+
     public $stateno;       /* The state-number */
     public $major;         /* The major token value.  This is the code
                      ** number for the token at this stack level */
     public $minor; /* The user-supplied minor token value.  This
                      ** is the value of the token  */
 }
+
 ;
 
 #line 13 "../smarty/lexer/smarty_internal_templateparser.y"
@@ -88,10 +92,13 @@ class TP_yyStackEntry
  */
 class Smarty_Internal_Templateparser
 {
+
     #line 26 "../smarty/lexer/smarty_internal_templateparser.y"
 
     const Err1 = "Security error: Call to private object member not allowed";
+
     const Err2 = "Security error: Call to dynamic object member not allowed";
+
     const Err3 = "PHP in template not allowed. Use SmartyBC to enable it";
 
     /**
@@ -100,112 +107,109 @@ class Smarty_Internal_Templateparser
      * @var bool
      */
     public $successful = true;
+
     /**
      * return value
      *
      * @var mixed
      */
     public $retvalue = 0;
+
     /**
      * counter for prefix code
      *
      * @var int
      */
     public static $prefix_number = 0;
+
     /**
      * @var
      */
     public $yymajor;
+
     /**
      * last index of array variable
      *
      * @var mixed
      */
     public $last_index;
+
     /**
      * last variable name
      *
      * @var string
      */
     public $last_variable;
+
     /**
      * root parse tree buffer
      *
      * @var Smarty_Internal_ParseTree
      */
     public $root_buffer;
+
     /**
      * current parse tree object
      *
      * @var Smarty_Internal_ParseTree
      */
     public $current_buffer;
+
     /**
      * lexer object
      *
      * @var Smarty_Internal_Templatelexer
      */
     private $lex;
+
     /**
      * internal error flag
      *
      * @var bool
      */
     private $internalError = false;
+
     /**
      * {strip} status
      *
      * @var bool
      */
     public $strip = false;
+
     /**
      * compiler object
      *
      * @var Smarty_Internal_TemplateCompilerBase
      */
     public $compiler = null;
+
     /**
      * smarty object
      *
      * @var Smarty
      */
     public $smarty = null;
+
     /**
      * template object
      *
      * @var Smarty_Internal_Template
      */
     public $template = null;
+
     /**
      * block nesting level
      *
      * @var int
      */
     public $block_nesting_level = 0;
-    /**
-     * xml tag flag
-     *
-     * @var bool
-     */
-    private $is_xml = false;
+
     /**
      * security object
      *
      * @var Smarty_Security
      */
     private $security = null;
-    /**
-     * asp enabled
-     *
-     * @var bool
-     */
-    private $asp_tags = false;
-    /**
-     * PHP tag handling mode
-     *
-     * @var int
-     */
-    private $php_handling = 0;
 
     /**
      * constructor
@@ -219,14 +223,7 @@ class Smarty_Internal_Templateparser
         $this->compiler = $compiler;
         $this->template = $this->compiler->template;
         $this->smarty = $this->template->smarty;
-        $this->compiler->has_variable_string = false;
-        $this->compiler->prefix_code = array();
-        if ($this->security = isset($this->smarty->security_policy)) {
-            $this->php_handling = $this->smarty->security_policy->php_handling;
-        } else {
-            $this->php_handling = $this->smarty->php_handling;
-        }
-        $this->asp_tags = (ini_get('asp_tags') != '0');
+        $this->security = isset($this->smarty->security_policy) ? $this->smarty->security_policy : false;
         $this->current_buffer = $this->root_buffer = new Smarty_Internal_ParseTree_Template($this);
     }
 
@@ -240,1062 +237,488 @@ class Smarty_Internal_Templateparser
         $this->current_buffer->append_subtree(new Smarty_Internal_ParseTree_Tag($this, $code));
     }
 
-    const TP_VERT = 1;
-    const TP_COLON = 2;
-    const TP_RDEL = 3;
-    const TP_COMMENT = 4;
-    const TP_PHPSTARTTAG = 5;
-    const TP_PHPENDTAG = 6;
-    const TP_PHPENDSCRIPT = 7;
-    const TP_ASPSTARTTAG = 8;
-    const TP_ASPENDTAG = 9;
-    const TP_XMLTAG = 10;
-    const TP_TEXT = 11;
-    const TP_STRIPON = 12;
-    const TP_STRIPOFF = 13;
-    const TP_BLOCKSOURCE = 14;
-    const TP_LITERALSTART = 15;
-    const TP_LITERALEND = 16;
-    const TP_LITERAL = 17;
-    const TP_LDEL = 18;
-    const TP_DOLLAR = 19;
-    const TP_ID = 20;
-    const TP_EQUAL = 21;
-    const TP_PTR = 22;
-    const TP_LDELIF = 23;
-    const TP_LDELFOR = 24;
-    const TP_SEMICOLON = 25;
-    const TP_INCDEC = 26;
-    const TP_TO = 27;
-    const TP_STEP = 28;
-    const TP_LDELFOREACH = 29;
-    const TP_SPACE = 30;
-    const TP_AS = 31;
-    const TP_APTR = 32;
-    const TP_LDELSETFILTER = 33;
-    const TP_SMARTYBLOCKCHILDPARENT = 34;
-    const TP_LDELSLASH = 35;
-    const TP_ATTR = 36;
-    const TP_INTEGER = 37;
-    const TP_COMMA = 38;
-    const TP_OPENP = 39;
-    const TP_CLOSEP = 40;
-    const TP_MATH = 41;
-    const TP_UNIMATH = 42;
-    const TP_ANDSYM = 43;
-    const TP_ISIN = 44;
-    const TP_ISDIVBY = 45;
-    const TP_ISNOTDIVBY = 46;
-    const TP_ISEVEN = 47;
-    const TP_ISNOTEVEN = 48;
-    const TP_ISEVENBY = 49;
-    const TP_ISNOTEVENBY = 50;
-    const TP_ISODD = 51;
-    const TP_ISNOTODD = 52;
-    const TP_ISODDBY = 53;
-    const TP_ISNOTODDBY = 54;
-    const TP_INSTANCEOF = 55;
-    const TP_QMARK = 56;
-    const TP_NOT = 57;
-    const TP_TYPECAST = 58;
-    const TP_HEX = 59;
-    const TP_DOT = 60;
-    const TP_SINGLEQUOTESTRING = 61;
-    const TP_DOUBLECOLON = 62;
-    const TP_NAMESPACE = 63;
-    const TP_AT = 64;
-    const TP_HATCH = 65;
-    const TP_OPENB = 66;
-    const TP_CLOSEB = 67;
-    const TP_EQUALS = 68;
-    const TP_NOTEQUALS = 69;
-    const TP_GREATERTHAN = 70;
-    const TP_LESSTHAN = 71;
-    const TP_GREATEREQUAL = 72;
-    const TP_LESSEQUAL = 73;
-    const TP_IDENTITY = 74;
-    const TP_NONEIDENTITY = 75;
-    const TP_MOD = 76;
-    const TP_LAND = 77;
-    const TP_LOR = 78;
-    const TP_LXOR = 79;
-    const TP_QUOTE = 80;
-    const TP_BACKTICK = 81;
-    const TP_DOLLARID = 82;
-    const YY_NO_ACTION = 572;
-    const YY_ACCEPT_ACTION = 571;
-    const YY_ERROR_ACTION = 570;
+    /**
+     *  merge PHP code with prefix code and return parse tree tag object
+     *
+     * @param string $code
+     *
+     * @return Smarty_Internal_ParseTree_Tag
+     */
+    public function mergePrefixCode($code)
+    {
+        $tmp = '';
+        foreach ($this->compiler->prefix_code as $preCode) {
+            $tmp = empty($tmp) ? $preCode : $this->compiler->appendCode($tmp, $preCode);
+        }
+        $this->compiler->prefix_code = array();
+        $tmp = empty($tmp) ? $code : $this->compiler->appendCode($tmp, $code);
+        return new Smarty_Internal_ParseTree_Tag($this, $this->compiler->processNocacheCode($tmp, true));
+    }
+
+    const TP_VERT = 1;
+
+    const TP_COLON = 2;
+
+    const TP_PHP = 3;
+
+    const TP_TEXT = 4;
+
+    const TP_STRIPON = 5;
+
+    const TP_STRIPOFF = 6;
+
+    const TP_BLOCKSOURCE = 7;
+
+    const TP_LITERALSTART = 8;
+
+    const TP_LITERALEND = 9;
+
+    const TP_LITERAL = 10;
+
+    const TP_RDEL = 11;
+
+    const TP_SIMPELOUTPUT = 12;
+
+    const TP_LDEL = 13;
+
+    const TP_DOLLARID = 14;
+
+    const TP_EQUAL = 15;
+
+    const TP_SIMPLETAG = 16;
+
+    const TP_ID = 17;
+
+    const TP_PTR = 18;
+
+    const TP_LDELIF = 19;
+
+    const TP_LDELFOR = 20;
+
+    const TP_SEMICOLON = 21;
+
+    const TP_INCDEC = 22;
+
+    const TP_TO = 23;
+
+    const TP_STEP = 24;
+
+    const TP_LDELFOREACH = 25;
+
+    const TP_SPACE = 26;
+
+    const TP_AS = 27;
+
+    const TP_APTR = 28;
+
+    const TP_LDELSETFILTER = 29;
+
+    const TP_SMARTYBLOCKCHILDPARENT = 30;
+
+    const TP_CLOSETAG = 31;
+
+    const TP_LDELSLASH = 32;
+
+    const TP_ATTR = 33;
+
+    const TP_INTEGER = 34;
+
+    const TP_COMMA = 35;
+
+    const TP_OPENP = 36;
+
+    const TP_CLOSEP = 37;
+
+    const TP_MATH = 38;
+
+    const TP_UNIMATH = 39;
+
+    const TP_ISIN = 40;
+
+    const TP_INSTANCEOF = 41;
+
+    const TP_QMARK = 42;
+
+    const TP_NOT = 43;
+
+    const TP_TYPECAST = 44;
+
+    const TP_HEX = 45;
+
+    const TP_DOT = 46;
+
+    const TP_SINGLEQUOTESTRING = 47;
+
+    const TP_DOUBLECOLON = 48;
+
+    const TP_NAMESPACE = 49;
+
+    const TP_AT = 50;
+
+    const TP_HATCH = 51;
+
+    const TP_OPENB = 52;
+
+    const TP_CLOSEB = 53;
+
+    const TP_DOLLAR = 54;
+
+    const TP_LOGOP = 55;
+
+    const TP_TLOGOP = 56;
+
+    const TP_SINGLECOND = 57;
+
+    const TP_QUOTE = 58;
+
+    const TP_BACKTICK = 59;
+
+    const YY_NO_ACTION = 533;
+
+    const YY_ACCEPT_ACTION = 532;
+
+    const YY_ERROR_ACTION = 531;
+
+    const YY_SZ_ACTTAB = 2133;
+
+    static public $yy_action = array(292, 9, 133, 449, 280, 70, 208, 2, 84, 268, 11, 97, 155, 113, 267, 449, 366, 224,
+        303, 264, 217, 279, 231, 26, 21, 172, 274, 42, 190, 304, 17, 43, 39, 269, 223, 298, 13, 209, 194, 81, 1, 143,
+        317, 90, 148, 105, 52, 292, 9, 132, 93, 280, 200, 279, 2, 84, 35, 325, 91, 156, 113, 218, 219, 207, 224, 105,
+        264, 217, 279, 205, 194, 21, 268, 11, 42, 262, 26, 267, 43, 39, 269, 223, 233, 17, 209, 194, 81, 1, 252, 317,
+        186, 141, 101, 52, 292, 9, 134, 192, 280, 213, 279, 2, 84, 35, 325, 208, 12, 113, 235, 101, 220, 224, 3, 264,
+        217, 361, 231, 194, 21, 218, 258, 42, 110, 105, 16, 43, 39, 269, 223, 298, 26, 209, 448, 81, 1, 7, 317, 17, 332,
+        110, 52, 292, 9, 134, 448, 280, 197, 118, 2, 84, 286, 287, 288, 227, 113, 27, 229, 305, 224, 316, 264, 217, 232,
+        231, 229, 21, 136, 120, 42, 241, 329, 102, 43, 39, 269, 223, 298, 243, 209, 137, 81, 1, 260, 317, 208, 10, 186,
+        52, 292, 9, 134, 101, 280, 199, 406, 2, 84, 85, 313, 35, 325, 113, 27, 81, 248, 224, 317, 264, 217, 406, 212,
+        25, 21, 194, 101, 42, 406, 317, 461, 43, 39, 269, 223, 298, 461, 209, 263, 81, 1, 318, 317, 92, 150, 22, 52,
+        292, 9, 135, 140, 280, 213, 279, 2, 84, 110, 163, 94, 159, 113, 183, 296, 294, 224, 448, 264, 217, 279, 231,
+        194, 21, 263, 191, 42, 309, 221, 448, 43, 39, 269, 223, 298, 316, 209, 194, 81, 1, 229, 317, 317, 163, 185, 52,
+        292, 9, 131, 153, 280, 213, 194, 2, 84, 330, 268, 11, 279, 113, 24, 267, 221, 224, 30, 264, 217, 259, 231, 254,
+        5, 194, 265, 42, 302, 192, 83, 43, 39, 269, 223, 298, 158, 209, 208, 81, 1, 6, 317, 4, 157, 279, 52, 292, 9,
+        136, 154, 280, 213, 279, 2, 84, 27, 101, 247, 279, 113, 310, 192, 26, 224, 324, 264, 217, 170, 231, 17, 31, 121,
+        180, 42, 139, 192, 279, 43, 39, 269, 223, 298, 162, 209, 137, 81, 1, 179, 317, 266, 10, 279, 52, 292, 9, 134,
+        95, 280, 202, 194, 2, 84, 263, 266, 218, 222, 113, 146, 105, 266, 224, 208, 264, 217, 317, 231, 19, 21, 208, 32,
+        42, 163, 178, 17, 43, 39, 269, 223, 298, 160, 209, 279, 81, 1, 107, 317, 184, 304, 279, 52, 292, 9, 134, 266,
+        280, 213, 182, 2, 84, 230, 461, 336, 242, 113, 181, 192, 461, 224, 208, 264, 217, 145, 198, 319, 21, 189, 304,
+        42, 124, 149, 279, 43, 39, 269, 223, 298, 322, 209, 279, 81, 1, 194, 317, 121, 208, 34, 52, 292, 9, 136, 266,
+        280, 213, 138, 2, 84, 208, 37, 265, 152, 113, 236, 295, 37, 224, 297, 264, 217, 279, 231, 175, 31, 276, 261, 42,
+        249, 187, 251, 43, 39, 269, 223, 298, 193, 209, 192, 81, 477, 477, 317, 404, 275, 477, 52, 234, 114, 270, 285,
+        281, 282, 283, 289, 183, 12, 208, 404, 292, 9, 33, 331, 280, 284, 404, 2, 84, 448, 271, 250, 173, 113, 166, 98,
+        246, 224, 111, 264, 217, 448, 20, 323, 221, 6, 477, 477, 229, 214, 291, 477, 115, 69, 109, 40, 41, 38, 102, 268,
+        11, 278, 335, 168, 267, 211, 277, 299, 144, 260, 188, 263, 327, 328, 334, 293, 323, 279, 169, 206, 312, 229,
+        214, 87, 477, 115, 69, 109, 266, 266, 108, 102, 165, 208, 278, 335, 119, 226, 211, 277, 299, 88, 260, 406, 89,
+        323, 274, 86, 290, 300, 229, 214, 333, 311, 128, 59, 106, 222, 406, 151, 102, 171, 164, 278, 335, 406, 96, 211,
+        277, 299, 323, 260, 300, 186, 174, 229, 214, 268, 11, 128, 65, 109, 267, 279, 300, 102, 35, 325, 278, 335, 300,
+        26, 211, 277, 299, 300, 260, 300, 17, 323, 194, 300, 300, 216, 229, 214, 300, 300, 128, 65, 109, 300, 300, 300,
+        102, 300, 208, 278, 335, 448, 300, 211, 277, 299, 300, 260, 400, 300, 323, 240, 300, 448, 215, 229, 214, 208,
+        253, 128, 49, 106, 112, 26, 300, 102, 300, 403, 278, 335, 17, 300, 211, 277, 299, 323, 260, 300, 300, 300, 229,
+        214, 403, 300, 128, 65, 109, 300, 300, 403, 102, 300, 300, 278, 335, 300, 300, 211, 277, 299, 300, 260, 300,
+        300, 323, 300, 300, 300, 210, 229, 214, 300, 300, 128, 59, 109, 300, 300, 300, 102, 300, 300, 278, 335, 300,
+        300, 211, 277, 299, 300, 260, 300, 300, 323, 300, 300, 300, 300, 229, 214, 300, 300, 128, 64, 109, 300, 300,
+        300, 102, 300, 300, 278, 335, 300, 300, 211, 277, 299, 323, 260, 300, 300, 300, 229, 214, 300, 300, 128, 74,
+        109, 300, 36, 239, 102, 300, 176, 278, 335, 300, 300, 211, 277, 299, 300, 260, 300, 300, 323, 300, 300, 300,
+        300, 229, 78, 300, 300, 82, 44, 104, 300, 300, 300, 102, 300, 300, 278, 335, 300, 300, 211, 277, 299, 317, 260,
+        300, 300, 323, 300, 300, 300, 300, 229, 80, 300, 300, 82, 47, 104, 300, 300, 300, 102, 300, 300, 278, 335, 300,
+        300, 211, 277, 299, 323, 260, 300, 300, 300, 229, 214, 300, 300, 99, 54, 109, 300, 300, 300, 102, 300, 300, 278,
+        335, 300, 300, 211, 277, 299, 300, 260, 300, 300, 323, 300, 300, 300, 300, 229, 214, 300, 300, 128, 61, 109,
+        300, 300, 300, 102, 300, 300, 278, 335, 314, 300, 211, 277, 299, 300, 260, 300, 292, 8, 315, 300, 280, 300, 300,
+        2, 84, 300, 18, 201, 300, 113, 272, 300, 300, 224, 323, 264, 217, 300, 300, 229, 214, 300, 300, 128, 66, 109,
+        300, 273, 300, 102, 300, 300, 278, 335, 300, 300, 211, 277, 299, 323, 260, 300, 301, 23, 229, 214, 300, 317,
+        128, 72, 109, 300, 300, 300, 102, 300, 300, 278, 335, 314, 300, 211, 277, 299, 300, 260, 300, 292, 8, 315, 300,
+        280, 300, 300, 2, 84, 300, 300, 300, 300, 113, 300, 300, 300, 224, 323, 264, 217, 300, 300, 229, 214, 300, 300,
+        128, 63, 109, 300, 300, 300, 102, 300, 300, 278, 335, 300, 300, 211, 277, 299, 323, 260, 300, 300, 23, 229, 214,
+        300, 300, 128, 45, 109, 300, 300, 300, 102, 268, 11, 278, 335, 300, 267, 211, 277, 299, 300, 260, 300, 300, 323,
+        26, 300, 147, 300, 229, 204, 300, 17, 117, 53, 109, 300, 300, 300, 102, 300, 300, 278, 335, 300, 300, 211, 277,
+        299, 300, 260, 300, 300, 323, 300, 300, 300, 300, 229, 214, 300, 300, 128, 75, 109, 300, 300, 300, 102, 300,
+        300, 278, 335, 300, 300, 211, 277, 299, 323, 260, 300, 300, 300, 229, 214, 300, 300, 128, 56, 109, 300, 300,
+        300, 102, 300, 300, 278, 335, 300, 300, 211, 277, 299, 300, 260, 300, 300, 323, 300, 300, 300, 300, 229, 214,
+        300, 300, 116, 50, 109, 300, 300, 300, 102, 300, 300, 278, 335, 300, 300, 211, 277, 299, 300, 260, 300, 300,
+        323, 300, 300, 300, 300, 229, 214, 300, 300, 103, 67, 109, 300, 300, 300, 102, 300, 300, 278, 335, 300, 300,
+        211, 277, 299, 323, 260, 300, 300, 300, 229, 214, 300, 300, 128, 46, 109, 300, 300, 300, 102, 300, 300, 278,
+        335, 300, 300, 211, 277, 299, 300, 260, 300, 300, 323, 300, 300, 300, 300, 229, 214, 300, 300, 128, 76, 109,
+        300, 300, 300, 102, 300, 300, 278, 335, 300, 300, 211, 277, 299, 300, 260, 300, 300, 323, 300, 300, 300, 300,
+        229, 214, 300, 300, 128, 73, 109, 300, 300, 300, 102, 300, 300, 278, 335, 300, 300, 211, 277, 299, 323, 260,
+        300, 300, 300, 229, 214, 300, 300, 128, 77, 109, 300, 300, 300, 102, 300, 300, 278, 335, 300, 300, 211, 277,
+        299, 300, 260, 300, 300, 323, 300, 300, 300, 300, 229, 214, 300, 300, 128, 79, 109, 300, 300, 300, 102, 300,
+        300, 278, 335, 300, 300, 211, 277, 299, 300, 260, 300, 300, 323, 300, 300, 300, 300, 229, 214, 300, 300, 128,
+        58, 109, 300, 300, 300, 102, 300, 300, 278, 335, 300, 300, 211, 277, 299, 323, 260, 300, 300, 300, 229, 203,
+        300, 300, 128, 55, 109, 300, 300, 300, 102, 300, 300, 278, 335, 300, 300, 211, 277, 299, 300, 260, 300, 300,
+        323, 300, 300, 300, 300, 229, 214, 300, 300, 128, 62, 109, 300, 300, 300, 102, 300, 300, 278, 335, 300, 300,
+        211, 277, 299, 300, 260, 300, 300, 323, 300, 300, 300, 300, 229, 214, 300, 300, 128, 60, 109, 300, 300, 300,
+        102, 300, 300, 278, 335, 300, 300, 211, 277, 299, 323, 260, 300, 300, 300, 229, 214, 300, 300, 128, 71, 109,
+        300, 300, 300, 102, 300, 300, 278, 335, 300, 300, 211, 277, 299, 300, 260, 300, 300, 323, 300, 300, 300, 300,
+        229, 214, 300, 300, 128, 57, 109, 300, 300, 300, 102, 300, 300, 278, 335, 300, 300, 211, 277, 299, 300, 260,
+        300, 300, 323, 300, 300, 300, 300, 229, 214, 300, 300, 128, 48, 109, 300, 300, 300, 102, 300, 300, 278, 335,
+        300, 300, 211, 277, 299, 323, 260, 300, 300, 300, 229, 214, 300, 300, 100, 68, 109, 300, 300, 300, 102, 300,
+        300, 278, 335, 300, 410, 211, 277, 299, 300, 260, 300, 300, 323, 300, 410, 300, 410, 229, 237, 410, 300, 122,
+        300, 109, 300, 300, 410, 102, 410, 300, 410, 326, 300, 300, 211, 277, 299, 300, 260, 221, 300, 323, 300, 208,
+        300, 300, 229, 237, 416, 416, 130, 300, 109, 300, 300, 300, 102, 300, 300, 300, 255, 300, 300, 211, 277, 299,
+        29, 260, 26, 532, 51, 244, 287, 288, 227, 17, 300, 229, 225, 300, 40, 41, 38, 448, 300, 416, 416, 416, 477, 477,
+        225, 15, 300, 477, 461, 448, 300, 327, 328, 334, 477, 477, 416, 416, 416, 477, 461, 208, 300, 300, 300, 300, 40,
+        41, 38, 300, 300, 307, 300, 300, 300, 300, 461, 300, 461, 300, 477, 300, 461, 327, 328, 334, 26, 300, 461, 300,
+        461, 225, 477, 17, 461, 320, 300, 300, 40, 41, 38, 477, 477, 300, 32, 300, 477, 461, 300, 300, 300, 300, 300,
+        300, 300, 327, 328, 334, 300, 300, 300, 323, 300, 300, 300, 300, 229, 237, 300, 300, 127, 300, 109, 300, 300,
+        461, 102, 461, 300, 477, 300, 461, 300, 211, 277, 299, 300, 260, 14, 300, 300, 323, 300, 300, 300, 300, 229,
+        237, 477, 477, 126, 300, 109, 477, 461, 300, 102, 300, 300, 300, 300, 300, 300, 211, 277, 299, 300, 260, 300,
+        300, 323, 300, 300, 300, 300, 229, 237, 300, 300, 123, 300, 109, 461, 300, 461, 102, 477, 300, 461, 300, 300,
+        300, 211, 277, 299, 300, 260, 300, 323, 300, 300, 300, 300, 229, 237, 300, 300, 129, 300, 109, 300, 300, 300,
+        102, 300, 300, 300, 300, 300, 300, 211, 277, 299, 208, 260, 225, 300, 208, 323, 300, 300, 300, 300, 229, 237,
+        477, 477, 125, 300, 109, 477, 461, 300, 102, 300, 300, 300, 300, 26, 300, 211, 277, 299, 300, 260, 17, 300, 208,
+        300, 300, 40, 41, 38, 256, 40, 41, 38, 245, 208, 461, 300, 461, 300, 477, 300, 461, 300, 327, 328, 334, 208,
+        327, 328, 334, 300, 300, 300, 300, 300, 300, 257, 300, 208, 300, 40, 41, 38, 300, 300, 300, 300, 300, 195, 300,
+        228, 40, 41, 38, 300, 300, 300, 327, 328, 334, 300, 208, 300, 40, 41, 38, 208, 28, 327, 328, 334, 196, 208, 300,
+        300, 40, 41, 38, 300, 300, 327, 328, 334, 300, 300, 300, 300, 300, 300, 300, 300, 300, 327, 328, 334, 300, 300,
+        300, 40, 41, 38, 208, 300, 40, 41, 38, 208, 300, 300, 40, 41, 38, 300, 477, 477, 327, 328, 334, 477, 461, 327,
+        328, 334, 300, 321, 300, 327, 328, 334, 208, 300, 300, 167, 300, 300, 300, 300, 300, 40, 41, 38, 300, 300, 40,
+        41, 38, 300, 461, 300, 461, 300, 477, 300, 461, 300, 327, 328, 334, 300, 308, 327, 328, 334, 208, 300, 208, 40,
+        41, 38, 300, 300, 300, 300, 372, 300, 358, 300, 300, 300, 300, 238, 300, 300, 327, 328, 334, 263, 300, 26, 300,
+        26, 300, 300, 186, 177, 17, 300, 17, 448, 300, 300, 186, 161, 279, 300, 163, 35, 325, 208, 300, 448, 279, 186,
+        142, 35, 325, 300, 300, 306, 300, 194, 300, 279, 300, 300, 35, 325, 300, 194, 263, 300, 300, 300, 26, 300, 300,
+        300, 300, 300, 194, 17, 300, 300, 300, 300, 300, 300, 300, 163,);
+
+    static public $yy_lookahead = array(12, 13, 14, 36, 16, 17, 1, 19, 20, 12, 13, 71, 72, 25, 17, 48, 11, 29, 30, 31,
+        32, 81, 34, 26, 36, 28, 92, 39, 94, 95, 33, 43, 44, 45, 46, 47, 21, 49, 98, 51, 52, 75, 54, 71, 72, 79, 58, 12,
+        13, 14, 35, 16, 17, 81, 19, 20, 84, 85, 71, 72, 25, 75, 76, 77, 29, 79, 31, 32, 81, 34, 98, 36, 12, 13, 39, 17,
+        26, 17, 43, 44, 45, 46, 47, 33, 49, 98, 51, 52, 53, 54, 71, 72, 18, 58, 12, 13, 14, 98, 16, 17, 81, 19, 20, 84,
+        85, 1, 15, 25, 50, 18, 50, 29, 36, 31, 32, 11, 34, 98, 36, 75, 76, 39, 48, 79, 28, 43, 44, 45, 46, 47, 26, 49,
+        36, 51, 52, 36, 54, 33, 17, 48, 58, 12, 13, 14, 48, 16, 17, 48, 19, 20, 63, 64, 65, 66, 25, 35, 69, 37, 29, 64,
+        31, 32, 70, 34, 69, 36, 14, 75, 39, 17, 49, 79, 43, 44, 45, 46, 47, 14, 49, 46, 51, 52, 90, 54, 1, 52, 71, 58,
+        12, 13, 14, 18, 16, 17, 11, 19, 20, 102, 103, 84, 85, 25, 35, 51, 37, 29, 54, 31, 32, 26, 34, 15, 36, 98, 18,
+        39, 33, 54, 46, 43, 44, 45, 46, 47, 52, 49, 22, 51, 52, 95, 54, 71, 72, 15, 58, 12, 13, 14, 14, 16, 17, 81, 19,
+        20, 48, 41, 71, 72, 25, 8, 9, 10, 29, 36, 31, 32, 81, 34, 98, 36, 22, 71, 39, 59, 46, 48, 43, 44, 45, 46, 47,
+        64, 49, 98, 51, 52, 69, 54, 54, 41, 71, 58, 12, 13, 14, 72, 16, 17, 98, 19, 20, 53, 12, 13, 81, 25, 15, 17, 46,
+        29, 13, 31, 32, 22, 34, 53, 36, 98, 99, 39, 103, 98, 17, 43, 44, 45, 46, 47, 72, 49, 1, 51, 52, 36, 54, 35, 72,
+        81, 58, 12, 13, 14, 72, 16, 17, 81, 19, 20, 35, 18, 37, 81, 25, 53, 98, 26, 29, 89, 31, 32, 72, 34, 33, 36, 96,
+        71, 39, 14, 98, 81, 43, 44, 45, 46, 47, 72, 49, 46, 51, 52, 91, 54, 93, 52, 81, 58, 12, 13, 14, 36, 16, 17, 98,
+        19, 20, 22, 93, 75, 76, 25, 91, 79, 93, 29, 1, 31, 32, 54, 34, 26, 36, 1, 15, 39, 41, 72, 33, 43, 44, 45, 46,
+        47, 72, 49, 81, 51, 52, 79, 54, 94, 95, 81, 58, 12, 13, 14, 93, 16, 17, 14, 19, 20, 17, 46, 96, 17, 25, 71, 98,
+        52, 29, 1, 31, 32, 72, 34, 53, 36, 94, 95, 39, 17, 72, 81, 43, 44, 45, 46, 47, 89, 49, 81, 51, 52, 98, 54, 96,
+        1, 28, 58, 12, 13, 14, 93, 16, 17, 79, 19, 20, 1, 2, 99, 72, 25, 18, 65, 2, 29, 68, 31, 32, 81, 34, 51, 36, 34,
+        17, 39, 53, 80, 37, 43, 44, 45, 46, 47, 17, 49, 98, 51, 12, 13, 54, 11, 17, 17, 58, 15, 17, 34, 3, 4, 5, 6, 7,
+        8, 15, 1, 26, 12, 13, 23, 17, 16, 4, 33, 19, 20, 36, 17, 53, 51, 25, 91, 80, 17, 29, 21, 31, 32, 48, 42, 64, 46,
+        36, 12, 13, 69, 70, 11, 17, 73, 74, 75, 38, 39, 40, 79, 12, 13, 82, 83, 91, 17, 86, 87, 88, 72, 90, 80, 22, 55,
+        56, 57, 81, 64, 81, 91, 100, 101, 69, 70, 79, 50, 73, 74, 75, 93, 93, 67, 79, 91, 1, 82, 83, 78, 50, 86, 87, 88,
+        79, 90, 11, 79, 64, 92, 79, 9, 104, 69, 70, 86, 101, 73, 74, 75, 76, 26, 27, 79, 91, 91, 82, 83, 33, 91, 86, 87,
+        88, 64, 90, 104, 71, 72, 69, 70, 12, 13, 73, 74, 75, 17, 81, 104, 79, 84, 85, 82, 83, 104, 26, 86, 87, 88, 104,
+        90, 104, 33, 64, 98, 104, 104, 97, 69, 70, 104, 104, 73, 74, 75, 104, 104, 104, 79, 104, 1, 82, 83, 36, 104, 86,
+        87, 88, 104, 90, 11, 104, 64, 46, 104, 48, 97, 69, 70, 1, 53, 73, 74, 75, 76, 26, 104, 79, 104, 11, 82, 83, 33,
+        104, 86, 87, 88, 64, 90, 104, 104, 104, 69, 70, 26, 104, 73, 74, 75, 104, 104, 33, 79, 104, 104, 82, 83, 104,
+        104, 86, 87, 88, 104, 90, 104, 104, 64, 104, 104, 104, 97, 69, 70, 104, 104, 73, 74, 75, 104, 104, 104, 79, 104,
+        104, 82, 83, 104, 104, 86, 87, 88, 104, 90, 104, 104, 64, 104, 104, 104, 104, 69, 70, 104, 104, 73, 74, 75, 104,
+        104, 104, 79, 104, 104, 82, 83, 104, 104, 86, 87, 88, 64, 90, 104, 104, 104, 69, 70, 104, 104, 73, 74, 75, 104,
+        13, 14, 79, 104, 17, 82, 83, 104, 104, 86, 87, 88, 104, 90, 104, 104, 64, 104, 104, 104, 104, 69, 70, 104, 104,
+        73, 74, 75, 104, 104, 104, 79, 104, 104, 82, 83, 104, 104, 86, 87, 88, 54, 90, 104, 104, 64, 104, 104, 104, 104,
+        69, 70, 104, 104, 73, 74, 75, 104, 104, 104, 79, 104, 104, 82, 83, 104, 104, 86, 87, 88, 64, 90, 104, 104, 104,
+        69, 70, 104, 104, 73, 74, 75, 104, 104, 104, 79, 104, 104, 82, 83, 104, 104, 86, 87, 88, 104, 90, 104, 104, 64,
+        104, 104, 104, 104, 69, 70, 104, 104, 73, 74, 75, 104, 104, 104, 79, 104, 104, 82, 83, 4, 104, 86, 87, 88, 104,
+        90, 104, 12, 13, 14, 104, 16, 104, 104, 19, 20, 104, 13, 14, 104, 25, 17, 104, 104, 29, 64, 31, 32, 104, 104,
+        69, 70, 104, 104, 73, 74, 75, 104, 34, 104, 79, 104, 104, 82, 83, 104, 104, 86, 87, 88, 64, 90, 104, 58, 59, 69,
+        70, 104, 54, 73, 74, 75, 104, 104, 104, 79, 104, 104, 82, 83, 4, 104, 86, 87, 88, 104, 90, 104, 12, 13, 14, 104,
+        16, 104, 104, 19, 20, 104, 104, 104, 104, 25, 104, 104, 104, 29, 64, 31, 32, 104, 104, 69, 70, 104, 104, 73, 74,
+        75, 104, 104, 104, 79, 104, 104, 82, 83, 104, 104, 86, 87, 88, 64, 90, 104, 58, 59, 69, 70, 104, 104, 73, 74,
+        75, 104, 104, 104, 79, 12, 13, 82, 83, 104, 17, 86, 87, 88, 104, 90, 104, 104, 64, 26, 104, 28, 104, 69, 70,
+        104, 33, 73, 74, 75, 104, 104, 104, 79, 104, 104, 82, 83, 104, 104, 86, 87, 88, 104, 90, 104, 104, 64, 104, 104,
+        104, 104, 69, 70, 104, 104, 73, 74, 75, 104, 104, 104, 79, 104, 104, 82, 83, 104, 104, 86, 87, 88, 64, 90, 104,
+        104, 104, 69, 70, 104, 104, 73, 74, 75, 104, 104, 104, 79, 104, 104, 82, 83, 104, 104, 86, 87, 88, 104, 90, 104,
+        104, 64, 104, 104, 104, 104, 69, 70, 104, 104, 73, 74, 75, 104, 104, 104, 79, 104, 104, 82, 83, 104, 104, 86,
+        87, 88, 104, 90, 104, 104, 64, 104, 104, 104, 104, 69, 70, 104, 104, 73, 74, 75, 104, 104, 104, 79, 104, 104,
+        82, 83, 104, 104, 86, 87, 88, 64, 90, 104, 104, 104, 69, 70, 104, 104, 73, 74, 75, 104, 104, 104, 79, 104, 104,
+        82, 83, 104, 104, 86, 87, 88, 104, 90, 104, 104, 64, 104, 104, 104, 104, 69, 70, 104, 104, 73, 74, 75, 104, 104,
+        104, 79, 104, 104, 82, 83, 104, 104, 86, 87, 88, 104, 90, 104, 104, 64, 104, 104, 104, 104, 69, 70, 104, 104,
+        73, 74, 75, 104, 104, 104, 79, 104, 104, 82, 83, 104, 104, 86, 87, 88, 64, 90, 104, 104, 104, 69, 70, 104, 104,
+        73, 74, 75, 104, 104, 104, 79, 104, 104, 82, 83, 104, 104, 86, 87, 88, 104, 90, 104, 104, 64, 104, 104, 104,
+        104, 69, 70, 104, 104, 73, 74, 75, 104, 104, 104, 79, 104, 104, 82, 83, 104, 104, 86, 87, 88, 104, 90, 104, 104,
+        64, 104, 104, 104, 104, 69, 70, 104, 104, 73, 74, 75, 104, 104, 104, 79, 104, 104, 82, 83, 104, 104, 86, 87, 88,
+        64, 90, 104, 104, 104, 69, 70, 104, 104, 73, 74, 75, 104, 104, 104, 79, 104, 104, 82, 83, 104, 104, 86, 87, 88,
+        104, 90, 104, 104, 64, 104, 104, 104, 104, 69, 70, 104, 104, 73, 74, 75, 104, 104, 104, 79, 104, 104, 82, 83,
+        104, 104, 86, 87, 88, 104, 90, 104, 104, 64, 104, 104, 104, 104, 69, 70, 104, 104, 73, 74, 75, 104, 104, 104,
+        79, 104, 104, 82, 83, 104, 104, 86, 87, 88, 64, 90, 104, 104, 104, 69, 70, 104, 104, 73, 74, 75, 104, 104, 104,
+        79, 104, 104, 82, 83, 104, 104, 86, 87, 88, 104, 90, 104, 104, 64, 104, 104, 104, 104, 69, 70, 104, 104, 73, 74,
+        75, 104, 104, 104, 79, 104, 104, 82, 83, 104, 104, 86, 87, 88, 104, 90, 104, 104, 64, 104, 104, 104, 104, 69,
+        70, 104, 104, 73, 74, 75, 104, 104, 104, 79, 104, 104, 82, 83, 104, 104, 86, 87, 88, 64, 90, 104, 104, 104, 69,
+        70, 104, 104, 73, 74, 75, 104, 104, 104, 79, 104, 104, 82, 83, 104, 11, 86, 87, 88, 104, 90, 104, 104, 64, 104,
+        21, 104, 23, 69, 70, 26, 104, 73, 104, 75, 104, 104, 33, 79, 35, 104, 37, 83, 104, 104, 86, 87, 88, 104, 90, 46,
+        104, 64, 104, 1, 104, 104, 69, 70, 1, 2, 73, 104, 75, 104, 104, 104, 79, 104, 104, 104, 83, 104, 104, 86, 87,
+        88, 24, 90, 26, 61, 62, 63, 64, 65, 66, 33, 104, 69, 2, 104, 38, 39, 40, 36, 104, 38, 39, 40, 12, 13, 2, 15,
+        104, 17, 18, 48, 104, 55, 56, 57, 12, 13, 55, 56, 57, 17, 18, 1, 104, 104, 104, 104, 38, 39, 40, 104, 104, 11,
+        104, 104, 104, 104, 46, 104, 48, 104, 50, 104, 52, 55, 56, 57, 26, 104, 46, 104, 48, 2, 50, 33, 52, 53, 104,
+        104, 38, 39, 40, 12, 13, 104, 15, 104, 17, 18, 104, 104, 104, 104, 104, 104, 104, 55, 56, 57, 104, 104, 104, 64,
+        104, 104, 104, 104, 69, 70, 104, 104, 73, 104, 75, 104, 104, 46, 79, 48, 104, 50, 104, 52, 104, 86, 87, 88, 104,
+        90, 2, 104, 104, 64, 104, 104, 104, 104, 69, 70, 12, 13, 73, 104, 75, 17, 18, 104, 79, 104, 104, 104, 104, 104,
+        104, 86, 87, 88, 104, 90, 104, 104, 64, 104, 104, 104, 104, 69, 70, 104, 104, 73, 104, 75, 46, 104, 48, 79, 50,
+        104, 52, 104, 104, 104, 86, 87, 88, 104, 90, 104, 64, 104, 104, 104, 104, 69, 70, 104, 104, 73, 104, 75, 104,
+        104, 104, 79, 104, 104, 104, 104, 104, 104, 86, 87, 88, 1, 90, 2, 104, 1, 64, 104, 104, 104, 104, 69, 70, 12,
+        13, 73, 104, 75, 17, 18, 104, 79, 104, 104, 104, 104, 26, 104, 86, 87, 88, 104, 90, 33, 104, 1, 104, 104, 38,
+        39, 40, 37, 38, 39, 40, 11, 1, 46, 104, 48, 104, 50, 104, 52, 104, 55, 56, 57, 1, 55, 56, 57, 104, 104, 104,
+        104, 104, 104, 11, 104, 1, 104, 38, 39, 40, 104, 104, 104, 104, 104, 11, 104, 37, 38, 39, 40, 104, 104, 104, 55,
+        56, 57, 104, 1, 104, 38, 39, 40, 1, 2, 55, 56, 57, 11, 1, 104, 104, 38, 39, 40, 104, 104, 55, 56, 57, 104, 104,
+        104, 104, 104, 104, 104, 104, 104, 55, 56, 57, 104, 104, 104, 38, 39, 40, 1, 104, 38, 39, 40, 1, 104, 104, 38,
+        39, 40, 104, 12, 13, 55, 56, 57, 17, 18, 55, 56, 57, 104, 53, 104, 55, 56, 57, 1, 104, 104, 27, 104, 104, 104,
+        104, 104, 38, 39, 40, 104, 104, 38, 39, 40, 104, 46, 104, 48, 104, 50, 104, 52, 104, 55, 56, 57, 104, 59, 55,
+        56, 57, 1, 104, 1, 38, 39, 40, 104, 104, 104, 104, 11, 104, 11, 104, 104, 104, 104, 18, 104, 104, 55, 56, 57,
+        22, 104, 26, 104, 26, 104, 104, 71, 72, 33, 104, 33, 36, 104, 104, 71, 72, 81, 104, 41, 84, 85, 1, 104, 48, 81,
+        71, 72, 84, 85, 104, 104, 11, 104, 98, 104, 81, 104, 104, 84, 85, 104, 98, 22, 104, 104, 104, 26, 104, 104, 104,
+        104, 104, 98, 33, 104, 104, 104, 104, 104, 104, 104, 41,);
+
+    const YY_SHIFT_USE_DFLT = - 34;
+
+    const YY_SHIFT_MAX = 242;
+
+    static public $yy_shift_ofst = array(517, 364, 270, 82, 364, 270, 82, 82, - 12, - 12, 35, 82, 82, 82, 129, 82, 82,
+        82, 82, 176, 223, 82, 82, 82, 82, 82, 176, 82, 82, 82, 82, 82, 411, 82, 82, 82, 82, 317, 317, 458, 458, 458,
+        458, 458, 1680, 1616, 1852, 1852, 1852, 1852, 1852, 517, 1004, 1955, 1989, 1984, 1909, 526, 1886, 1897, 1944,
+        1921, 1856, 1949, 2012, 2012, 2012, 2012, 2012, 2012, 2046, 2012, 2012, 2012, 2012, 2012, 2012, 1648, 2091,
+        1648, 2048, 152, 104, 319, 343, 933, - 3, 1063, 634, 634, 684, 684, 319, 343, 319, 343, 321, 319, 478, 601, 703,
+        805, 60, 183, 196, 280, 91, 280, 241, 74, 415, 224, 50, 373, 466, 440, 5, 393, 415, 50, 173, 173, 400, 400, 400,
+        400, 400, 400, 400, 400, - 34, 1709, 1662, 1650, 1853, 1766, 1985, 942, 556, 387, 498, 50, 50, 281, 50, 50, 133,
+        163, 50, 50, 50, 163, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 121, 133, 133, 133, 163, 133, 133, 50, 133,
+        163, 172, 50, 172, 287, 50, 50, 133, 400, 400, 76, 608, 173, 400, 400, 484, 484, 173, 173, 400, - 34, - 34,
+        - 34, - 34, - 34, 1621, 1567, 502, 652, 543, 96, 204, 238, 252, 290, 15, 58, - 33, 120, 99, 218, 217, 363, 167,
+        303, 501, 511, 508, 515, 485, 463, 461, 489, 497, 522, 530, 509, 548, 518, 507, 490, 487, 528, 479, 434, 558,
+        295, 76, 418, 442, 445,);
+
+    const YY_REDUCE_USE_DFLT = - 67;
+
+    const YY_REDUCE_MAX = 196;
+
+    static public $yy_reduce_ofst = array(1582, 488, 633, 658, 521, 550, 575, 604, 770, 799, 1024, 1302, 1410, 1439,
+        1244, 1107, 1190, 1493, 1078, 824, 970, 687, 924, 1327, 1219, 1161, 1136, 1053, 1273, 1468, 1385, 1356, 899,
+        995, 741, 716, 853, 1551, 1522, 1764, 1794, 1736, 1707, 1677, - 28, 571, 19, - 28, 2006, 2014, 2025, 87, 95,
+        115, 115, 115, 115, 115, 115, 115, 115, 115, 115, 115, 115, 115, 115, 115, 115, 115, 175, 115, 115, 115, 115,
+        115, 115, 115, 160, 115, 160, 92, - 13, - 60, - 14, 207, 333, 380, 505, 293, 246, 213, 260, 44, 410, 312, - 66,
+        340, 209, 190, 190, 338, 299, 190, 325, 299, 325, 279, 420, 325, 258, - 34, 278, 254, 366, 190, 190, 190, 370,
+        372, 325, 354, 190, 190, 284, 190, 190, 190, 190, 190, 190, 496, 496, 496, 496, 496, 496, 397, 504, 496, 496,
+        503, 503, 527, 503, 503, 523, 531, 503, 503, 503, 513, 503, 503, 503, 503, 503, 503, 503, 503, 503, 503, 503,
+        535, 523, 523, 523, 537, 523, 523, 503, 523, 534, 510, 503, 539, 540, 503, 503, 523, - 1, - 1, 544, 532, 134,
+        - 1, - 1, 382, 382, 134, 134, - 1, 499, 464, 419, 452, 481,);
+
+    static public $yyExpectedTokens = array(array(3, 4, 5, 6, 7, 8, 12, 13, 16, 19, 20, 25, 29, 31, 32,),
+        array(12, 13, 14, 16, 17, 19, 20, 25, 29, 31, 32, 34, 36, 39, 43, 44, 45, 46, 47, 49, 51, 52, 54, 58,),
+        array(12, 13, 14, 16, 17, 19, 20, 25, 29, 31, 32, 34, 36, 39, 43, 44, 45, 46, 47, 49, 51, 52, 54, 58,),
+        array(12, 13, 14, 16, 17, 19, 20, 25, 29, 31, 32, 34, 36, 39, 43, 44, 45, 46, 47, 49, 51, 52, 54, 58,),
+        array(12, 13, 14, 16, 17, 19, 20, 25, 29, 31, 32, 34, 36, 39, 43, 44, 45, 46, 47, 49, 51, 52, 54, 58,),
+        array(12, 13, 14, 16, 17, 19, 20, 25, 29, 31, 32, 34, 36, 39, 43, 44, 45, 46, 47, 49, 51, 52, 54, 58,),
+        array(12, 13, 14, 16, 17, 19, 20, 25, 29, 31, 32, 34, 36, 39, 43, 44, 45, 46, 47, 49, 51, 52, 54, 58,),
+        array(12, 13, 14, 16, 17, 19, 20, 25, 29, 31, 32, 34, 36, 39, 43, 44, 45, 46, 47, 49, 51, 52, 54, 58,),
+        array(12, 13, 14, 16, 17, 19, 20, 25, 29, 30, 31, 32, 34, 36, 39, 43, 44, 45, 46, 47, 49, 51, 52, 54, 58,),
+        array(12, 13, 14, 16, 17, 19, 20, 25, 29, 30, 31, 32, 34, 36, 39, 43, 44, 45, 46, 47, 49, 51, 52, 54, 58,),
+        array(12, 13, 14, 16, 17, 19, 20, 25, 29, 31, 32, 34, 36, 39, 43, 44, 45, 46, 47, 49, 51, 52, 53, 54, 58,),
+        array(12, 13, 14, 16, 17, 19, 20, 25, 29, 31, 32, 34, 36, 39, 43, 44, 45, 46, 47, 49, 51, 52, 54, 58,),
+        array(12, 13, 14, 16, 17, 19, 20, 25, 29, 31, 32, 34, 36, 39, 43, 44, 45, 46, 47, 49, 51, 52, 54, 58,),
+        array(12, 13, 14, 16, 17, 19, 20, 25, 29, 31, 32, 34, 36, 39, 43, 44, 45, 46, 47, 49, 51, 52, 54, 58,),
+        array(12, 13, 14, 16, 17, 19, 20, 25, 29, 31, 32, 34, 36, 39, 43, 44, 45, 46, 47, 49, 51, 52, 54, 58,),
+        array(12, 13, 14, 16, 17, 19, 20, 25, 29, 31, 32, 34, 36, 39, 43, 44, 45, 46, 47, 49, 51, 52, 54, 58,),
+        array(12, 13, 14, 16, 17, 19, 20, 25, 29, 31, 32, 34, 36, 39, 43, 44, 45, 46, 47, 49, 51, 52, 54, 58,),
+        array(12, 13, 14, 16, 17, 19, 20, 25, 29, 31, 32, 34, 36, 39, 43, 44, 45, 46, 47, 49, 51, 52, 54, 58,),
+        array(12, 13, 14, 16, 17, 19, 20, 25, 29, 31, 32, 34, 36, 39, 43, 44, 45, 46, 47, 49, 51, 52, 54, 58,),
+        array(12, 13, 14, 16, 17, 19, 20, 25, 29, 31, 32, 34, 36, 39, 43, 44, 45, 46, 47, 49, 51, 52, 54, 58,),
+        array(12, 13, 14, 16, 17, 19, 20, 25, 29, 31, 32, 34, 36, 39, 43, 44, 45, 46, 47, 49, 51, 52, 54, 58,),
+        array(12, 13, 14, 16, 17, 19, 20, 25, 29, 31, 32, 34, 36, 39, 43, 44, 45, 46, 47, 49, 51, 52, 54, 58,),
+        array(12, 13, 14, 16, 17, 19, 20, 25, 29, 31, 32, 34, 36, 39, 43, 44, 45, 46, 47, 49, 51, 52, 54, 58,),
+        array(12, 13, 14, 16, 17, 19, 20, 25, 29, 31, 32, 34, 36, 39, 43, 44, 45, 46, 47, 49, 51, 52, 54, 58,),
+        array(12, 13, 14, 16, 17, 19, 20, 25, 29, 31, 32, 34, 36, 39, 43, 44, 45, 46, 47, 49, 51, 52, 54, 58,),
+        array(12, 13, 14, 16, 17, 19, 20, 25, 29, 31, 32, 34, 36, 39, 43, 44, 45, 46, 47, 49, 51, 52, 54, 58,),
+        array(12, 13, 14, 16, 17, 19, 20, 25, 29, 31, 32, 34, 36, 39, 43, 44, 45, 46, 47, 49, 51, 52, 54, 58,),
+        array(12, 13, 14, 16, 17, 19, 20, 25, 29, 31, 32, 34, 36, 39, 43, 44, 45, 46, 47, 49, 51, 52, 54, 58,),
+        array(12, 13, 14, 16, 17, 19, 20, 25, 29, 31, 32, 34, 36, 39, 43, 44, 45, 46, 47, 49, 51, 52, 54, 58,),
+        array(12, 13, 14, 16, 17, 19, 20, 25, 29, 31, 32, 34, 36, 39, 43, 44, 45, 46, 47, 49, 51, 52, 54, 58,),
+        array(12, 13, 14, 16, 17, 19, 20, 25, 29, 31, 32, 34, 36, 39, 43, 44, 45, 46, 47, 49, 51, 52, 54, 58,),
+        array(12, 13, 14, 16, 17, 19, 20, 25, 29, 31, 32, 34, 36, 39, 43, 44, 45, 46, 47, 49, 51, 52, 54, 58,),
+        array(12, 13, 14, 16, 17, 19, 20, 25, 29, 31, 32, 34, 36, 39, 43, 44, 45, 46, 47, 49, 51, 52, 54, 58,),
+        array(12, 13, 14, 16, 17, 19, 20, 25, 29, 31, 32, 34, 36, 39, 43, 44, 45, 46, 47, 49, 51, 52, 54, 58,),
+        array(12, 13, 14, 16, 17, 19, 20, 25, 29, 31, 32, 34, 36, 39, 43, 44, 45, 46, 47, 49, 51, 52, 54, 58,),
+        array(12, 13, 14, 16, 17, 19, 20, 25, 29, 31, 32, 34, 36, 39, 43, 44, 45, 46, 47, 49, 51, 52, 54, 58,),
+        array(12, 13, 14, 16, 17, 19, 20, 25, 29, 31, 32, 34, 36, 39, 43, 44, 45, 46, 47, 49, 51, 52, 54, 58,),
+        array(12, 13, 14, 16, 17, 19, 20, 25, 29, 31, 32, 34, 36, 39, 43, 44, 45, 46, 47, 49, 51, 52, 54, 58,),
+        array(12, 13, 14, 16, 17, 19, 20, 25, 29, 31, 32, 34, 36, 39, 43, 44, 45, 46, 47, 49, 51, 52, 54, 58,),
+        array(12, 13, 14, 16, 17, 19, 20, 25, 29, 31, 32, 34, 36, 39, 43, 44, 45, 46, 47, 49, 51, 54, 58,),
+        array(12, 13, 14, 16, 17, 19, 20, 25, 29, 31, 32, 34, 36, 39, 43, 44, 45, 46, 47, 49, 51, 54, 58,),
+        array(12, 13, 14, 16, 17, 19, 20, 25, 29, 31, 32, 34, 36, 39, 43, 44, 45, 46, 47, 49, 51, 54, 58,),
+        array(12, 13, 14, 16, 17, 19, 20, 25, 29, 31, 32, 34, 36, 39, 43, 44, 45, 46, 47, 49, 51, 54, 58,),
+        array(12, 13, 14, 16, 17, 19, 20, 25, 29, 31, 32, 34, 36, 39, 43, 44, 45, 46, 47, 49, 51, 54, 58,),
+        array(1, 11, 26, 33, 38, 39, 40, 55, 56, 57,), array(1, 24, 26, 33, 38, 39, 40, 55, 56, 57,),
+        array(1, 26, 33, 38, 39, 40, 55, 56, 57,), array(1, 26, 33, 38, 39, 40, 55, 56, 57,),
+        array(1, 26, 33, 38, 39, 40, 55, 56, 57,), array(1, 26, 33, 38, 39, 40, 55, 56, 57,),
+        array(1, 26, 33, 38, 39, 40, 55, 56, 57,), array(3, 4, 5, 6, 7, 8, 12, 13, 16, 19, 20, 25, 29, 31, 32,),
+        array(4, 12, 13, 14, 16, 19, 20, 25, 29, 31, 32, 58, 59,), array(1, 38, 39, 40, 53, 55, 56, 57,),
+        array(1, 27, 38, 39, 40, 55, 56, 57,), array(1, 38, 39, 40, 55, 56, 57, 59,),
+        array(1, 11, 38, 39, 40, 55, 56, 57,), array(1, 21, 38, 39, 40, 55, 56, 57,),
+        array(1, 11, 38, 39, 40, 55, 56, 57,), array(1, 37, 38, 39, 40, 55, 56, 57,),
+        array(1, 11, 38, 39, 40, 55, 56, 57,), array(1, 11, 38, 39, 40, 55, 56, 57,),
+        array(1, 37, 38, 39, 40, 55, 56, 57,), array(1, 2, 38, 39, 40, 55, 56, 57,), array(1, 38, 39, 40, 55, 56, 57,),
+        array(1, 38, 39, 40, 55, 56, 57,), array(1, 38, 39, 40, 55, 56, 57,), array(1, 38, 39, 40, 55, 56, 57,),
+        array(1, 38, 39, 40, 55, 56, 57,), array(1, 38, 39, 40, 55, 56, 57,), array(1, 11, 18, 26, 33, 36, 48,),
+        array(1, 38, 39, 40, 55, 56, 57,), array(1, 38, 39, 40, 55, 56, 57,), array(1, 38, 39, 40, 55, 56, 57,),
+        array(1, 38, 39, 40, 55, 56, 57,), array(1, 38, 39, 40, 55, 56, 57,), array(1, 38, 39, 40, 55, 56, 57,),
+        array(38, 39, 40, 55, 56, 57,), array(1, 11, 22, 26, 33, 41,), array(38, 39, 40, 55, 56, 57,),
+        array(1, 11, 22, 26, 33, 41,), array(14, 17, 51, 54,), array(1, 11, 26, 33,), array(1, 26, 33,),
+        array(14, 36, 54,), array(4, 12, 13, 14, 16, 19, 20, 25, 29, 31, 32, 58, 59,), array(12, 13, 17, 26, 28, 33,),
+        array(12, 13, 17, 26, 28, 33,), array(12, 13, 17, 26, 33,), array(12, 13, 17, 26, 33,), array(1, 11, 26, 33,),
+        array(1, 11, 26, 33,), array(1, 26, 33,), array(14, 36, 54,), array(1, 26, 33,), array(14, 36, 54,),
+        array(18, 46, 52,), array(1, 26, 33,), array(1, 2,), array(1, 11, 26, 27, 33,), array(1, 11, 26, 33,),
+        array(13, 14, 17, 54,), array(12, 13, 17, 50,), array(1, 11, 26, 33,), array(15, 18, 48,), array(12, 13, 17,),
+        array(15, 18, 48,), array(12, 13, 17,), array(8, 9, 10,), array(18, 48,), array(14, 17,), array(14, 54,),
+        array(26, 33,), array(26, 33,), array(1, 18,), array(1, 28,), array(1, 11,), array(1, 53,), array(14, 17,),
+        array(26, 33,), array(18,), array(18,), array(1,), array(1,), array(1,), array(1,), array(1,), array(1,),
+        array(1,), array(1,), array(), array(2, 12, 13, 15, 17, 18, 46, 48, 50, 52,),
+        array(2, 12, 13, 17, 18, 46, 48, 50, 52, 53,), array(2, 12, 13, 15, 17, 18, 46, 48, 50, 52,),
+        array(2, 12, 13, 17, 18, 46, 48, 50, 52,), array(2, 12, 13, 17, 18, 46, 48, 50, 52,),
+        array(12, 13, 17, 18, 46, 48, 50, 52,), array(13, 14, 17, 34, 54,), array(12, 13, 17, 50,), array(15, 46, 52,),
+        array(12, 13, 17,), array(26, 33,), array(26, 33,), array(15, 22,), array(26, 33,), array(26, 33,),
+        array(46, 52,), array(14, 54,), array(26, 33,), array(26, 33,), array(26, 33,), array(14, 54,), array(26, 33,),
+        array(26, 33,), array(26, 33,), array(26, 33,), array(26, 33,), array(26, 33,), array(26, 33,), array(26, 33,),
+        array(26, 33,), array(26, 33,), array(26, 33,), array(17, 49,), array(46, 52,), array(46, 52,), array(46, 52,),
+        array(14, 54,), array(46, 52,), array(46, 52,), array(26, 33,), array(46, 52,), array(14, 54,), array(46, 52,),
+        array(26, 33,), array(46, 52,), array(13, 36,), array(26, 33,), array(26, 33,), array(46, 52,), array(1,),
+        array(1,), array(36,), array(9,), array(18,), array(1,), array(1,), array(2,), array(2,), array(18,),
+        array(18,), array(1,), array(), array(), array(), array(), array(),
+        array(1, 2, 36, 38, 39, 40, 48, 55, 56, 57,), array(11, 21, 23, 26, 33, 35, 37, 46,),
+        array(11, 15, 26, 33, 36, 48,), array(36, 46, 48, 53,), array(12, 13, 17, 50,), array(28, 36, 48,),
+        array(22, 41, 59,), array(22, 41, 53,), array(46, 53,), array(35, 53,), array(21, 35,), array(17, 50,),
+        array(36, 48,), array(35, 37,), array(36, 48,), array(15, 46,), array(36, 48,), array(22, 41,), array(35, 37,),
+        array(35, 37,), array(17,), array(15,), array(23,), array(17,), array(34,), array(37,), array(34,), array(17,),
+        array(17,), array(17,), array(4,), array(42,), array(11,), array(36,), array(46,), array(51,), array(53,),
+        array(17,), array(17,), array(17,), array(22,), array(17,), array(36,), array(17,), array(51,), array(53,),
+        array(), array(), array(), array(), array(), array(), array(), array(), array(), array(), array(), array(),
+        array(), array(), array(), array(), array(), array(), array(), array(), array(), array(), array(), array(),
+        array(), array(), array(), array(), array(), array(), array(), array(), array(), array(), array(), array(),
+        array(), array(), array(), array(), array(), array(), array(), array(), array(), array(), array(), array(),
+        array(), array(), array(), array(), array(), array(), array(), array(), array(), array(), array(), array(),
+        array(), array(), array(), array(), array(), array(), array(), array(), array(), array(), array(), array(),
+        array(), array(), array(), array(), array(), array(), array(), array(), array(), array(), array(), array(),
+        array(), array(), array(), array(), array(), array(), array(), array(), array(), array(),);
+
+    static public $yy_default = array(340, 516, 531, 496, 531, 531, 496, 496, 531, 531, 531, 531, 531, 531, 531, 531,
+        531, 531, 531, 531, 531, 531, 531, 531, 531, 531, 531, 531, 531, 531, 531, 531, 531, 531, 531, 531, 531, 531,
+        531, 531, 531, 531, 531, 531, 531, 400, 400, 400, 400, 376, 367, 337, 531, 531, 405, 531, 531, 531, 531, 531,
+        531, 531, 531, 531, 421, 495, 411, 405, 402, 519, 438, 412, 407, 381, 517, 494, 518, 426, 428, 427, 428, 531,
+        414, 400, 531, 531, 400, 400, 400, 400, 420, 445, 400, 531, 400, 531, 508, 400, 390, 414, 414, 531, 461, 414,
+        451, 461, 451, 461, 531, 451, 531, 531, 378, 400, 394, 414, 414, 414, 531, 400, 451, 505, 424, 418, 396, 417,
+        429, 430, 414, 431, 503, 450, 450, 450, 450, 450, 450, 531, 463, 477, 461, 369, 368, 531, 387, 380, 459, 531,
+        365, 386, 360, 531, 373, 362, 359, 374, 363, 385, 364, 371, 375, 377, 389, 531, 486, 457, 488, 531, 489, 458,
+        379, 455, 531, 456, 383, 454, 461, 384, 388, 487, 397, 395, 461, 353, 483, 391, 420, 498, 497, 506, 509, 445,
+        502, 502, 502, 461, 461, 438, 434, 438, 438, 462, 438, 428, 428, 434, 531, 531, 531, 446, 531, 531, 434, 438,
+        428, 531, 531, 531, 531, 408, 531, 436, 531, 531, 531, 531, 531, 344, 440, 531, 507, 434, 531, 441, 531, 531,
+        531, 428, 531, 477, 531, 531, 531, 477, 338, 482, 401, 492, 491, 469, 470, 413, 476, 468, 471, 504, 440, 467,
+        409, 382, 453, 499, 500, 432, 393, 501, 479, 480, 481, 433, 435, 464, 465, 466, 460, 416, 437, 439, 415, 399,
+        370, 345, 347, 348, 346, 343, 339, 341, 342, 349, 350, 356, 357, 398, 355, 354, 351, 352, 441, 442, 520, 521,
+        522, 392, 484, 493, 527, 528, 525, 524, 513, 515, 514, 523, 530, 526, 529, 478, 485, 474, 472, 475, 447, 444,
+        443, 422, 423, 510, 511, 449, 473, 452, 448, 425, 512, 419, 490,);
+
+    const YYNOCODE = 105;
 
-    const YY_SZ_ACTTAB = 2478;
-    static public $yy_action = array(
-        220, 281, 284, 293, 294, 305, 301, 280, 268, 269,
-        275, 263, 196, 201, 324, 10, 288, 231, 283, 241,
-        7, 107, 39, 157, 17, 157, 132, 37, 204, 42,
-        261, 25, 256, 349, 14, 27, 24, 140, 297, 279,
-        46, 49, 47, 45, 20, 26, 337, 340, 31, 30,
-        341, 350, 29, 18, 220, 299, 334, 571, 91, 289,
-        231, 283, 241, 137, 220, 137, 192, 351, 360, 359,
-        362, 363, 357, 355, 336, 335, 317, 316, 318, 139,
-        220, 43, 433, 42, 220, 220, 427, 430, 485, 27,
-        44, 271, 136, 314, 46, 49, 47, 45, 20, 26,
-        337, 340, 31, 30, 341, 350, 29, 18, 220, 433,
-        243, 485, 21, 42, 430, 433, 196, 353, 315, 27,
-        430, 351, 360, 359, 362, 363, 357, 355, 336, 335,
-        317, 316, 318, 4, 328, 248, 310, 42, 103, 34,
-        122, 187, 35, 27, 300, 485, 348, 487, 46, 49,
-        47, 45, 20, 26, 337, 340, 31, 30, 341, 350,
-        29, 18, 220, 93, 220, 327, 238, 5, 485, 25,
-        487, 349, 40, 339, 157, 351, 360, 359, 362, 363,
-        357, 355, 336, 335, 317, 316, 318, 234, 328, 333,
-        104, 169, 220, 42, 433, 25, 311, 349, 40, 27,
-        330, 487, 46, 49, 47, 45, 20, 26, 337, 340,
-        31, 30, 341, 350, 29, 18, 220, 93, 207, 181,
-        304, 433, 190, 324, 487, 109, 321, 433, 330, 351,
-        360, 359, 362, 363, 357, 355, 336, 335, 317, 316,
-        318, 249, 329, 106, 176, 220, 203, 390, 247, 25,
-        199, 349, 25, 330, 349, 245, 46, 49, 47, 45,
-        20, 26, 337, 340, 31, 30, 341, 350, 29, 18,
-        220, 207, 270, 200, 42, 232, 233, 218, 207, 364,
-        27, 136, 229, 351, 360, 359, 362, 363, 357, 355,
-        336, 335, 317, 316, 318, 251, 99, 167, 249, 179,
-        364, 213, 198, 42, 189, 95, 330, 9, 330, 27,
-        46, 49, 47, 45, 20, 26, 337, 340, 31, 30,
-        341, 350, 29, 18, 207, 220, 203, 103, 497, 2,
-        207, 485, 207, 486, 497, 197, 324, 351, 360, 359,
-        362, 363, 357, 355, 336, 335, 317, 316, 318, 194,
-        38, 328, 125, 35, 485, 346, 486, 35, 220, 354,
-        395, 220, 44, 144, 487, 46, 49, 47, 45, 20,
-        26, 337, 340, 31, 30, 341, 350, 29, 18, 220,
-        93, 276, 159, 142, 25, 356, 254, 487, 352, 257,
-        247, 330, 351, 360, 359, 362, 363, 357, 355, 336,
-        335, 317, 316, 318, 338, 328, 220, 174, 172, 33,
-        25, 25, 225, 349, 255, 252, 330, 330, 487, 46,
-        49, 47, 45, 20, 26, 337, 340, 31, 30, 341,
-        350, 29, 18, 220, 203, 203, 175, 15, 32, 202,
-        184, 487, 338, 118, 27, 330, 351, 360, 359, 362,
-        363, 357, 355, 336, 335, 317, 316, 318, 338, 295,
-        273, 171, 25, 193, 230, 170, 25, 147, 246, 220,
-        330, 292, 113, 46, 49, 47, 45, 20, 26, 337,
-        340, 31, 30, 341, 350, 29, 18, 220, 295, 206,
-        250, 207, 232, 228, 160, 232, 298, 101, 98, 342,
-        351, 360, 359, 362, 363, 357, 355, 336, 335, 317,
-        316, 318, 234, 295, 295, 166, 264, 162, 121, 338,
-        257, 108, 287, 147, 330, 343, 112, 46, 49, 47,
-        45, 20, 26, 337, 340, 31, 30, 341, 350, 29,
-        18, 220, 295, 150, 183, 272, 331, 36, 123, 143,
-        120, 323, 134, 330, 351, 360, 359, 362, 363, 357,
-        355, 336, 335, 317, 316, 318, 338, 178, 295, 265,
-        235, 236, 163, 130, 12, 303, 330, 39, 267, 302,
-        97, 46, 49, 47, 45, 20, 26, 337, 340, 31,
-        30, 341, 350, 29, 18, 220, 295, 277, 164, 296,
-        4, 285, 291, 11, 3, 133, 131, 330, 351, 360,
-        359, 362, 363, 357, 355, 336, 335, 317, 316, 318,
-        338, 338, 161, 195, 312, 304, 168, 203, 165, 338,
-        361, 13, 306, 242, 278, 46, 49, 47, 45, 20,
-        26, 337, 340, 31, 30, 341, 350, 29, 18, 220,
-        105, 205, 119, 358, 334, 185, 334, 334, 100, 158,
-        117, 334, 351, 360, 359, 362, 363, 357, 355, 336,
-        335, 317, 316, 318, 295, 295, 295, 334, 334, 334,
-        334, 334, 334, 334, 334, 334, 334, 334, 157, 46,
-        49, 47, 45, 20, 26, 337, 340, 31, 30, 341,
-        350, 29, 18, 220, 41, 334, 334, 334, 334, 334,
-        334, 334, 334, 334, 334, 334, 351, 360, 359, 362,
-        363, 357, 355, 336, 335, 317, 316, 318, 137, 334,
-        334, 334, 334, 334, 334, 334, 334, 334, 334, 334,
-        334, 334, 334, 46, 49, 47, 45, 20, 26, 337,
-        340, 31, 30, 341, 350, 29, 18, 220, 334, 334,
-        334, 334, 334, 334, 334, 334, 334, 334, 334, 334,
-        351, 360, 359, 362, 363, 357, 355, 336, 335, 317,
-        316, 318, 334, 334, 334, 334, 334, 334, 334, 334,
-        334, 334, 334, 334, 334, 334, 334, 46, 49, 47,
-        45, 20, 26, 337, 340, 31, 30, 341, 350, 29,
-        18, 334, 334, 334, 334, 334, 334, 334, 334, 334,
-        334, 334, 334, 334, 351, 360, 359, 362, 363, 357,
-        355, 336, 335, 317, 316, 318, 334, 334, 334, 46,
-        49, 47, 45, 20, 26, 337, 340, 31, 30, 341,
-        350, 29, 18, 334, 334, 334, 334, 334, 334, 334,
-        334, 334, 334, 334, 334, 334, 351, 360, 359, 362,
-        363, 357, 355, 336, 335, 317, 316, 318, 334, 334,
-        334, 322, 334, 334, 334, 10, 135, 212, 8, 334,
-        7, 107, 244, 7, 107, 151, 132, 156, 334, 132,
-        261, 138, 256, 261, 260, 256, 28, 313, 320, 50,
-        274, 334, 307, 215, 217, 286, 262, 334, 307, 25,
-        334, 349, 334, 151, 51, 48, 290, 259, 266, 334,
-        222, 42, 103, 1, 344, 239, 157, 27, 334, 334,
-        307, 334, 191, 10, 126, 92, 334, 96, 7, 107,
-        326, 16, 332, 334, 132, 22, 19, 334, 261, 347,
-        256, 334, 260, 334, 28, 191, 182, 50, 334, 334,
-        207, 334, 334, 334, 213, 330, 334, 334, 22, 19,
-        9, 334, 51, 48, 290, 259, 266, 334, 222, 334,
-        103, 1, 334, 207, 334, 334, 334, 322, 334, 334,
-        334, 10, 135, 209, 8, 96, 7, 107, 334, 7,
-        107, 334, 132, 334, 334, 132, 261, 334, 256, 261,
-        221, 256, 28, 334, 334, 50, 334, 334, 334, 334,
-        334, 334, 334, 334, 334, 334, 334, 334, 334, 334,
-        51, 48, 290, 259, 266, 334, 222, 334, 103, 1,
-        220, 334, 400, 334, 431, 334, 334, 334, 334, 10,
-        136, 219, 334, 96, 7, 107, 325, 16, 332, 334,
-        132, 258, 240, 334, 261, 334, 256, 334, 260, 42,
-        23, 431, 334, 50, 334, 27, 334, 431, 485, 334,
-        485, 334, 334, 334, 334, 334, 334, 334, 51, 48,
-        290, 259, 266, 244, 222, 334, 103, 1, 155, 334,
-        334, 485, 138, 485, 334, 334, 334, 10, 135, 219,
-        334, 96, 7, 107, 215, 217, 286, 262, 132, 307,
-        334, 25, 261, 349, 256, 334, 260, 334, 28, 334,
-        334, 50, 334, 42, 334, 253, 334, 334, 334, 27,
-        334, 334, 334, 334, 334, 334, 51, 48, 290, 259,
-        266, 334, 222, 334, 103, 1, 334, 334, 334, 334,
-        334, 334, 334, 334, 334, 10, 135, 216, 334, 96,
-        7, 107, 334, 334, 334, 334, 132, 334, 334, 334,
-        261, 334, 256, 334, 260, 334, 28, 191, 186, 50,
-        334, 334, 334, 334, 334, 334, 334, 330, 334, 334,
-        22, 19, 334, 334, 51, 48, 290, 259, 266, 334,
-        222, 334, 103, 1, 334, 207, 334, 334, 334, 25,
-        334, 349, 334, 10, 128, 219, 334, 96, 7, 107,
-        334, 42, 334, 237, 132, 334, 334, 27, 261, 334,
-        256, 334, 260, 334, 6, 334, 334, 50, 334, 334,
-        334, 334, 334, 334, 334, 334, 334, 334, 334, 334,
-        334, 334, 51, 48, 290, 259, 266, 334, 222, 334,
-        103, 1, 334, 334, 334, 334, 334, 334, 334, 334,
-        334, 10, 124, 219, 334, 96, 7, 107, 334, 334,
-        334, 334, 132, 334, 334, 334, 261, 334, 256, 334,
-        260, 334, 28, 334, 334, 50, 334, 334, 334, 334,
-        334, 334, 334, 334, 334, 334, 334, 334, 334, 334,
-        51, 48, 290, 259, 266, 334, 222, 334, 103, 1,
-        334, 334, 334, 334, 334, 334, 334, 334, 334, 10,
-        135, 208, 334, 96, 7, 107, 334, 334, 334, 334,
-        132, 334, 334, 334, 261, 334, 256, 334, 260, 334,
-        28, 334, 334, 50, 334, 334, 334, 334, 334, 334,
-        334, 334, 334, 334, 334, 334, 334, 334, 51, 48,
-        290, 259, 266, 334, 222, 334, 103, 1, 334, 334,
-        334, 334, 334, 334, 334, 334, 334, 10, 136, 219,
-        334, 96, 7, 107, 334, 334, 334, 334, 132, 334,
-        334, 334, 261, 334, 256, 334, 260, 334, 23, 334,
-        334, 50, 334, 334, 334, 475, 334, 334, 334, 334,
-        334, 334, 334, 334, 334, 334, 51, 48, 290, 259,
-        266, 334, 222, 334, 103, 334, 244, 475, 334, 475,
-        475, 129, 475, 475, 80, 138, 334, 334, 475, 96,
-        475, 485, 475, 282, 319, 334, 334, 214, 217, 286,
-        262, 334, 307, 334, 334, 334, 334, 334, 334, 334,
-        334, 334, 227, 309, 485, 334, 334, 244, 334, 475,
-        334, 334, 149, 334, 334, 70, 138, 334, 334, 334,
-        334, 334, 334, 475, 282, 319, 334, 334, 214, 217,
-        286, 262, 334, 307, 334, 334, 334, 334, 334, 334,
-        224, 334, 334, 334, 244, 334, 334, 334, 334, 149,
-        334, 334, 70, 138, 334, 334, 334, 334, 334, 334,
-        334, 282, 319, 334, 334, 214, 217, 286, 262, 334,
-        307, 244, 334, 334, 334, 334, 149, 223, 334, 70,
-        138, 334, 334, 334, 334, 334, 334, 334, 282, 319,
-        334, 244, 214, 217, 286, 262, 149, 307, 334, 54,
-        115, 141, 334, 334, 226, 334, 334, 334, 282, 319,
-        334, 244, 214, 217, 286, 262, 149, 307, 334, 66,
-        115, 228, 334, 334, 334, 334, 334, 334, 282, 319,
-        334, 334, 214, 217, 286, 262, 334, 307, 334, 334,
-        244, 334, 334, 334, 334, 129, 334, 334, 80, 138,
-        334, 334, 334, 334, 334, 334, 334, 282, 319, 334,
-        334, 214, 217, 286, 262, 244, 307, 334, 334, 334,
-        149, 334, 334, 62, 138, 334, 244, 308, 334, 334,
-        334, 149, 282, 319, 63, 138, 214, 217, 286, 262,
-        334, 307, 334, 282, 319, 334, 244, 214, 217, 286,
-        262, 149, 307, 334, 86, 138, 334, 244, 334, 334,
-        334, 334, 149, 282, 319, 88, 138, 214, 217, 286,
-        262, 334, 307, 334, 282, 319, 334, 334, 214, 217,
-        286, 262, 334, 307, 334, 334, 244, 334, 334, 334,
-        334, 149, 334, 334, 89, 138, 334, 334, 334, 334,
-        334, 334, 334, 282, 319, 334, 334, 214, 217, 286,
-        262, 244, 307, 334, 334, 334, 149, 334, 334, 64,
-        138, 334, 244, 334, 334, 334, 334, 149, 282, 319,
-        83, 138, 214, 217, 286, 262, 334, 307, 334, 282,
-        319, 334, 244, 214, 217, 286, 262, 149, 307, 334,
-        59, 138, 334, 244, 334, 334, 334, 334, 94, 282,
-        319, 53, 116, 214, 217, 286, 262, 334, 307, 334,
-        282, 319, 334, 334, 210, 217, 286, 262, 334, 307,
-        334, 334, 244, 334, 334, 334, 334, 149, 334, 334,
-        85, 138, 334, 334, 334, 334, 334, 334, 334, 282,
-        319, 334, 334, 214, 217, 286, 262, 244, 307, 334,
-        334, 334, 149, 334, 334, 61, 138, 334, 244, 334,
-        334, 334, 334, 149, 282, 319, 60, 138, 214, 217,
-        286, 262, 334, 307, 334, 282, 319, 334, 244, 214,
-        217, 286, 262, 94, 307, 334, 57, 116, 334, 244,
-        334, 334, 334, 334, 149, 282, 319, 71, 138, 214,
-        217, 286, 262, 334, 307, 334, 282, 319, 334, 334,
-        214, 217, 286, 262, 334, 307, 334, 334, 244, 334,
-        334, 334, 334, 149, 334, 334, 87, 138, 334, 334,
-        334, 334, 334, 334, 334, 282, 319, 334, 334, 214,
-        217, 286, 262, 244, 307, 334, 334, 334, 149, 334,
-        334, 68, 138, 334, 244, 334, 334, 334, 334, 149,
-        282, 319, 67, 138, 214, 217, 286, 262, 334, 307,
-        334, 282, 319, 334, 244, 214, 217, 286, 262, 149,
-        307, 334, 76, 138, 334, 244, 334, 334, 334, 334,
-        149, 282, 319, 58, 138, 214, 217, 286, 262, 334,
-        307, 334, 282, 319, 334, 334, 214, 217, 286, 262,
-        334, 307, 334, 334, 244, 334, 334, 334, 334, 149,
-        334, 334, 84, 138, 334, 334, 334, 334, 334, 334,
-        334, 282, 319, 334, 334, 214, 217, 286, 262, 244,
-        307, 334, 334, 334, 149, 334, 334, 90, 138, 334,
-        244, 334, 334, 334, 334, 114, 282, 319, 72, 138,
-        214, 217, 286, 262, 334, 307, 334, 282, 319, 334,
-        244, 214, 217, 286, 262, 149, 307, 334, 66, 138,
-        334, 244, 334, 334, 334, 334, 149, 282, 319, 79,
-        138, 214, 217, 286, 262, 334, 307, 334, 282, 319,
-        334, 334, 214, 217, 286, 262, 334, 307, 334, 334,
-        244, 334, 334, 334, 334, 149, 334, 334, 75, 138,
-        334, 334, 334, 334, 334, 334, 334, 282, 319, 334,
-        334, 214, 217, 286, 262, 244, 307, 334, 334, 334,
-        149, 334, 334, 82, 138, 334, 244, 334, 334, 334,
-        334, 149, 282, 319, 81, 138, 214, 217, 286, 262,
-        334, 307, 334, 282, 319, 334, 244, 214, 217, 286,
-        262, 149, 307, 334, 77, 138, 334, 244, 334, 334,
-        334, 334, 149, 282, 319, 78, 138, 214, 217, 286,
-        262, 334, 307, 334, 282, 319, 334, 334, 214, 217,
-        286, 262, 334, 307, 334, 334, 244, 334, 334, 334,
-        334, 127, 334, 334, 56, 138, 334, 334, 334, 334,
-        334, 334, 334, 282, 319, 334, 334, 214, 217, 286,
-        262, 244, 307, 334, 334, 334, 149, 334, 334, 52,
-        138, 334, 244, 334, 334, 334, 334, 149, 282, 319,
-        65, 138, 214, 217, 286, 262, 334, 307, 334, 282,
-        319, 334, 244, 211, 217, 286, 262, 111, 307, 334,
-        73, 138, 334, 244, 334, 334, 334, 334, 149, 282,
-        319, 74, 138, 214, 217, 286, 262, 334, 307, 334,
-        282, 319, 334, 334, 214, 217, 286, 262, 334, 307,
-        334, 334, 244, 334, 334, 334, 334, 149, 334, 334,
-        55, 138, 334, 334, 334, 334, 334, 334, 334, 282,
-        319, 334, 334, 214, 217, 286, 262, 244, 307, 334,
-        334, 334, 110, 334, 334, 69, 138, 244, 334, 334,
-        334, 334, 152, 334, 282, 319, 138, 244, 214, 217,
-        286, 262, 146, 307, 334, 345, 138, 334, 215, 217,
-        286, 262, 334, 307, 334, 334, 334, 244, 215, 217,
-        286, 262, 145, 307, 244, 334, 138, 334, 334, 154,
-        334, 334, 334, 138, 334, 334, 334, 334, 215, 217,
-        286, 262, 334, 307, 334, 215, 217, 286, 262, 244,
-        307, 334, 334, 334, 153, 334, 334, 244, 138, 334,
-        334, 334, 148, 334, 334, 334, 138, 334, 334, 334,
-        215, 217, 286, 262, 334, 307, 102, 173, 215, 217,
-        286, 262, 334, 307, 334, 334, 330, 334, 334, 22,
-        19, 334, 191, 188, 334, 334, 334, 191, 177, 191,
-        180, 334, 330, 334, 207, 22, 19, 330, 334, 330,
-        22, 19, 22, 19, 334, 334, 334, 334, 334, 334,
-        207, 334, 334, 334, 334, 207, 334, 207,
-    );
-    static public $yy_lookahead = array(
-        1, 4, 5, 6, 7, 8, 9, 10, 11, 12,
-        13, 14, 15, 117, 118, 18, 86, 87, 88, 89,
-        23, 24, 21, 22, 21, 22, 29, 28, 20, 30,
-        33, 18, 35, 20, 21, 36, 18, 19, 20, 26,
-        41, 42, 43, 44, 45, 46, 47, 48, 49, 50,
-        51, 52, 53, 54, 1, 37, 3, 84, 85, 86,
-        87, 88, 89, 62, 1, 62, 25, 68, 69, 70,
-        71, 72, 73, 74, 75, 76, 77, 78, 79, 38,
-        1, 32, 3, 30, 1, 1, 3, 3, 39, 36,
-        2, 20, 19, 20, 41, 42, 43, 44, 45, 46,
-        47, 48, 49, 50, 51, 52, 53, 54, 1, 30,
-        31, 62, 18, 30, 30, 36, 15, 16, 17, 36,
-        36, 68, 69, 70, 71, 72, 73, 74, 75, 76,
-        77, 78, 79, 39, 26, 64, 63, 30, 65, 18,
-        19, 20, 38, 36, 40, 39, 118, 39, 41, 42,
-        43, 44, 45, 46, 47, 48, 49, 50, 51, 52,
-        53, 54, 1, 55, 1, 3, 60, 38, 62, 18,
-        62, 20, 21, 67, 22, 68, 69, 70, 71, 72,
-        73, 74, 75, 76, 77, 78, 79, 87, 26, 81,
-        93, 94, 1, 30, 3, 18, 67, 20, 21, 36,
-        103, 39, 41, 42, 43, 44, 45, 46, 47, 48,
-        49, 50, 51, 52, 53, 54, 1, 55, 121, 94,
-        115, 30, 117, 118, 62, 125, 126, 36, 103, 68,
-        69, 70, 71, 72, 73, 74, 75, 76, 77, 78,
-        79, 64, 81, 93, 94, 1, 121, 3, 2, 18,
-        93, 20, 18, 103, 20, 40, 41, 42, 43, 44,
-        45, 46, 47, 48, 49, 50, 51, 52, 53, 54,
-        1, 121, 3, 102, 30, 96, 97, 98, 121, 122,
-        36, 19, 20, 68, 69, 70, 71, 72, 73, 74,
-        75, 76, 77, 78, 79, 64, 93, 94, 64, 94,
-        122, 60, 93, 30, 93, 20, 103, 66, 103, 36,
-        41, 42, 43, 44, 45, 46, 47, 48, 49, 50,
-        51, 52, 53, 54, 121, 1, 121, 65, 60, 39,
-        121, 39, 121, 39, 66, 117, 118, 68, 69, 70,
-        71, 72, 73, 74, 75, 76, 77, 78, 79, 25,
-        21, 26, 62, 38, 62, 40, 62, 38, 1, 40,
-        3, 1, 2, 19, 39, 41, 42, 43, 44, 45,
-        46, 47, 48, 49, 50, 51, 52, 53, 54, 1,
-        55, 3, 94, 39, 18, 88, 20, 62, 91, 60,
-        2, 103, 68, 69, 70, 71, 72, 73, 74, 75,
-        76, 77, 78, 79, 116, 26, 1, 94, 94, 21,
-        18, 18, 20, 20, 19, 20, 103, 103, 39, 41,
-        42, 43, 44, 45, 46, 47, 48, 49, 50, 51,
-        52, 53, 54, 1, 121, 121, 94, 32, 30, 102,
-        114, 62, 116, 100, 36, 103, 68, 69, 70, 71,
-        72, 73, 74, 75, 76, 77, 78, 79, 116, 116,
-        112, 94, 18, 93, 20, 114, 18, 119, 20, 1,
-        103, 37, 100, 41, 42, 43, 44, 45, 46, 47,
-        48, 49, 50, 51, 52, 53, 54, 1, 116, 3,
-        22, 121, 96, 97, 114, 96, 97, 100, 100, 67,
-        68, 69, 70, 71, 72, 73, 74, 75, 76, 77,
-        78, 79, 87, 116, 116, 94, 112, 114, 20, 116,
-        60, 102, 37, 119, 103, 67, 100, 41, 42, 43,
-        44, 45, 46, 47, 48, 49, 50, 51, 52, 53,
-        54, 1, 116, 20, 94, 3, 3, 27, 19, 19,
-        19, 126, 100, 103, 68, 69, 70, 71, 72, 73,
-        74, 75, 76, 77, 78, 79, 116, 94, 116, 20,
-        20, 31, 65, 19, 56, 20, 103, 21, 11, 40,
-        100, 41, 42, 43, 44, 45, 46, 47, 48, 49,
-        50, 51, 52, 53, 54, 1, 116, 20, 94, 20,
-        39, 20, 3, 2, 39, 19, 101, 103, 68, 69,
-        70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
-        116, 116, 65, 20, 103, 115, 114, 121, 114, 116,
-        119, 99, 30, 99, 40, 41, 42, 43, 44, 45,
-        46, 47, 48, 49, 50, 51, 52, 53, 54, 1,
-        114, 3, 90, 16, 127, 114, 127, 127, 100, 100,
-        100, 127, 68, 69, 70, 71, 72, 73, 74, 75,
-        76, 77, 78, 79, 116, 116, 116, 127, 127, 127,
-        127, 127, 127, 127, 127, 127, 127, 127, 22, 41,
-        42, 43, 44, 45, 46, 47, 48, 49, 50, 51,
-        52, 53, 54, 1, 2, 127, 127, 127, 127, 127,
-        127, 127, 127, 127, 127, 127, 68, 69, 70, 71,
-        72, 73, 74, 75, 76, 77, 78, 79, 62, 127,
-        127, 127, 127, 127, 127, 127, 127, 127, 127, 127,
-        127, 127, 127, 41, 42, 43, 44, 45, 46, 47,
-        48, 49, 50, 51, 52, 53, 54, 1, 127, 127,
-        127, 127, 127, 127, 127, 127, 127, 127, 127, 127,
-        68, 69, 70, 71, 72, 73, 74, 75, 76, 77,
-        78, 79, 127, 127, 127, 127, 127, 127, 127, 127,
-        127, 127, 127, 127, 127, 127, 127, 41, 42, 43,
-        44, 45, 46, 47, 48, 49, 50, 51, 52, 53,
-        54, 127, 127, 127, 127, 127, 127, 127, 127, 127,
-        127, 127, 127, 127, 68, 69, 70, 71, 72, 73,
-        74, 75, 76, 77, 78, 79, 127, 127, 127, 41,
-        42, 43, 44, 45, 46, 47, 48, 49, 50, 51,
-        52, 53, 54, 127, 127, 127, 127, 127, 127, 127,
-        127, 127, 127, 127, 127, 127, 68, 69, 70, 71,
-        72, 73, 74, 75, 76, 77, 78, 79, 127, 127,
-        127, 11, 127, 127, 127, 18, 19, 20, 18, 127,
-        23, 24, 87, 23, 24, 96, 29, 92, 127, 29,
-        33, 96, 35, 33, 37, 35, 39, 108, 109, 42,
-        105, 127, 113, 108, 109, 110, 111, 127, 113, 18,
-        127, 20, 127, 96, 57, 58, 59, 60, 61, 127,
-        63, 30, 65, 66, 67, 108, 22, 36, 127, 127,
-        113, 127, 93, 18, 19, 20, 127, 80, 23, 24,
-        80, 81, 82, 127, 29, 106, 107, 127, 33, 34,
-        35, 127, 37, 127, 39, 93, 94, 42, 127, 127,
-        121, 127, 127, 127, 60, 103, 127, 127, 106, 107,
-        66, 127, 57, 58, 59, 60, 61, 127, 63, 127,
-        65, 66, 127, 121, 127, 127, 127, 11, 127, 127,
-        127, 18, 19, 20, 18, 80, 23, 24, 127, 23,
-        24, 127, 29, 127, 127, 29, 33, 127, 35, 33,
-        37, 35, 39, 127, 127, 42, 127, 127, 127, 127,
-        127, 127, 127, 127, 127, 127, 127, 127, 127, 127,
-        57, 58, 59, 60, 61, 127, 63, 127, 65, 66,
-        1, 127, 3, 127, 3, 127, 127, 127, 127, 18,
-        19, 20, 127, 80, 23, 24, 80, 81, 82, 127,
-        29, 22, 21, 127, 33, 127, 35, 127, 37, 30,
-        39, 30, 127, 42, 127, 36, 127, 36, 39, 127,
-        39, 127, 127, 127, 127, 127, 127, 127, 57, 58,
-        59, 60, 61, 87, 63, 127, 65, 66, 92, 127,
-        127, 62, 96, 62, 127, 127, 127, 18, 19, 20,
-        127, 80, 23, 24, 108, 109, 110, 111, 29, 113,
-        127, 18, 33, 20, 35, 127, 37, 127, 39, 127,
-        127, 42, 127, 30, 127, 32, 127, 127, 127, 36,
-        127, 127, 127, 127, 127, 127, 57, 58, 59, 60,
-        61, 127, 63, 127, 65, 66, 127, 127, 127, 127,
-        127, 127, 127, 127, 127, 18, 19, 20, 127, 80,
-        23, 24, 127, 127, 127, 127, 29, 127, 127, 127,
-        33, 127, 35, 127, 37, 127, 39, 93, 94, 42,
-        127, 127, 127, 127, 127, 127, 127, 103, 127, 127,
-        106, 107, 127, 127, 57, 58, 59, 60, 61, 127,
-        63, 127, 65, 66, 127, 121, 127, 127, 127, 18,
-        127, 20, 127, 18, 19, 20, 127, 80, 23, 24,
-        127, 30, 127, 32, 29, 127, 127, 36, 33, 127,
-        35, 127, 37, 127, 39, 127, 127, 42, 127, 127,
-        127, 127, 127, 127, 127, 127, 127, 127, 127, 127,
-        127, 127, 57, 58, 59, 60, 61, 127, 63, 127,
-        65, 66, 127, 127, 127, 127, 127, 127, 127, 127,
-        127, 18, 19, 20, 127, 80, 23, 24, 127, 127,
-        127, 127, 29, 127, 127, 127, 33, 127, 35, 127,
-        37, 127, 39, 127, 127, 42, 127, 127, 127, 127,
-        127, 127, 127, 127, 127, 127, 127, 127, 127, 127,
-        57, 58, 59, 60, 61, 127, 63, 127, 65, 66,
-        127, 127, 127, 127, 127, 127, 127, 127, 127, 18,
-        19, 20, 127, 80, 23, 24, 127, 127, 127, 127,
-        29, 127, 127, 127, 33, 127, 35, 127, 37, 127,
-        39, 127, 127, 42, 127, 127, 127, 127, 127, 127,
-        127, 127, 127, 127, 127, 127, 127, 127, 57, 58,
-        59, 60, 61, 127, 63, 127, 65, 66, 127, 127,
-        127, 127, 127, 127, 127, 127, 127, 18, 19, 20,
-        127, 80, 23, 24, 127, 127, 127, 127, 29, 127,
-        127, 127, 33, 127, 35, 127, 37, 127, 39, 127,
-        127, 42, 127, 127, 127, 3, 127, 127, 127, 127,
-        127, 127, 127, 127, 127, 127, 57, 58, 59, 60,
-        61, 127, 63, 127, 65, 127, 87, 25, 127, 27,
-        28, 92, 30, 31, 95, 96, 127, 127, 36, 80,
-        38, 39, 40, 104, 105, 127, 127, 108, 109, 110,
-        111, 127, 113, 127, 127, 127, 127, 127, 127, 127,
-        127, 127, 123, 124, 62, 127, 127, 87, 127, 67,
-        127, 127, 92, 127, 127, 95, 96, 127, 127, 127,
-        127, 127, 127, 81, 104, 105, 127, 127, 108, 109,
-        110, 111, 127, 113, 127, 127, 127, 127, 127, 127,
-        120, 127, 127, 127, 87, 127, 127, 127, 127, 92,
-        127, 127, 95, 96, 127, 127, 127, 127, 127, 127,
-        127, 104, 105, 127, 127, 108, 109, 110, 111, 127,
-        113, 87, 127, 127, 127, 127, 92, 120, 127, 95,
-        96, 127, 127, 127, 127, 127, 127, 127, 104, 105,
-        127, 87, 108, 109, 110, 111, 92, 113, 127, 95,
-        96, 97, 127, 127, 120, 127, 127, 127, 104, 105,
-        127, 87, 108, 109, 110, 111, 92, 113, 127, 95,
-        96, 97, 127, 127, 127, 127, 127, 127, 104, 105,
-        127, 127, 108, 109, 110, 111, 127, 113, 127, 127,
-        87, 127, 127, 127, 127, 92, 127, 127, 95, 96,
-        127, 127, 127, 127, 127, 127, 127, 104, 105, 127,
-        127, 108, 109, 110, 111, 87, 113, 127, 127, 127,
-        92, 127, 127, 95, 96, 127, 87, 124, 127, 127,
-        127, 92, 104, 105, 95, 96, 108, 109, 110, 111,
-        127, 113, 127, 104, 105, 127, 87, 108, 109, 110,
-        111, 92, 113, 127, 95, 96, 127, 87, 127, 127,
-        127, 127, 92, 104, 105, 95, 96, 108, 109, 110,
-        111, 127, 113, 127, 104, 105, 127, 127, 108, 109,
-        110, 111, 127, 113, 127, 127, 87, 127, 127, 127,
-        127, 92, 127, 127, 95, 96, 127, 127, 127, 127,
-        127, 127, 127, 104, 105, 127, 127, 108, 109, 110,
-        111, 87, 113, 127, 127, 127, 92, 127, 127, 95,
-        96, 127, 87, 127, 127, 127, 127, 92, 104, 105,
-        95, 96, 108, 109, 110, 111, 127, 113, 127, 104,
-        105, 127, 87, 108, 109, 110, 111, 92, 113, 127,
-        95, 96, 127, 87, 127, 127, 127, 127, 92, 104,
-        105, 95, 96, 108, 109, 110, 111, 127, 113, 127,
-        104, 105, 127, 127, 108, 109, 110, 111, 127, 113,
-        127, 127, 87, 127, 127, 127, 127, 92, 127, 127,
-        95, 96, 127, 127, 127, 127, 127, 127, 127, 104,
-        105, 127, 127, 108, 109, 110, 111, 87, 113, 127,
-        127, 127, 92, 127, 127, 95, 96, 127, 87, 127,
-        127, 127, 127, 92, 104, 105, 95, 96, 108, 109,
-        110, 111, 127, 113, 127, 104, 105, 127, 87, 108,
-        109, 110, 111, 92, 113, 127, 95, 96, 127, 87,
-        127, 127, 127, 127, 92, 104, 105, 95, 96, 108,
-        109, 110, 111, 127, 113, 127, 104, 105, 127, 127,
-        108, 109, 110, 111, 127, 113, 127, 127, 87, 127,
-        127, 127, 127, 92, 127, 127, 95, 96, 127, 127,
-        127, 127, 127, 127, 127, 104, 105, 127, 127, 108,
-        109, 110, 111, 87, 113, 127, 127, 127, 92, 127,
-        127, 95, 96, 127, 87, 127, 127, 127, 127, 92,
-        104, 105, 95, 96, 108, 109, 110, 111, 127, 113,
-        127, 104, 105, 127, 87, 108, 109, 110, 111, 92,
-        113, 127, 95, 96, 127, 87, 127, 127, 127, 127,
-        92, 104, 105, 95, 96, 108, 109, 110, 111, 127,
-        113, 127, 104, 105, 127, 127, 108, 109, 110, 111,
-        127, 113, 127, 127, 87, 127, 127, 127, 127, 92,
-        127, 127, 95, 96, 127, 127, 127, 127, 127, 127,
-        127, 104, 105, 127, 127, 108, 109, 110, 111, 87,
-        113, 127, 127, 127, 92, 127, 127, 95, 96, 127,
-        87, 127, 127, 127, 127, 92, 104, 105, 95, 96,
-        108, 109, 110, 111, 127, 113, 127, 104, 105, 127,
-        87, 108, 109, 110, 111, 92, 113, 127, 95, 96,
-        127, 87, 127, 127, 127, 127, 92, 104, 105, 95,
-        96, 108, 109, 110, 111, 127, 113, 127, 104, 105,
-        127, 127, 108, 109, 110, 111, 127, 113, 127, 127,
-        87, 127, 127, 127, 127, 92, 127, 127, 95, 96,
-        127, 127, 127, 127, 127, 127, 127, 104, 105, 127,
-        127, 108, 109, 110, 111, 87, 113, 127, 127, 127,
-        92, 127, 127, 95, 96, 127, 87, 127, 127, 127,
-        127, 92, 104, 105, 95, 96, 108, 109, 110, 111,
-        127, 113, 127, 104, 105, 127, 87, 108, 109, 110,
-        111, 92, 113, 127, 95, 96, 127, 87, 127, 127,
-        127, 127, 92, 104, 105, 95, 96, 108, 109, 110,
-        111, 127, 113, 127, 104, 105, 127, 127, 108, 109,
-        110, 111, 127, 113, 127, 127, 87, 127, 127, 127,
-        127, 92, 127, 127, 95, 96, 127, 127, 127, 127,
-        127, 127, 127, 104, 105, 127, 127, 108, 109, 110,
-        111, 87, 113, 127, 127, 127, 92, 127, 127, 95,
-        96, 127, 87, 127, 127, 127, 127, 92, 104, 105,
-        95, 96, 108, 109, 110, 111, 127, 113, 127, 104,
-        105, 127, 87, 108, 109, 110, 111, 92, 113, 127,
-        95, 96, 127, 87, 127, 127, 127, 127, 92, 104,
-        105, 95, 96, 108, 109, 110, 111, 127, 113, 127,
-        104, 105, 127, 127, 108, 109, 110, 111, 127, 113,
-        127, 127, 87, 127, 127, 127, 127, 92, 127, 127,
-        95, 96, 127, 127, 127, 127, 127, 127, 127, 104,
-        105, 127, 127, 108, 109, 110, 111, 87, 113, 127,
-        127, 127, 92, 127, 127, 95, 96, 87, 127, 127,
-        127, 127, 92, 127, 104, 105, 96, 87, 108, 109,
-        110, 111, 92, 113, 127, 105, 96, 127, 108, 109,
-        110, 111, 127, 113, 127, 127, 127, 87, 108, 109,
-        110, 111, 92, 113, 87, 127, 96, 127, 127, 92,
-        127, 127, 127, 96, 127, 127, 127, 127, 108, 109,
-        110, 111, 127, 113, 127, 108, 109, 110, 111, 87,
-        113, 127, 127, 127, 92, 127, 127, 87, 96, 127,
-        127, 127, 92, 127, 127, 127, 96, 127, 127, 127,
-        108, 109, 110, 111, 127, 113, 93, 94, 108, 109,
-        110, 111, 127, 113, 127, 127, 103, 127, 127, 106,
-        107, 127, 93, 94, 127, 127, 127, 93, 94, 93,
-        94, 127, 103, 127, 121, 106, 107, 103, 127, 103,
-        106, 107, 106, 107, 127, 127, 127, 127, 127, 127,
-        121, 127, 127, 127, 127, 121, 127, 121,
-    );
-    const YY_SHIFT_USE_DFLT = - 4;
-    const YY_SHIFT_MAX = 261;
-    static public $yy_shift_ofst = array(
-        - 3, 1157, 1099, 1099, 1099, 1157, 1215, 1215, 925, 867,
-        925, 1331, 1273, 1099, 1099, 1099, 1099, 1099, 1099, 1099,
-        1099, 1099, 1099, 1099, 1099, 1099, 1099, 1099, 1099, 1099,
-        1099, 1099, 983, 1099, 1099, 1099, 1099, 1099, 1099, 1099,
-        1099, 1099, 983, 1099, 1041, 1041, 1389, 1389, 1389, 1389,
-        1389, 1389, - 1, 53, 107, 107, 107, 107, 107, 486,
-        432, 594, 648, 702, 324, 161, 215, 378, 269, 540,
-        756, 756, 756, 756, 756, 756, 756, 756, 756, 756,
-        756, 756, 756, 756, 756, 756, 756, 756, 756, 798,
-        798, - 3, 1049, 73, 244, 163, 870, 1211, 1113, 83,
-        901, 901, 83, 262, 163, 914, 163, 344, 360, 986,
-        79, 84, 13, 177, 191, 1, 3, 151, 234, 101,
-        393, 468, 444, 393, 448, 395, 392, 357, 366, 405,
-        393, 273, 408, 393, 393, 366, 393, 395, 666, 344,
-        393, 273, 344, 393, 393, 63, 63, 152, 63, 63,
-        63, 152, 63, 63, 63, 63, - 4, 121, 231, 273,
-        241, 268, 241, 268, 273, 241, 273, 273, 241, 273,
-        241, 273, 273, 273, 273, 273, 273, 273, 273, 273,
-        273, 273, 273, 273, 241, 241, 273, 94, 273, 63,
-        152, 63, 602, 63, 602, 565, 637, 152, 63, 63,
-        88, 152, 88, - 4, - 4, - 4, - 4, - 4, 1432, 1051,
-        162, 108, 106, 18, 325, 379, 49, 290, 41, 292,
-        71, 329, 294, 104, 319, 388, 315, 129, 539, 557,
-        565, 599, 556, 520, 543, 458, 529, 530, 550, 507,
-        549, 567, 531, 554, 542, 518, 601, 581, 577, 555,
-        523, 579, 561, 586, 246, 603, 498, 434, 285, 485,
-        460, 8,
-    );
-    const YY_REDUCE_USE_DFLT = - 105;
-    const YY_REDUCE_MAX = 207;
-    static public $yy_reduce_ofst = array(
-        - 27, 1369, 1474, 1410, 1447, 1543, 1514, 1494, 1706, 1771,
-        1791, 1639, 1579, 1664, 1610, 2090, 2155, 1898, 1831, 1599,
-        1675, 1695, 1802, 1760, 1856, 1867, 1735, 2175, 1983, 2023,
-        1887, 2059, 2240, 2119, 1568, 2079, 2144, 2215, 2186, 2048,
-        1927, 1952, 1963, 1994, 805, 2250, 2320, 2287, 2312, 2260,
-        1016, 2280, 872, 2333, 1104, 2349, 2354, 2333, 2356, 849,
-        849, 849, 849, 849, 849, 849, 849, 849, 849, 849,
-        849, 849, 849, 849, 849, 849, 849, 849, 849, 849,
-        849, 849, 849, 849, 849, 849, 849, 849, 849, 849,
-        849, - 70, 97, 799, 203, 150, 100, 450, 504, 313,
-        342, 288, 125, 827, 205, 105, 314, 179, 157, 425,
-        211, 211, 505, 326, 211, 218, 218, 326, 326, 297,
-        426, 370, 452, 480, 343, 348, 343, 211, 372, 211,
-        398, 421, 367, 397, 403, 343, 343, 404, 218, 399,
-        559, 473, 396, 558, 560, 211, 211, - 104, 211, 211,
-        209, 218, 211, 211, 211, 211, 211, 511, 513, 521,
-        510, 514, 510, 512, 521, 510, 521, 521, 510, 521,
-        510, 521, 521, 521, 521, 521, 521, 521, 521, 521,
-        521, 521, 521, 521, 510, 510, 521, 541, 521, 506,
-        28, 506, 532, 506, 534, 536, 562, 28, 506, 506,
-        178, 28, 178, 171, 419, 380, 351, 337,
-    );
-    static public $yyExpectedTokens = array(
-        array(4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 18, 23, 24, 29, 33, 35,),
-        array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 63, 65, 66, 80,),
-        array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 63, 65, 66, 80,),
-        array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 63, 65, 66, 80,),
-        array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 63, 65, 66, 80,),
-        array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 63, 65, 66, 80,),
-        array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 63, 65, 66, 80,),
-        array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 63, 65, 66, 80,),
-        array(18, 19, 20, 23, 24, 29, 33, 34, 35, 37, 39, 42, 57, 58, 59, 60, 61, 63, 65, 66, 80,),
-        array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 63, 65, 66, 67, 80,),
-        array(18, 19, 20, 23, 24, 29, 33, 34, 35, 37, 39, 42, 57, 58, 59, 60, 61, 63, 65, 66, 80,),
-        array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 63, 65, 66, 80,),
-        array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 63, 65, 66, 80,),
-        array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 63, 65, 66, 80,),
-        array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 63, 65, 66, 80,),
-        array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 63, 65, 66, 80,),
-        array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 63, 65, 66, 80,),
-        array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 63, 65, 66, 80,),
-        array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 63, 65, 66, 80,),
-        array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 63, 65, 66, 80,),
-        array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 63, 65, 66, 80,),
-        array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 63, 65, 66, 80,),
-        array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 63, 65, 66, 80,),
-        array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 63, 65, 66, 80,),
-        array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 63, 65, 66, 80,),
-        array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 63, 65, 66, 80,),
-        array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 63, 65, 66, 80,),
-        array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 63, 65, 66, 80,),
-        array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 63, 65, 66, 80,),
-        array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 63, 65, 66, 80,),
-        array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 63, 65, 66, 80,),
-        array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 63, 65, 66, 80,),
-        array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 63, 65, 66, 80,),
-        array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 63, 65, 66, 80,),
-        array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 63, 65, 66, 80,),
-        array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 63, 65, 66, 80,),
-        array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 63, 65, 66, 80,),
-        array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 63, 65, 66, 80,),
-        array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 63, 65, 66, 80,),
-        array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 63, 65, 66, 80,),
-        array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 63, 65, 66, 80,),
-        array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 63, 65, 66, 80,),
-        array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 63, 65, 66, 80,),
-        array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 63, 65, 66, 80,),
-        array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 63, 65, 66, 80,),
-        array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 63, 65, 66, 80,),
-        array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 63, 65, 80,),
-        array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 63, 65, 80,),
-        array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 63, 65, 80,),
-        array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 63, 65, 80,),
-        array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 63, 65, 80,),
-        array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 63, 65, 80,),
-        array(1, 28, 30, 36, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,),
-        array(1, 3, 30, 36, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,),
-        array(1, 30, 36, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,),
-        array(1, 30, 36, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,),
-        array(1, 30, 36, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,),
-        array(1, 30, 36, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,),
-        array(1, 30, 36, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,),
-        array(1, 3, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,),
-        array(1, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,),
-        array(1, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,),
-        array(1, 3, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,),
-        array(1, 2, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,),
-        array(1, 25, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,),
-        array(1, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 81,),
-        array(1, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,),
-        array(1, 3, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,),
-        array(1, 3, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,),
-        array(1, 31, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,),
-        array(1, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,),
-        array(1, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,),
-        array(1, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,),
-        array(1, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,),
-        array(1, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,),
-        array(1, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,),
-        array(1, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,),
-        array(1, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,),
-        array(1, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,),
-        array(1, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,),
-        array(1, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,),
-        array(1, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,),
-        array(1, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,),
-        array(1, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,),
-        array(1, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,),
-        array(1, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,),
-        array(1, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,),
-        array(1, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,),
-        array(1, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,),
-        array(41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,),
-        array(41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,),
-        array(4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 18, 23, 24, 29, 33, 35,),
-        array(1, 3, 22, 30, 36, 39, 62,),
-        array(19, 20, 63, 65,),
-        array(1, 3, 30, 36,),
-        array(1, 30, 36,),
-        array(11, 18, 23, 24, 29, 33, 35, 80, 81, 82,),
-        array(18, 20, 30, 32, 36,),
-        array(18, 20, 30, 32, 36,),
-        array(1, 3, 30, 36,),
-        array(18, 20, 30, 36,),
-        array(18, 20, 30, 36,),
-        array(1, 3, 30, 36,),
-        array(19, 20, 65,),
-        array(1, 30, 36,),
-        array(22, 60, 66,),
-        array(1, 30, 36,),
-        array(19, 39,),
-        array(1, 2,),
-        array(11, 18, 23, 24, 29, 33, 35, 80, 81, 82,),
-        array(1, 3, 30, 31, 36,),
-        array(1, 3, 30, 36,),
-        array(18, 20, 21, 26,),
-        array(18, 20, 21, 64,),
-        array(1, 3, 30, 36,),
-        array(21, 22, 62,),
-        array(21, 22, 62,),
-        array(18, 20, 21,),
-        array(18, 20, 64,),
-        array(15, 16, 17,),
-        array(18, 20,),
-        array(1, 22,),
-        array(18, 20,),
-        array(18, 20,),
-        array(18, 20,),
-        array(19, 20,),
-        array(18, 20,),
-        array(1, 3,),
-        array(18, 20,),
-        array(1, 32,),
-        array(18, 20,),
-        array(30, 36,),
-        array(30, 36,),
-        array(18, 20,),
-        array(18, 20,),
-        array(18, 20,),
-        array(18, 20,),
-        array(19, 20,),
-        array(22, 62,),
-        array(19, 39,),
-        array(18, 20,),
-        array(30, 36,),
-        array(19, 39,),
-        array(18, 20,),
-        array(18, 20,),
-        array(1,),
-        array(1,),
-        array(22,),
-        array(1,),
-        array(1,),
-        array(1,),
-        array(22,),
-        array(1,),
-        array(1,),
-        array(1,),
-        array(1,),
-        array(),
-        array(18, 19, 20,),
-        array(18, 20, 64,),
-        array(30, 36,),
-        array(60, 66,),
-        array(60, 66,),
-        array(60, 66,),
-        array(60, 66,),
-        array(30, 36,),
-        array(60, 66,),
-        array(30, 36,),
-        array(30, 36,),
-        array(60, 66,),
-        array(30, 36,),
-        array(60, 66,),
-        array(30, 36,),
-        array(30, 36,),
-        array(30, 36,),
-        array(30, 36,),
-        array(30, 36,),
-        array(30, 36,),
-        array(30, 36,),
-        array(30, 36,),
-        array(30, 36,),
-        array(30, 36,),
-        array(30, 36,),
-        array(30, 36,),
-        array(30, 36,),
-        array(60, 66,),
-        array(60, 66,),
-        array(30, 36,),
-        array(18, 39,),
-        array(30, 36,),
-        array(1,),
-        array(22,),
-        array(1,),
-        array(30,),
-        array(1,),
-        array(30,),
-        array(39,),
-        array(16,),
-        array(22,),
-        array(1,),
-        array(1,),
-        array(2,),
-        array(22,),
-        array(2,),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(3, 25, 27, 28, 30, 31, 36, 38, 39, 40, 62, 67, 81,),
-        array(3, 21, 30, 36, 39, 62,),
-        array(3, 26, 39, 55, 62,),
-        array(26, 39, 55, 62, 81,),
-        array(39, 60, 62, 67,),
-        array(18, 19, 20, 37,),
-        array(26, 39, 55, 62,),
-        array(26, 39, 62,),
-        array(32, 39, 62,),
-        array(39, 62,),
-        array(25, 38,),
-        array(39, 62,),
-        array(20, 64,),
-        array(21, 60,),
-        array(39, 62,),
-        array(38, 40,),
-        array(38, 40,),
-        array(2, 21,),
-        array(38, 40,),
-        array(38, 67,),
-        array(40,),
-        array(65,),
-        array(39,),
-        array(3,),
-        array(21,),
-        array(27,),
-        array(3,),
-        array(67,),
-        array(19,),
-        array(19,),
-        array(20,),
-        array(65,),
-        array(20,),
-        array(11,),
-        array(19,),
-        array(19,),
-        array(3,),
-        array(56,),
-        array(2,),
-        array(20,),
-        array(20,),
-        array(20,),
-        array(20,),
-        array(20,),
-        array(39,),
-        array(19,),
-        array(2,),
-        array(20,),
-        array(20,),
-        array(37,),
-        array(20,),
-        array(37,),
-        array(60,),
-        array(20,),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-    );
-    static public $yy_default = array(
-        368, 553, 524, 524, 524, 570, 570, 570, 570, 570,
-        570, 570, 570, 570, 570, 570, 570, 570, 570, 570,
-        570, 570, 570, 570, 570, 570, 570, 570, 570, 570,
-        570, 570, 570, 570, 570, 570, 570, 570, 570, 570,
-        570, 570, 570, 570, 570, 570, 570, 570, 570, 570,
-        570, 570, 427, 570, 404, 427, 396, 427, 427, 570,
-        570, 570, 570, 570, 570, 570, 570, 570, 570, 432,
-        523, 448, 432, 429, 434, 460, 457, 522, 554, 555,
-        556, 456, 438, 452, 437, 453, 451, 461, 409, 463,
-        464, 365, 475, 570, 440, 427, 570, 427, 427, 482,
-        427, 427, 447, 570, 427, 536, 427, 570, 418, 570,
-        440, 440, 570, 497, 440, 488, 488, 497, 497, 570,
-        570, 421, 570, 570, 570, 570, 570, 440, 570, 440,
-        570, 427, 427, 570, 497, 570, 570, 570, 488, 570,
-        570, 406, 570, 570, 570, 467, 444, 533, 443, 440,
-        423, 488, 450, 468, 445, 466, 531, 570, 498, 415,
-        516, 491, 515, 493, 414, 492, 408, 392, 494, 399,
-        517, 413, 403, 394, 391, 417, 402, 397, 407, 401,
-        398, 393, 411, 416, 495, 514, 405, 497, 412, 482,
-        537, 447, 569, 422, 569, 497, 387, 511, 424, 419,
-        525, 534, 526, 530, 530, 497, 497, 530, 442, 475,
-        465, 465, 475, 570, 465, 465, 475, 570, 570, 475,
-        570, 471, 483, 570, 570, 509, 570, 570, 570, 570,
-        509, 570, 570, 435, 570, 570, 570, 570, 570, 570,
-        570, 378, 570, 570, 570, 477, 509, 570, 570, 570,
-        570, 570, 535, 570, 509, 570, 570, 473, 570, 570,
-        471, 570, 479, 383, 480, 428, 478, 380, 379, 381,
-        502, 528, 481, 484, 532, 382, 510, 527, 477, 410,
-        377, 370, 441, 371, 372, 442, 476, 474, 367, 366,
-        470, 369, 472, 373, 374, 507, 499, 500, 436, 501,
-        520, 376, 439, 489, 496, 375, 568, 490, 552, 551,
-        486, 550, 425, 487, 485, 389, 548, 547, 549, 446,
-        462, 560, 567, 559, 512, 558, 557, 564, 469, 562,
-        426, 566, 563, 561, 565, 546, 545, 454, 508, 503,
-        455, 458, 505, 504, 506, 449, 519, 420, 513, 509,
-        459, 538, 386, 385, 521, 544, 388, 543, 384, 540,
-        539, 518, 541, 542, 529,
-    );
-    const YYNOCODE = 128;
     const YYSTACKDEPTH = 500;
-    const YYNSTATE = 365;
-    const YYNRULE = 205;
-    const YYERRORSYMBOL = 83;
+
+    const YYNSTATE = 337;
+
+    const YYNRULE = 194;
+
+    const YYERRORSYMBOL = 60;
+
     const YYERRSYMDT = 'yy0';
+
     const YYFALLBACK = 0;
+
     public static $yyFallback = array();
 
     public function Trace($TraceFILE, $zTracePrompt)
@@ -1316,253 +739,98 @@ class Smarty_Internal_Templateparser
     }
 
     public $yyTraceFILE;
+
     public $yyTracePrompt;
+
     public $yyidx;                    /* Index of top element in stack */
     public $yyerrcnt;                 /* Shifts left before out of the error */
     public $yystack = array();  /* The parser's stack */
 
-    public $yyTokenName = array(
-        '$', 'VERT', 'COLON', 'RDEL',
-        'COMMENT', 'PHPSTARTTAG', 'PHPENDTAG', 'PHPENDSCRIPT',
-        'ASPSTARTTAG', 'ASPENDTAG', 'XMLTAG', 'TEXT',
-        'STRIPON', 'STRIPOFF', 'BLOCKSOURCE', 'LITERALSTART',
-        'LITERALEND', 'LITERAL', 'LDEL', 'DOLLAR',
-        'ID', 'EQUAL', 'PTR', 'LDELIF',
-        'LDELFOR', 'SEMICOLON', 'INCDEC', 'TO',
-        'STEP', 'LDELFOREACH', 'SPACE', 'AS',
-        'APTR', 'LDELSETFILTER', 'SMARTYBLOCKCHILDPARENT', 'LDELSLASH',
-        'ATTR', 'INTEGER', 'COMMA', 'OPENP',
-        'CLOSEP', 'MATH', 'UNIMATH', 'ANDSYM',
-        'ISIN', 'ISDIVBY', 'ISNOTDIVBY', 'ISEVEN',
-        'ISNOTEVEN', 'ISEVENBY', 'ISNOTEVENBY', 'ISODD',
-        'ISNOTODD', 'ISODDBY', 'ISNOTODDBY', 'INSTANCEOF',
-        'QMARK', 'NOT', 'TYPECAST', 'HEX',
-        'DOT', 'SINGLEQUOTESTRING', 'DOUBLECOLON', 'NAMESPACE',
-        'AT', 'HATCH', 'OPENB', 'CLOSEB',
-        'EQUALS', 'NOTEQUALS', 'GREATERTHAN', 'LESSTHAN',
-        'GREATEREQUAL', 'LESSEQUAL', 'IDENTITY', 'NONEIDENTITY',
-        'MOD', 'LAND', 'LOR', 'LXOR',
-        'QUOTE', 'BACKTICK', 'DOLLARID', 'error',
-        'start', 'template', 'template_element', 'smartytag',
-        'literal', 'text_content', 'literal_elements', 'literal_element',
-        'value', 'modifierlist', 'attributes', 'expr',
-        'varindexed', 'statement', 'statements', 'optspace',
-        'varvar', 'foraction', 'modparameters', 'attribute',
-        'ternary', 'array', 'ifcond', 'lop',
-        'variable', 'ns1', 'function', 'doublequoted_with_quotes',
-        'static_class_access', 'object', 'arrayindex', 'indexdef',
-        'varvarele', 'objectchain', 'objectelement', 'method',
-        'params', 'modifier', 'modparameter', 'arrayelements',
-        'arrayelement', 'doublequoted', 'doublequotedcontent',
-    );
+    public $yyTokenName = array('$', 'VERT', 'COLON', 'PHP', 'TEXT', 'STRIPON', 'STRIPOFF', 'BLOCKSOURCE',
+        'LITERALSTART', 'LITERALEND', 'LITERAL', 'RDEL', 'SIMPELOUTPUT', 'LDEL', 'DOLLARID', 'EQUAL', 'SIMPLETAG', 'ID',
+        'PTR', 'LDELIF', 'LDELFOR', 'SEMICOLON', 'INCDEC', 'TO', 'STEP', 'LDELFOREACH', 'SPACE', 'AS', 'APTR',
+        'LDELSETFILTER', 'SMARTYBLOCKCHILDPARENT', 'CLOSETAG', 'LDELSLASH', 'ATTR', 'INTEGER', 'COMMA', 'OPENP',
+        'CLOSEP', 'MATH', 'UNIMATH', 'ISIN', 'INSTANCEOF', 'QMARK', 'NOT', 'TYPECAST', 'HEX', 'DOT',
+        'SINGLEQUOTESTRING', 'DOUBLECOLON', 'NAMESPACE', 'AT', 'HATCH', 'OPENB', 'CLOSEB', 'DOLLAR', 'LOGOP', 'TLOGOP',
+        'SINGLECOND', 'QUOTE', 'BACKTICK', 'error', 'start', 'template', 'template_element', 'smartytag', 'literal',
+        'text_content', 'literal_elements', 'literal_element', 'tag', 'variable', 'modifierlist', 'attributes', 'value',
+        'expr', 'varindexed', 'statement', 'statements', 'foraction', 'varvar', 'modparameters', 'attribute', 'ternary',
+        'array', 'lop', 'scond', 'ns1', 'function', 'doublequoted_with_quotes', 'static_class_access', 'object',
+        'arrayindex', 'indexdef', 'varvarele', 'objectchain', 'objectelement', 'method', 'params', 'modifier',
+        'modparameter', 'arrayelements', 'arrayelement', 'doublequoted', 'doublequotedcontent',);
 
-    public static $yyRuleName = array(
-        "start ::= template",
-        "template ::= template_element",
-        "template ::= template template_element",
-        "template ::=",
-        "template_element ::= smartytag RDEL",
-        "template_element ::= COMMENT",
-        "template_element ::= literal",
-        "template_element ::= PHPSTARTTAG",
-        "template_element ::= PHPENDTAG",
-        "template_element ::= PHPENDSCRIPT",
-        "template_element ::= ASPSTARTTAG",
-        "template_element ::= ASPENDTAG",
-        "template_element ::= XMLTAG",
-        "template_element ::= text_content",
-        "text_content ::= TEXT",
-        "text_content ::= text_content TEXT",
-        "template_element ::= STRIPON",
-        "template_element ::= STRIPOFF",
-        "template_element ::= BLOCKSOURCE",
-        "literal ::= LITERALSTART LITERALEND",
-        "literal ::= LITERALSTART literal_elements LITERALEND",
-        "literal_elements ::= literal_elements literal_element",
-        "literal_elements ::=",
-        "literal_element ::= literal",
-        "literal_element ::= LITERAL",
-        "smartytag ::= LDEL value",
-        "smartytag ::= LDEL value modifierlist attributes",
-        "smartytag ::= LDEL value attributes",
-        "smartytag ::= LDEL expr modifierlist attributes",
-        "smartytag ::= LDEL expr attributes",
-        "smartytag ::= LDEL DOLLAR ID EQUAL value",
-        "smartytag ::= LDEL DOLLAR ID EQUAL expr",
-        "smartytag ::= LDEL DOLLAR ID EQUAL expr attributes",
-        "smartytag ::= LDEL varindexed EQUAL expr attributes",
-        "smartytag ::= LDEL ID attributes",
-        "smartytag ::= LDEL ID",
-        "smartytag ::= LDEL ID modifierlist attributes",
-        "smartytag ::= LDEL ID PTR ID attributes",
-        "smartytag ::= LDEL ID PTR ID modifierlist attributes",
-        "smartytag ::= LDELIF expr",
-        "smartytag ::= LDELIF expr attributes",
-        "smartytag ::= LDELIF statement",
-        "smartytag ::= LDELIF statement attributes",
-        "smartytag ::= LDELFOR statements SEMICOLON optspace expr SEMICOLON optspace DOLLAR varvar foraction attributes",
-        "foraction ::= EQUAL expr",
-        "foraction ::= INCDEC",
-        "smartytag ::= LDELFOR statement TO expr attributes",
-        "smartytag ::= LDELFOR statement TO expr STEP expr attributes",
-        "smartytag ::= LDELFOREACH attributes",
-        "smartytag ::= LDELFOREACH SPACE value AS DOLLAR varvar attributes",
-        "smartytag ::= LDELFOREACH SPACE value AS DOLLAR varvar APTR DOLLAR varvar attributes",
-        "smartytag ::= LDELFOREACH SPACE expr AS DOLLAR varvar attributes",
-        "smartytag ::= LDELFOREACH SPACE expr AS DOLLAR varvar APTR DOLLAR varvar attributes",
-        "smartytag ::= LDELSETFILTER ID modparameters",
-        "smartytag ::= LDELSETFILTER ID modparameters modifierlist",
-        "smartytag ::= LDEL SMARTYBLOCKCHILDPARENT",
-        "smartytag ::= LDELSLASH ID",
-        "smartytag ::= LDELSLASH ID modifierlist",
-        "smartytag ::= LDELSLASH ID PTR ID",
-        "smartytag ::= LDELSLASH ID PTR ID modifierlist",
-        "attributes ::= attributes attribute",
-        "attributes ::= attribute",
-        "attributes ::=",
-        "attribute ::= SPACE ID EQUAL ID",
-        "attribute ::= ATTR expr",
-        "attribute ::= ATTR value",
-        "attribute ::= SPACE ID",
-        "attribute ::= SPACE expr",
-        "attribute ::= SPACE value",
-        "attribute ::= SPACE INTEGER EQUAL expr",
-        "statements ::= statement",
-        "statements ::= statements COMMA statement",
-        "statement ::= DOLLAR varvar EQUAL expr",
-        "statement ::= varindexed EQUAL expr",
-        "statement ::= OPENP statement CLOSEP",
-        "expr ::= value",
-        "expr ::= ternary",
-        "expr ::= DOLLAR ID COLON ID",
-        "expr ::= expr MATH value",
-        "expr ::= expr UNIMATH value",
-        "expr ::= expr ANDSYM value",
-        "expr ::= array",
-        "expr ::= expr modifierlist",
-        "expr ::= expr ifcond expr",
-        "expr ::= expr ISIN array",
-        "expr ::= expr ISIN value",
-        "expr ::= expr lop expr",
-        "expr ::= expr ISDIVBY expr",
-        "expr ::= expr ISNOTDIVBY expr",
-        "expr ::= expr ISEVEN",
-        "expr ::= expr ISNOTEVEN",
-        "expr ::= expr ISEVENBY expr",
-        "expr ::= expr ISNOTEVENBY expr",
-        "expr ::= expr ISODD",
-        "expr ::= expr ISNOTODD",
-        "expr ::= expr ISODDBY expr",
-        "expr ::= expr ISNOTODDBY expr",
-        "expr ::= variable INSTANCEOF ns1",
-        "ternary ::= OPENP expr CLOSEP QMARK DOLLAR ID COLON expr",
-        "ternary ::= OPENP expr CLOSEP QMARK expr COLON expr",
-        "value ::= variable",
-        "value ::= UNIMATH value",
-        "value ::= NOT value",
-        "value ::= TYPECAST value",
-        "value ::= variable INCDEC",
-        "value ::= HEX",
-        "value ::= INTEGER",
-        "value ::= INTEGER DOT INTEGER",
-        "value ::= INTEGER DOT",
-        "value ::= DOT INTEGER",
-        "value ::= ID",
-        "value ::= function",
-        "value ::= OPENP expr CLOSEP",
-        "value ::= SINGLEQUOTESTRING",
-        "value ::= doublequoted_with_quotes",
-        "value ::= varindexed DOUBLECOLON static_class_access",
-        "value ::= smartytag RDEL",
-        "value ::= value modifierlist",
-        "value ::= NAMESPACE",
-        "value ::= ns1 DOUBLECOLON static_class_access",
-        "ns1 ::= ID",
-        "ns1 ::= NAMESPACE",
-        "ns1 ::= variable",
-        "variable ::= varindexed",
-        "variable ::= DOLLAR varvar AT ID",
-        "variable ::= object",
-        "variable ::= HATCH ID HATCH",
-        "variable ::= HATCH ID HATCH arrayindex",
-        "variable ::= HATCH variable HATCH",
-        "variable ::= HATCH variable HATCH arrayindex",
-        "varindexed ::= DOLLAR varvar arrayindex",
-        "arrayindex ::= arrayindex indexdef",
-        "arrayindex ::=",
-        "indexdef ::= DOT DOLLAR varvar",
-        "indexdef ::= DOT DOLLAR varvar AT ID",
-        "indexdef ::= DOT ID",
-        "indexdef ::= DOT INTEGER",
-        "indexdef ::= DOT LDEL expr RDEL",
-        "indexdef ::= OPENB ID CLOSEB",
-        "indexdef ::= OPENB ID DOT ID CLOSEB",
-        "indexdef ::= OPENB expr CLOSEB",
-        "indexdef ::= OPENB CLOSEB",
-        "varvar ::= varvarele",
-        "varvar ::= varvar varvarele",
-        "varvarele ::= ID",
-        "varvarele ::= LDEL expr RDEL",
-        "object ::= varindexed objectchain",
-        "objectchain ::= objectelement",
-        "objectchain ::= objectchain objectelement",
-        "objectelement ::= PTR ID arrayindex",
-        "objectelement ::= PTR DOLLAR varvar arrayindex",
-        "objectelement ::= PTR LDEL expr RDEL arrayindex",
-        "objectelement ::= PTR ID LDEL expr RDEL arrayindex",
-        "objectelement ::= PTR method",
-        "function ::= ns1 OPENP params CLOSEP",
-        "method ::= ID OPENP params CLOSEP",
-        "method ::= DOLLAR ID OPENP params CLOSEP",
-        "params ::= params COMMA expr",
-        "params ::= expr",
-        "params ::=",
-        "modifierlist ::= modifierlist modifier modparameters",
-        "modifierlist ::= modifier modparameters",
-        "modifier ::= VERT AT ID",
-        "modifier ::= VERT ID",
-        "modparameters ::= modparameters modparameter",
-        "modparameters ::=",
-        "modparameter ::= COLON value",
-        "modparameter ::= COLON array",
-        "static_class_access ::= method",
-        "static_class_access ::= method objectchain",
-        "static_class_access ::= ID",
-        "static_class_access ::= DOLLAR ID arrayindex",
-        "static_class_access ::= DOLLAR ID arrayindex objectchain",
-        "ifcond ::= EQUALS",
-        "ifcond ::= NOTEQUALS",
-        "ifcond ::= GREATERTHAN",
-        "ifcond ::= LESSTHAN",
-        "ifcond ::= GREATEREQUAL",
-        "ifcond ::= LESSEQUAL",
-        "ifcond ::= IDENTITY",
-        "ifcond ::= NONEIDENTITY",
-        "ifcond ::= MOD",
-        "lop ::= LAND",
-        "lop ::= LOR",
-        "lop ::= LXOR",
-        "array ::= OPENB arrayelements CLOSEB",
-        "arrayelements ::= arrayelement",
-        "arrayelements ::= arrayelements COMMA arrayelement",
-        "arrayelements ::=",
-        "arrayelement ::= value APTR expr",
-        "arrayelement ::= ID APTR expr",
-        "arrayelement ::= expr",
-        "doublequoted_with_quotes ::= QUOTE QUOTE",
-        "doublequoted_with_quotes ::= QUOTE doublequoted QUOTE",
-        "doublequoted ::= doublequoted doublequotedcontent",
-        "doublequoted ::= doublequotedcontent",
-        "doublequotedcontent ::= BACKTICK variable BACKTICK",
-        "doublequotedcontent ::= BACKTICK expr BACKTICK",
-        "doublequotedcontent ::= DOLLARID",
-        "doublequotedcontent ::= LDEL variable RDEL",
-        "doublequotedcontent ::= LDEL expr RDEL",
-        "doublequotedcontent ::= smartytag RDEL",
-        "doublequotedcontent ::= TEXT",
-        "optspace ::= SPACE",
-        "optspace ::=",
-    );
+    public static $yyRuleName = array('start ::= template', 'template ::= template_element',
+        'template ::= template template_element', 'template ::=', 'template_element ::= smartytag',
+        'template_element ::= literal', 'template_element ::= PHP', 'template_element ::= text_content',
+        'text_content ::= TEXT', 'text_content ::= text_content TEXT', 'template_element ::= STRIPON',
+        'template_element ::= STRIPOFF', 'template_element ::= BLOCKSOURCE', 'literal ::= LITERALSTART LITERALEND',
+        'literal ::= LITERALSTART literal_elements LITERALEND', 'literal_elements ::= literal_elements literal_element',
+        'literal_elements ::=', 'literal_element ::= literal', 'literal_element ::= LITERAL', 'smartytag ::= tag RDEL',
+        'smartytag ::= SIMPELOUTPUT', 'tag ::= LDEL variable', 'tag ::= LDEL variable modifierlist attributes',
+        'tag ::= LDEL variable attributes', 'tag ::= LDEL value', 'tag ::= LDEL value modifierlist attributes',
+        'tag ::= LDEL value attributes', 'tag ::= LDEL expr modifierlist attributes', 'tag ::= LDEL expr attributes',
+        'tag ::= LDEL DOLLARID EQUAL value', 'tag ::= LDEL DOLLARID EQUAL expr',
+        'tag ::= LDEL DOLLARID EQUAL expr attributes', 'tag ::= LDEL varindexed EQUAL expr attributes',
+        'smartytag ::= SIMPLETAG', 'tag ::= LDEL ID attributes', 'tag ::= LDEL ID',
+        'tag ::= LDEL ID modifierlist attributes', 'tag ::= LDEL ID PTR ID attributes',
+        'tag ::= LDEL ID PTR ID modifierlist attributes', 'tag ::= LDELIF expr', 'tag ::= LDELIF expr attributes',
+        'tag ::= LDELIF statement', 'tag ::= LDELIF statement attributes',
+        'tag ::= LDELFOR statements SEMICOLON expr SEMICOLON varindexed foraction attributes',
+        'foraction ::= EQUAL expr', 'foraction ::= INCDEC', 'tag ::= LDELFOR statement TO expr attributes',
+        'tag ::= LDELFOR statement TO expr STEP expr attributes', 'tag ::= LDELFOREACH attributes',
+        'tag ::= LDELFOREACH SPACE value AS varvar attributes',
+        'tag ::= LDELFOREACH SPACE value AS varvar APTR varvar attributes',
+        'tag ::= LDELFOREACH SPACE expr AS varvar attributes',
+        'tag ::= LDELFOREACH SPACE expr AS varvar APTR varvar attributes', 'tag ::= LDELSETFILTER ID modparameters',
+        'tag ::= LDELSETFILTER ID modparameters modifierlist', 'tag ::= LDEL SMARTYBLOCKCHILDPARENT',
+        'smartytag ::= CLOSETAG', 'tag ::= LDELSLASH ID', 'tag ::= LDELSLASH ID modifierlist',
+        'tag ::= LDELSLASH ID PTR ID', 'tag ::= LDELSLASH ID PTR ID modifierlist',
+        'attributes ::= attributes attribute', 'attributes ::= attribute', 'attributes ::=',
+        'attribute ::= SPACE ID EQUAL ID', 'attribute ::= ATTR expr', 'attribute ::= ATTR value',
+        'attribute ::= SPACE ID', 'attribute ::= SPACE expr', 'attribute ::= SPACE value',
+        'attribute ::= SPACE INTEGER EQUAL expr', 'statements ::= statement',
+        'statements ::= statements COMMA statement', 'statement ::= DOLLARID EQUAL INTEGER',
+        'statement ::= DOLLARID EQUAL expr', 'statement ::= varindexed EQUAL expr',
+        'statement ::= OPENP statement CLOSEP', 'expr ::= value', 'expr ::= ternary', 'expr ::= DOLLARID COLON ID',
+        'expr ::= expr MATH value', 'expr ::= expr UNIMATH value', 'expr ::= array', 'expr ::= expr modifierlist',
+        'expr ::= expr lop expr', 'expr ::= expr scond', 'expr ::= expr ISIN array', 'expr ::= expr ISIN value',
+        'expr ::= variable INSTANCEOF ns1', 'ternary ::= OPENP expr CLOSEP QMARK DOLLARID COLON expr',
+        'ternary ::= OPENP expr CLOSEP QMARK expr COLON expr', 'value ::= variable', 'value ::= UNIMATH value',
+        'value ::= NOT value', 'value ::= TYPECAST value', 'value ::= variable INCDEC', 'value ::= HEX',
+        'value ::= INTEGER', 'value ::= INTEGER DOT INTEGER', 'value ::= INTEGER DOT', 'value ::= DOT INTEGER',
+        'value ::= ID', 'value ::= function', 'value ::= OPENP expr CLOSEP', 'value ::= SINGLEQUOTESTRING',
+        'value ::= doublequoted_with_quotes', 'value ::= varindexed DOUBLECOLON static_class_access',
+        'value ::= smartytag', 'value ::= value modifierlist', 'value ::= NAMESPACE',
+        'value ::= ns1 DOUBLECOLON static_class_access', 'ns1 ::= ID', 'ns1 ::= NAMESPACE', 'variable ::= DOLLARID',
+        'variable ::= varindexed', 'variable ::= varvar AT ID', 'variable ::= object', 'variable ::= HATCH ID HATCH',
+        'variable ::= HATCH ID HATCH arrayindex', 'variable ::= HATCH variable HATCH',
+        'variable ::= HATCH variable HATCH arrayindex', 'varindexed ::= DOLLARID arrayindex',
+        'varindexed ::= varvar arrayindex', 'arrayindex ::= arrayindex indexdef', 'arrayindex ::=',
+        'indexdef ::= DOT DOLLARID', 'indexdef ::= DOT varvar', 'indexdef ::= DOT varvar AT ID', 'indexdef ::= DOT ID',
+        'indexdef ::= DOT INTEGER', 'indexdef ::= DOT LDEL expr RDEL', 'indexdef ::= OPENB ID CLOSEB',
+        'indexdef ::= OPENB ID DOT ID CLOSEB', 'indexdef ::= OPENB SINGLEQUOTESTRING CLOSEB',
+        'indexdef ::= OPENB INTEGER CLOSEB', 'indexdef ::= OPENB DOLLARID CLOSEB', 'indexdef ::= OPENB variable CLOSEB',
+        'indexdef ::= OPENB value CLOSEB', 'indexdef ::= OPENB expr CLOSEB', 'indexdef ::= OPENB CLOSEB',
+        'varvar ::= DOLLARID', 'varvar ::= DOLLAR', 'varvar ::= varvar varvarele', 'varvarele ::= ID',
+        'varvarele ::= SIMPELOUTPUT', 'varvarele ::= LDEL expr RDEL', 'object ::= varindexed objectchain',
+        'objectchain ::= objectelement', 'objectchain ::= objectchain objectelement',
+        'objectelement ::= PTR ID arrayindex', 'objectelement ::= PTR varvar arrayindex',
+        'objectelement ::= PTR LDEL expr RDEL arrayindex', 'objectelement ::= PTR ID LDEL expr RDEL arrayindex',
+        'objectelement ::= PTR method', 'function ::= ns1 OPENP params CLOSEP', 'method ::= ID OPENP params CLOSEP',
+        'method ::= DOLLARID OPENP params CLOSEP', 'params ::= params COMMA expr', 'params ::= expr', 'params ::=',
+        'modifierlist ::= modifierlist modifier modparameters', 'modifierlist ::= modifier modparameters',
+        'modifier ::= VERT AT ID', 'modifier ::= VERT ID', 'modparameters ::= modparameters modparameter',
+        'modparameters ::=', 'modparameter ::= COLON value', 'modparameter ::= COLON array',
+        'static_class_access ::= method', 'static_class_access ::= method objectchain', 'static_class_access ::= ID',
+        'static_class_access ::= DOLLARID arrayindex', 'static_class_access ::= DOLLARID arrayindex objectchain',
+        'lop ::= LOGOP', 'lop ::= TLOGOP', 'scond ::= SINGLECOND', 'array ::= OPENB arrayelements CLOSEB',
+        'arrayelements ::= arrayelement', 'arrayelements ::= arrayelements COMMA arrayelement', 'arrayelements ::=',
+        'arrayelement ::= value APTR expr', 'arrayelement ::= ID APTR expr', 'arrayelement ::= expr',
+        'doublequoted_with_quotes ::= QUOTE QUOTE', 'doublequoted_with_quotes ::= QUOTE doublequoted QUOTE',
+        'doublequoted ::= doublequoted doublequotedcontent', 'doublequoted ::= doublequotedcontent',
+        'doublequotedcontent ::= BACKTICK variable BACKTICK', 'doublequotedcontent ::= BACKTICK expr BACKTICK',
+        'doublequotedcontent ::= DOLLARID', 'doublequotedcontent ::= LDEL variable RDEL',
+        'doublequotedcontent ::= LDEL expr RDEL', 'doublequotedcontent ::= smartytag', 'doublequotedcontent ::= TEXT',);
 
     public function tokenName($tokenType)
     {
@@ -1586,14 +854,12 @@ class Smarty_Internal_Templateparser
 
     public function yy_pop_parser_stack()
     {
-        if (!count($this->yystack)) {
+        if (empty($this->yystack)) {
             return;
         }
         $yytos = array_pop($this->yystack);
         if ($this->yyTraceFILE && $this->yyidx >= 0) {
-            fwrite($this->yyTraceFILE,
-                   $this->yyTracePrompt . 'Popping ' . $this->yyTokenName[$yytos->major] .
-                   "\n");
+            fwrite($this->yyTraceFILE, $this->yyTracePrompt . 'Popping ' . $this->yyTokenName[$yytos->major] . "\n");
         }
         $yymajor = $yytos->major;
         self::yy_destructor($yymajor, $yytos->minor);
@@ -1614,10 +880,18 @@ class Smarty_Internal_Templateparser
 
     public function yy_get_expected_tokens($token)
     {
+        static $res3 = array();
+        static $res4 = array();
         $state = $this->yystack[$this->yyidx]->stateno;
         $expected = self::$yyExpectedTokens[$state];
-        if (in_array($token, self::$yyExpectedTokens[$state], true)) {
-            return $expected;
+        if (isset($res3[$state][$token])) {
+            if ($res3[$state][$token]) {
+                return $expected;
+            }
+        } else {
+            if ($res3[$state][$token] = in_array($token, self::$yyExpectedTokens[$state], true)) {
+                return $expected;
+            }
         }
         $stack = $this->yystack;
         $yyidx = $this->yyidx;
@@ -1636,17 +910,21 @@ class Smarty_Internal_Templateparser
                     }
                     $yyruleno = $yyact - self::YYNSTATE;
                     $this->yyidx -= self::$yyRuleInfo[$yyruleno][1];
-                    $nextstate = $this->yy_find_reduce_action(
-                        $this->yystack[$this->yyidx]->stateno,
-                        self::$yyRuleInfo[$yyruleno][0]);
+                    $nextstate = $this->yy_find_reduce_action($this->yystack[$this->yyidx]->stateno, self::$yyRuleInfo[$yyruleno][0]);
                     if (isset(self::$yyExpectedTokens[$nextstate])) {
                         $expected = array_merge($expected, self::$yyExpectedTokens[$nextstate]);
-                        if (in_array($token,
-                                     self::$yyExpectedTokens[$nextstate], true)) {
-                            $this->yyidx = $yyidx;
-                            $this->yystack = $stack;
-
-                            return array_unique($expected);
+                        if (isset($res4[$nextstate][$token])) {
+                            if ($res4[$nextstate][$token]) {
+                                $this->yyidx = $yyidx;
+                                $this->yystack = $stack;
+                                return array_unique($expected);
+                            }
+                        } else {
+                            if ($res4[$nextstate][$token] = in_array($token, self::$yyExpectedTokens[$nextstate], true)) {
+                                $this->yyidx = $yyidx;
+                                $this->yystack = $stack;
+                                return array_unique($expected);
+                            }
                         }
                     }
                     if ($nextstate < self::YYNSTATE) {
@@ -1684,12 +962,20 @@ class Smarty_Internal_Templateparser
 
     public function yy_is_expected_token($token)
     {
+        static $res = array();
+        static $res2 = array();
         if ($token === 0) {
             return true; // 0 is not part of this
         }
         $state = $this->yystack[$this->yyidx]->stateno;
-        if (in_array($token, self::$yyExpectedTokens[$state], true)) {
-            return true;
+        if (isset($res[$state][$token])) {
+            if ($res[$state][$token]) {
+                return true;
+            }
+        } else {
+            if ($res[$state][$token] = in_array($token, self::$yyExpectedTokens[$state], true)) {
+                return true;
+            }
         }
         $stack = $this->yystack;
         $yyidx = $this->yyidx;
@@ -1708,16 +994,19 @@ class Smarty_Internal_Templateparser
                     }
                     $yyruleno = $yyact - self::YYNSTATE;
                     $this->yyidx -= self::$yyRuleInfo[$yyruleno][1];
-                    $nextstate = $this->yy_find_reduce_action(
-                        $this->yystack[$this->yyidx]->stateno,
-                        self::$yyRuleInfo[$yyruleno][0]);
-                    if (isset(self::$yyExpectedTokens[$nextstate]) &&
-                        in_array($token, self::$yyExpectedTokens[$nextstate], true)
-                    ) {
-                        $this->yyidx = $yyidx;
-                        $this->yystack = $stack;
-
-                        return true;
+                    $nextstate = $this->yy_find_reduce_action($this->yystack[$this->yyidx]->stateno, self::$yyRuleInfo[$yyruleno][0]);
+                    if (isset($res2[$nextstate][$token])) {
+                        if ($res2[$nextstate][$token]) {
+                            $this->yyidx = $yyidx;
+                            $this->yystack = $stack;
+                            return true;
+                        }
+                    } else {
+                        if ($res2[$nextstate][$token] = (isset(self::$yyExpectedTokens[$nextstate]) && in_array($token, self::$yyExpectedTokens[$nextstate], true))) {
+                            $this->yyidx = $yyidx;
+                            $this->yystack = $stack;
+                            return true;
+                        }
                     }
                     if ($nextstate < self::YYNSTATE) {
                         // we need to shift a non-terminal
@@ -1773,16 +1062,10 @@ class Smarty_Internal_Templateparser
             return self::YY_NO_ACTION;
         }
         $i += $iLookAhead;
-        if ($i < 0 || $i >= self::YY_SZ_ACTTAB ||
-            self::$yy_lookahead[$i] != $iLookAhead
-        ) {
-            if (count(self::$yyFallback) && $iLookAhead < count(self::$yyFallback)
-                && ($iFallback = self::$yyFallback[$iLookAhead]) != 0
-            ) {
+        if ($i < 0 || $i >= self::YY_SZ_ACTTAB || self::$yy_lookahead[$i] != $iLookAhead) {
+            if (count(self::$yyFallback) && $iLookAhead < count(self::$yyFallback) && ($iFallback = self::$yyFallback[$iLookAhead]) != 0) {
                 if ($this->yyTraceFILE) {
-                    fwrite($this->yyTraceFILE, $this->yyTracePrompt . "FALLBACK " .
-                                             $this->yyTokenName[$iLookAhead] . " => " .
-                                             $this->yyTokenName[$iFallback] . "\n");
+                    fwrite($this->yyTraceFILE, $this->yyTracePrompt . "FALLBACK " . $this->yyTokenName[$iLookAhead] . " => " . $this->yyTokenName[$iFallback] . "\n");
                 }
 
                 return $this->yy_find_shift_action($iFallback);
@@ -1809,9 +1092,7 @@ class Smarty_Internal_Templateparser
             return self::YY_NO_ACTION;
         }
         $i += $iLookAhead;
-        if ($i < 0 || $i >= self::YY_SZ_ACTTAB ||
-            self::$yy_lookahead[$i] != $iLookAhead
-        ) {
+        if ($i < 0 || $i >= self::YY_SZ_ACTTAB || self::$yy_lookahead[$i] != $iLookAhead) {
             return self::$yy_default[$stateno];
         } else {
             return self::$yy_action[$i];
@@ -1829,7 +1110,7 @@ class Smarty_Internal_Templateparser
             while ($this->yyidx >= 0) {
                 $this->yy_pop_parser_stack();
             }
-            #line 195 "../smarty/lexer/smarty_internal_templateparser.y"
+            #line 190 "../smarty/lexer/smarty_internal_templateparser.y"
 
             $this->internalError = true;
             $this->compiler->trigger_template_error("Stack overflow in template parser");
@@ -1840,441 +1121,103 @@ class Smarty_Internal_Templateparser
         $yytos->stateno = $yyNewState;
         $yytos->major = $yyMajor;
         $yytos->minor = $yypMinor;
-        array_push($this->yystack, $yytos);
+        $this->yystack[] = $yytos;
         if ($this->yyTraceFILE && $this->yyidx > 0) {
-            fprintf($this->yyTraceFILE, "%sShift %d\n", $this->yyTracePrompt,
-                    $yyNewState);
+            fprintf($this->yyTraceFILE, "%sShift %d\n", $this->yyTracePrompt, $yyNewState);
             fprintf($this->yyTraceFILE, "%sStack:", $this->yyTracePrompt);
             for ($i = 1; $i <= $this->yyidx; $i ++) {
-                fprintf($this->yyTraceFILE, " %s",
-                        $this->yyTokenName[$this->yystack[$i]->major]);
+                fprintf($this->yyTraceFILE, " %s", $this->yyTokenName[$this->yystack[$i]->major]);
             }
             fwrite($this->yyTraceFILE, "\n");
         }
     }
 
-    public static $yyRuleInfo = array(
-        array(0 => 84, 1 => 1),
-        array(0 => 85, 1 => 1),
-        array(0 => 85, 1 => 2),
-        array(0 => 85, 1 => 0),
-        array(0 => 86, 1 => 2),
-        array(0 => 86, 1 => 1),
-        array(0 => 86, 1 => 1),
-        array(0 => 86, 1 => 1),
-        array(0 => 86, 1 => 1),
-        array(0 => 86, 1 => 1),
-        array(0 => 86, 1 => 1),
-        array(0 => 86, 1 => 1),
-        array(0 => 86, 1 => 1),
-        array(0 => 86, 1 => 1),
-        array(0 => 89, 1 => 1),
-        array(0 => 89, 1 => 2),
-        array(0 => 86, 1 => 1),
-        array(0 => 86, 1 => 1),
-        array(0 => 86, 1 => 1),
-        array(0 => 88, 1 => 2),
-        array(0 => 88, 1 => 3),
-        array(0 => 90, 1 => 2),
-        array(0 => 90, 1 => 0),
-        array(0 => 91, 1 => 1),
-        array(0 => 91, 1 => 1),
-        array(0 => 87, 1 => 2),
-        array(0 => 87, 1 => 4),
-        array(0 => 87, 1 => 3),
-        array(0 => 87, 1 => 4),
-        array(0 => 87, 1 => 3),
-        array(0 => 87, 1 => 5),
-        array(0 => 87, 1 => 5),
-        array(0 => 87, 1 => 6),
-        array(0 => 87, 1 => 5),
-        array(0 => 87, 1 => 3),
-        array(0 => 87, 1 => 2),
-        array(0 => 87, 1 => 4),
-        array(0 => 87, 1 => 5),
-        array(0 => 87, 1 => 6),
-        array(0 => 87, 1 => 2),
-        array(0 => 87, 1 => 3),
-        array(0 => 87, 1 => 2),
-        array(0 => 87, 1 => 3),
-        array(0 => 87, 1 => 11),
-        array(0 => 101, 1 => 2),
-        array(0 => 101, 1 => 1),
-        array(0 => 87, 1 => 5),
-        array(0 => 87, 1 => 7),
-        array(0 => 87, 1 => 2),
-        array(0 => 87, 1 => 7),
-        array(0 => 87, 1 => 10),
-        array(0 => 87, 1 => 7),
-        array(0 => 87, 1 => 10),
-        array(0 => 87, 1 => 3),
-        array(0 => 87, 1 => 4),
-        array(0 => 87, 1 => 2),
-        array(0 => 87, 1 => 2),
-        array(0 => 87, 1 => 3),
-        array(0 => 87, 1 => 4),
-        array(0 => 87, 1 => 5),
-        array(0 => 94, 1 => 2),
-        array(0 => 94, 1 => 1),
-        array(0 => 94, 1 => 0),
-        array(0 => 103, 1 => 4),
-        array(0 => 103, 1 => 2),
-        array(0 => 103, 1 => 2),
-        array(0 => 103, 1 => 2),
-        array(0 => 103, 1 => 2),
-        array(0 => 103, 1 => 2),
-        array(0 => 103, 1 => 4),
-        array(0 => 98, 1 => 1),
-        array(0 => 98, 1 => 3),
-        array(0 => 97, 1 => 4),
-        array(0 => 97, 1 => 3),
-        array(0 => 97, 1 => 3),
-        array(0 => 95, 1 => 1),
-        array(0 => 95, 1 => 1),
-        array(0 => 95, 1 => 4),
-        array(0 => 95, 1 => 3),
-        array(0 => 95, 1 => 3),
-        array(0 => 95, 1 => 3),
-        array(0 => 95, 1 => 1),
-        array(0 => 95, 1 => 2),
-        array(0 => 95, 1 => 3),
-        array(0 => 95, 1 => 3),
-        array(0 => 95, 1 => 3),
-        array(0 => 95, 1 => 3),
-        array(0 => 95, 1 => 3),
-        array(0 => 95, 1 => 3),
-        array(0 => 95, 1 => 2),
-        array(0 => 95, 1 => 2),
-        array(0 => 95, 1 => 3),
-        array(0 => 95, 1 => 3),
-        array(0 => 95, 1 => 2),
-        array(0 => 95, 1 => 2),
-        array(0 => 95, 1 => 3),
-        array(0 => 95, 1 => 3),
-        array(0 => 95, 1 => 3),
-        array(0 => 104, 1 => 8),
-        array(0 => 104, 1 => 7),
-        array(0 => 92, 1 => 1),
-        array(0 => 92, 1 => 2),
-        array(0 => 92, 1 => 2),
-        array(0 => 92, 1 => 2),
-        array(0 => 92, 1 => 2),
-        array(0 => 92, 1 => 1),
-        array(0 => 92, 1 => 1),
-        array(0 => 92, 1 => 3),
-        array(0 => 92, 1 => 2),
-        array(0 => 92, 1 => 2),
-        array(0 => 92, 1 => 1),
-        array(0 => 92, 1 => 1),
-        array(0 => 92, 1 => 3),
-        array(0 => 92, 1 => 1),
-        array(0 => 92, 1 => 1),
-        array(0 => 92, 1 => 3),
-        array(0 => 92, 1 => 2),
-        array(0 => 92, 1 => 2),
-        array(0 => 92, 1 => 1),
-        array(0 => 92, 1 => 3),
-        array(0 => 109, 1 => 1),
-        array(0 => 109, 1 => 1),
-        array(0 => 109, 1 => 1),
-        array(0 => 108, 1 => 1),
-        array(0 => 108, 1 => 4),
-        array(0 => 108, 1 => 1),
-        array(0 => 108, 1 => 3),
-        array(0 => 108, 1 => 4),
-        array(0 => 108, 1 => 3),
-        array(0 => 108, 1 => 4),
-        array(0 => 96, 1 => 3),
-        array(0 => 114, 1 => 2),
-        array(0 => 114, 1 => 0),
-        array(0 => 115, 1 => 3),
-        array(0 => 115, 1 => 5),
-        array(0 => 115, 1 => 2),
-        array(0 => 115, 1 => 2),
-        array(0 => 115, 1 => 4),
-        array(0 => 115, 1 => 3),
-        array(0 => 115, 1 => 5),
-        array(0 => 115, 1 => 3),
-        array(0 => 115, 1 => 2),
-        array(0 => 100, 1 => 1),
-        array(0 => 100, 1 => 2),
-        array(0 => 116, 1 => 1),
-        array(0 => 116, 1 => 3),
-        array(0 => 113, 1 => 2),
-        array(0 => 117, 1 => 1),
-        array(0 => 117, 1 => 2),
-        array(0 => 118, 1 => 3),
-        array(0 => 118, 1 => 4),
-        array(0 => 118, 1 => 5),
-        array(0 => 118, 1 => 6),
-        array(0 => 118, 1 => 2),
-        array(0 => 110, 1 => 4),
-        array(0 => 119, 1 => 4),
-        array(0 => 119, 1 => 5),
-        array(0 => 120, 1 => 3),
-        array(0 => 120, 1 => 1),
-        array(0 => 120, 1 => 0),
-        array(0 => 93, 1 => 3),
-        array(0 => 93, 1 => 2),
-        array(0 => 121, 1 => 3),
-        array(0 => 121, 1 => 2),
-        array(0 => 102, 1 => 2),
-        array(0 => 102, 1 => 0),
-        array(0 => 122, 1 => 2),
-        array(0 => 122, 1 => 2),
-        array(0 => 112, 1 => 1),
-        array(0 => 112, 1 => 2),
-        array(0 => 112, 1 => 1),
-        array(0 => 112, 1 => 3),
-        array(0 => 112, 1 => 4),
-        array(0 => 106, 1 => 1),
-        array(0 => 106, 1 => 1),
-        array(0 => 106, 1 => 1),
-        array(0 => 106, 1 => 1),
-        array(0 => 106, 1 => 1),
-        array(0 => 106, 1 => 1),
-        array(0 => 106, 1 => 1),
-        array(0 => 106, 1 => 1),
-        array(0 => 106, 1 => 1),
-        array(0 => 107, 1 => 1),
-        array(0 => 107, 1 => 1),
-        array(0 => 107, 1 => 1),
-        array(0 => 105, 1 => 3),
-        array(0 => 123, 1 => 1),
-        array(0 => 123, 1 => 3),
-        array(0 => 123, 1 => 0),
-        array(0 => 124, 1 => 3),
-        array(0 => 124, 1 => 3),
-        array(0 => 124, 1 => 1),
-        array(0 => 111, 1 => 2),
-        array(0 => 111, 1 => 3),
-        array(0 => 125, 1 => 2),
-        array(0 => 125, 1 => 1),
-        array(0 => 126, 1 => 3),
-        array(0 => 126, 1 => 3),
-        array(0 => 126, 1 => 1),
-        array(0 => 126, 1 => 3),
-        array(0 => 126, 1 => 3),
-        array(0 => 126, 1 => 2),
-        array(0 => 126, 1 => 1),
-        array(0 => 99, 1 => 1),
-        array(0 => 99, 1 => 0),
-    );
+    public static $yyRuleInfo = array(array(0 => 61, 1 => 1), array(0 => 62, 1 => 1), array(0 => 62, 1 => 2),
+        array(0 => 62, 1 => 0), array(0 => 63, 1 => 1), array(0 => 63, 1 => 1), array(0 => 63, 1 => 1),
+        array(0 => 63, 1 => 1), array(0 => 66, 1 => 1), array(0 => 66, 1 => 2), array(0 => 63, 1 => 1),
+        array(0 => 63, 1 => 1), array(0 => 63, 1 => 1), array(0 => 65, 1 => 2), array(0 => 65, 1 => 3),
+        array(0 => 67, 1 => 2), array(0 => 67, 1 => 0), array(0 => 68, 1 => 1), array(0 => 68, 1 => 1),
+        array(0 => 64, 1 => 2), array(0 => 64, 1 => 1), array(0 => 69, 1 => 2), array(0 => 69, 1 => 4),
+        array(0 => 69, 1 => 3), array(0 => 69, 1 => 2), array(0 => 69, 1 => 4), array(0 => 69, 1 => 3),
+        array(0 => 69, 1 => 4), array(0 => 69, 1 => 3), array(0 => 69, 1 => 4), array(0 => 69, 1 => 4),
+        array(0 => 69, 1 => 5), array(0 => 69, 1 => 5), array(0 => 64, 1 => 1), array(0 => 69, 1 => 3),
+        array(0 => 69, 1 => 2), array(0 => 69, 1 => 4), array(0 => 69, 1 => 5), array(0 => 69, 1 => 6),
+        array(0 => 69, 1 => 2), array(0 => 69, 1 => 3), array(0 => 69, 1 => 2), array(0 => 69, 1 => 3),
+        array(0 => 69, 1 => 8), array(0 => 78, 1 => 2), array(0 => 78, 1 => 1), array(0 => 69, 1 => 5),
+        array(0 => 69, 1 => 7), array(0 => 69, 1 => 2), array(0 => 69, 1 => 6), array(0 => 69, 1 => 8),
+        array(0 => 69, 1 => 6), array(0 => 69, 1 => 8), array(0 => 69, 1 => 3), array(0 => 69, 1 => 4),
+        array(0 => 69, 1 => 2), array(0 => 64, 1 => 1), array(0 => 69, 1 => 2), array(0 => 69, 1 => 3),
+        array(0 => 69, 1 => 4), array(0 => 69, 1 => 5), array(0 => 72, 1 => 2), array(0 => 72, 1 => 1),
+        array(0 => 72, 1 => 0), array(0 => 81, 1 => 4), array(0 => 81, 1 => 2), array(0 => 81, 1 => 2),
+        array(0 => 81, 1 => 2), array(0 => 81, 1 => 2), array(0 => 81, 1 => 2), array(0 => 81, 1 => 4),
+        array(0 => 77, 1 => 1), array(0 => 77, 1 => 3), array(0 => 76, 1 => 3), array(0 => 76, 1 => 3),
+        array(0 => 76, 1 => 3), array(0 => 76, 1 => 3), array(0 => 74, 1 => 1), array(0 => 74, 1 => 1),
+        array(0 => 74, 1 => 3), array(0 => 74, 1 => 3), array(0 => 74, 1 => 3), array(0 => 74, 1 => 1),
+        array(0 => 74, 1 => 2), array(0 => 74, 1 => 3), array(0 => 74, 1 => 2), array(0 => 74, 1 => 3),
+        array(0 => 74, 1 => 3), array(0 => 74, 1 => 3), array(0 => 82, 1 => 7), array(0 => 82, 1 => 7),
+        array(0 => 73, 1 => 1), array(0 => 73, 1 => 2), array(0 => 73, 1 => 2), array(0 => 73, 1 => 2),
+        array(0 => 73, 1 => 2), array(0 => 73, 1 => 1), array(0 => 73, 1 => 1), array(0 => 73, 1 => 3),
+        array(0 => 73, 1 => 2), array(0 => 73, 1 => 2), array(0 => 73, 1 => 1), array(0 => 73, 1 => 1),
+        array(0 => 73, 1 => 3), array(0 => 73, 1 => 1), array(0 => 73, 1 => 1), array(0 => 73, 1 => 3),
+        array(0 => 73, 1 => 1), array(0 => 73, 1 => 2), array(0 => 73, 1 => 1), array(0 => 73, 1 => 3),
+        array(0 => 86, 1 => 1), array(0 => 86, 1 => 1), array(0 => 70, 1 => 1), array(0 => 70, 1 => 1),
+        array(0 => 70, 1 => 3), array(0 => 70, 1 => 1), array(0 => 70, 1 => 3), array(0 => 70, 1 => 4),
+        array(0 => 70, 1 => 3), array(0 => 70, 1 => 4), array(0 => 75, 1 => 2), array(0 => 75, 1 => 2),
+        array(0 => 91, 1 => 2), array(0 => 91, 1 => 0), array(0 => 92, 1 => 2), array(0 => 92, 1 => 2),
+        array(0 => 92, 1 => 4), array(0 => 92, 1 => 2), array(0 => 92, 1 => 2), array(0 => 92, 1 => 4),
+        array(0 => 92, 1 => 3), array(0 => 92, 1 => 5), array(0 => 92, 1 => 3), array(0 => 92, 1 => 3),
+        array(0 => 92, 1 => 3), array(0 => 92, 1 => 3), array(0 => 92, 1 => 3), array(0 => 92, 1 => 3),
+        array(0 => 92, 1 => 2), array(0 => 79, 1 => 1), array(0 => 79, 1 => 1), array(0 => 79, 1 => 2),
+        array(0 => 93, 1 => 1), array(0 => 93, 1 => 1), array(0 => 93, 1 => 3), array(0 => 90, 1 => 2),
+        array(0 => 94, 1 => 1), array(0 => 94, 1 => 2), array(0 => 95, 1 => 3), array(0 => 95, 1 => 3),
+        array(0 => 95, 1 => 5), array(0 => 95, 1 => 6), array(0 => 95, 1 => 2), array(0 => 87, 1 => 4),
+        array(0 => 96, 1 => 4), array(0 => 96, 1 => 4), array(0 => 97, 1 => 3), array(0 => 97, 1 => 1),
+        array(0 => 97, 1 => 0), array(0 => 71, 1 => 3), array(0 => 71, 1 => 2), array(0 => 98, 1 => 3),
+        array(0 => 98, 1 => 2), array(0 => 80, 1 => 2), array(0 => 80, 1 => 0), array(0 => 99, 1 => 2),
+        array(0 => 99, 1 => 2), array(0 => 89, 1 => 1), array(0 => 89, 1 => 2), array(0 => 89, 1 => 1),
+        array(0 => 89, 1 => 2), array(0 => 89, 1 => 3), array(0 => 84, 1 => 1), array(0 => 84, 1 => 1),
+        array(0 => 85, 1 => 1), array(0 => 83, 1 => 3), array(0 => 100, 1 => 1), array(0 => 100, 1 => 3),
+        array(0 => 100, 1 => 0), array(0 => 101, 1 => 3), array(0 => 101, 1 => 3), array(0 => 101, 1 => 1),
+        array(0 => 88, 1 => 2), array(0 => 88, 1 => 3), array(0 => 102, 1 => 2), array(0 => 102, 1 => 1),
+        array(0 => 103, 1 => 3), array(0 => 103, 1 => 3), array(0 => 103, 1 => 1), array(0 => 103, 1 => 3),
+        array(0 => 103, 1 => 3), array(0 => 103, 1 => 1), array(0 => 103, 1 => 1),);
 
-    public static $yyReduceMap = array(
-        0   => 0,
-        1   => 1,
-        2   => 2,
-        4   => 4,
-        5   => 5,
-        6   => 6,
-        7   => 7,
-        8   => 8,
-        9   => 9,
-        10  => 10,
-        11  => 11,
-        12  => 12,
-        13  => 13,
-        14  => 14,
-        23  => 14,
-        24  => 14,
-        45  => 14,
-        67  => 14,
-        68  => 14,
-        75  => 14,
-        76  => 14,
-        81  => 14,
-        100 => 14,
-        105 => 14,
-        106 => 14,
-        111 => 14,
-        113 => 14,
-        114 => 14,
-        118 => 14,
-        120 => 14,
-        121 => 14,
-        122 => 14,
-        125 => 14,
-        142 => 14,
-        186 => 14,
-        191 => 14,
-        203 => 14,
-        15  => 15,
-        16  => 16,
-        17  => 17,
-        18  => 18,
-        19  => 19,
-        22  => 19,
-        204 => 19,
-        20  => 20,
-        74  => 20,
-        21  => 21,
-        101 => 21,
-        103 => 21,
-        104 => 21,
-        131 => 21,
-        25  => 25,
-        26  => 26,
-        27  => 27,
-        29  => 27,
-        28  => 28,
-        30  => 30,
-        31  => 30,
-        32  => 32,
-        33  => 33,
-        34  => 34,
-        35  => 35,
-        36  => 36,
-        37  => 37,
-        38  => 38,
-        39  => 39,
-        40  => 40,
-        42  => 40,
-        41  => 41,
-        43  => 43,
-        44  => 44,
-        46  => 46,
-        47  => 47,
-        48  => 48,
-        49  => 49,
-        51  => 49,
-        50  => 50,
-        52  => 50,
-        53  => 53,
-        54  => 54,
-        55  => 55,
-        56  => 56,
-        57  => 57,
-        58  => 58,
-        59  => 59,
-        60  => 60,
-        61  => 61,
-        70  => 61,
-        158 => 61,
-        162 => 61,
-        166 => 61,
-        167 => 61,
-        62  => 62,
-        159 => 62,
-        165 => 62,
-        63  => 63,
-        64  => 64,
-        65  => 64,
-        66  => 66,
-        69  => 69,
-        71  => 71,
-        72  => 72,
-        73  => 72,
-        77  => 77,
-        78  => 78,
-        79  => 78,
-        80  => 78,
-        82  => 82,
-        117 => 82,
-        83  => 83,
-        86  => 83,
-        84  => 84,
-        85  => 85,
-        87  => 87,
-        88  => 88,
-        89  => 89,
-        94  => 89,
-        90  => 90,
-        93  => 90,
-        91  => 91,
-        96  => 91,
-        92  => 92,
-        95  => 92,
-        97  => 97,
-        98  => 98,
-        99  => 99,
-        102 => 102,
-        107 => 107,
-        108 => 108,
-        109 => 109,
-        110 => 110,
-        112 => 112,
-        115 => 115,
-        116 => 116,
-        119 => 119,
-        123 => 123,
-        124 => 124,
-        126 => 126,
-        127 => 127,
-        128 => 128,
-        129 => 129,
-        130 => 130,
-        132 => 132,
-        188 => 132,
-        133 => 133,
-        134 => 134,
-        135 => 135,
-        136 => 136,
-        137 => 137,
-        140 => 137,
-        138 => 138,
-        139 => 139,
-        141 => 141,
-        143 => 143,
-        144 => 144,
-        145 => 145,
-        146 => 146,
-        147 => 147,
-        148 => 148,
-        149 => 149,
-        150 => 150,
-        151 => 151,
-        152 => 152,
-        153 => 153,
-        154 => 154,
-        155 => 155,
-        156 => 156,
-        157 => 157,
-        160 => 160,
-        161 => 161,
-        163 => 163,
-        164 => 164,
-        168 => 168,
-        169 => 169,
-        170 => 170,
-        171 => 171,
-        172 => 172,
-        173 => 173,
-        174 => 174,
-        175 => 175,
-        176 => 176,
-        177 => 177,
-        178 => 178,
-        179 => 179,
-        180 => 180,
-        181 => 181,
-        182 => 182,
-        183 => 183,
-        184 => 184,
-        185 => 185,
-        187 => 187,
-        189 => 189,
-        190 => 190,
-        192 => 192,
-        193 => 193,
-        194 => 194,
-        195 => 195,
-        196 => 196,
-        197 => 196,
-        199 => 196,
-        198 => 198,
-        200 => 200,
-        201 => 201,
-        202 => 202,
-    );
+    public static $yyReduceMap = array(0   => 0, 1 => 1, 2 => 2, 4 => 4, 5 => 5, 6 => 6, 7 => 7, 8 => 8, 17 => 8,
+                                       18  => 8, 45 => 8, 68 => 8, 69 => 8, 77 => 8, 78 => 8, 82 => 8, 91 => 8, 96 => 8,
+                                       97  => 8, 102 => 8, 104 => 8, 105 => 8, 109 => 8, 111 => 8, 112 => 8, 116 => 8,
+                                       177 => 8, 182 => 8, 9 => 9, 10 => 10, 11 => 11, 12 => 12, 13 => 13, 16 => 13,
+                                       14  => 14, 76 => 14, 15 => 15, 92 => 15, 94 => 15, 95 => 15, 123 => 15, 19 => 19,
+                                       20  => 20, 21 => 21, 24 => 21, 22 => 22, 25 => 22, 23 => 23, 26 => 23, 28 => 23,
+                                       27  => 27, 29 => 29, 30 => 29, 31 => 31, 32 => 32, 33 => 33, 34 => 34, 35 => 35,
+                                       36  => 36, 37 => 37, 38 => 38, 39 => 39, 40 => 40, 42 => 40, 41 => 41, 43 => 43,
+                                       44  => 44, 46 => 46, 47 => 47, 48 => 48, 49 => 49, 51 => 49, 50 => 50, 52 => 50,
+                                       53  => 53, 54 => 54, 55 => 55, 56 => 56, 57 => 57, 58 => 58, 59 => 59, 60 => 60,
+                                       61  => 61, 62 => 62, 71 => 62, 158 => 62, 162 => 62, 166 => 62, 167 => 62,
+                                       63  => 63, 159 => 63, 165 => 63, 64 => 64, 65 => 65, 66 => 65, 67 => 67,
+                                       143 => 67, 70 => 70, 72 => 72, 73 => 73, 74 => 73, 75 => 75, 79 => 79, 80 => 80,
+                                       81  => 80, 83 => 83, 108 => 83, 84 => 84, 85 => 85, 86 => 86, 87 => 87, 88 => 88,
+                                       89  => 89, 90 => 90, 93 => 93, 98 => 98, 99 => 99, 100 => 100, 101 => 101,
+                                       103 => 103, 106 => 106, 107 => 107, 110 => 110, 113 => 113, 114 => 114,
+                                       115 => 115, 117 => 117, 118 => 118, 119 => 119, 120 => 120, 121 => 121,
+                                       122 => 122, 124 => 124, 179 => 124, 125 => 125, 126 => 126, 127 => 127,
+                                       128 => 128, 129 => 129, 130 => 130, 138 => 130, 131 => 131, 132 => 132,
+                                       133 => 133, 134 => 133, 136 => 133, 137 => 133, 135 => 135, 139 => 139,
+                                       140 => 140, 141 => 141, 183 => 141, 142 => 142, 144 => 144, 145 => 145,
+                                       146 => 146, 147 => 147, 148 => 148, 149 => 149, 150 => 150, 151 => 151,
+                                       152 => 152, 153 => 153, 154 => 154, 155 => 155, 156 => 156, 157 => 157,
+                                       160 => 160, 161 => 161, 163 => 163, 164 => 164, 168 => 168, 169 => 169,
+                                       170 => 170, 171 => 171, 172 => 172, 173 => 173, 174 => 174, 175 => 175,
+                                       176 => 176, 178 => 178, 180 => 180, 181 => 181, 184 => 184, 185 => 185,
+                                       186 => 186, 187 => 187, 188 => 187, 190 => 187, 189 => 189, 191 => 191,
+                                       192 => 192, 193 => 193,);
 
-    #line 206 "../smarty/lexer/smarty_internal_templateparser.y"
+    #line 201 "../smarty/lexer/smarty_internal_templateparser.y"
     function yy_r0()
     {
         $this->_retvalue = $this->root_buffer->to_smarty_php();
     }
 
-    #line 214 "../smarty/lexer/smarty_internal_templateparser.y"
+    #line 209 "../smarty/lexer/smarty_internal_templateparser.y"
     function yy_r1()
     {
         if ($this->yystack[$this->yyidx + 0]->minor != null) {
@@ -2282,7 +1225,7 @@ class Smarty_Internal_Templateparser
         }
     }
 
-    #line 221 "../smarty/lexer/smarty_internal_templateparser.y"
+    #line 216 "../smarty/lexer/smarty_internal_templateparser.y"
     function yy_r2()
     {
         if ($this->yystack[$this->yyidx + 0]->minor != null) {
@@ -2291,16 +1234,11 @@ class Smarty_Internal_Templateparser
         }
     }
 
-    #line 235 "../smarty/lexer/smarty_internal_templateparser.y"
+    #line 230 "../smarty/lexer/smarty_internal_templateparser.y"
     function yy_r4()
     {
         if ($this->compiler->has_code) {
-            $tmp = '';
-            foreach ($this->compiler->prefix_code as $code) {
-                $tmp .= $code;
-            }
-            $this->compiler->prefix_code = array();
-            $this->_retvalue = new Smarty_Internal_ParseTree_Tag($this, $this->compiler->processNocacheCode($tmp . $this->yystack[$this->yyidx + - 1]->minor, true));
+            $this->_retvalue = $this->mergePrefixCode($this->yystack[$this->yyidx + 0]->minor);
         } else {
             $this->_retvalue = null;
         }
@@ -2308,171 +1246,61 @@ class Smarty_Internal_Templateparser
         $this->block_nesting_level = count($this->compiler->_tag_stack);
     }
 
-    #line 247 "../smarty/lexer/smarty_internal_templateparser.y"
+    #line 241 "../smarty/lexer/smarty_internal_templateparser.y"
     function yy_r5()
-    {
-        $this->_retvalue = null;
-    }
-
-    #line 252 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r6()
     {
         $this->_retvalue = new Smarty_Internal_ParseTree_Text($this, $this->yystack[$this->yyidx + 0]->minor);
     }
 
-    #line 257 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r7()
+    #line 245 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r6()
     {
-        if (strpos($this->yystack[$this->yyidx + 0]->minor, '<s') === 0) {
-            $this->lex->is_phpScript = true;
-        }
-        if ($this->php_handling == Smarty::PHP_PASSTHRU) {
-            if ($this->lex->is_phpScript) {
-                $s = addcslashes($this->yystack[$this->yyidx + 0]->minor, "'");
-                $this->_retvalue = new Smarty_Internal_ParseTree_Text($this, $s);
-            } else {
-                $this->_retvalue = new Smarty_Internal_ParseTree_Text($this, $this->yystack[$this->yyidx + 0]->minor);
+        $code = $this->compiler->compileTag('private_php', array(array('code' => $this->yystack[$this->yyidx + 0]->minor),
+            array('type' => $this->lex->phpType)), array());
+        if ($this->compiler->has_code && !empty($code)) {
+            $tmp = '';
+            foreach ($this->compiler->prefix_code as $code) {
+                $tmp .= $code;
             }
-        } elseif ($this->php_handling == Smarty::PHP_QUOTE) {
-            $this->_retvalue = new Smarty_Internal_ParseTree_Text($this, htmlspecialchars($this->yystack[$this->yyidx + 0]->minor, ENT_QUOTES));
-        } elseif ($this->php_handling == Smarty::PHP_ALLOW) {
-            if (!($this->smarty instanceof SmartyBC)) {
-                $this->compiler->trigger_template_error(self::Err3);
-            }
-            $this->_retvalue = new Smarty_Internal_ParseTree_Tag($this, $this->compiler->processNocacheCode('<?php ', true));
-        } elseif ($this->php_handling == Smarty::PHP_REMOVE) {
-            $this->_retvalue = null;
-        }
-    }
-
-    #line 281 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r8()
-    {
-        if ($this->is_xml) {
-            $this->compiler->tag_nocache = true;
-            $this->is_xml = false;
-            $save = $this->template->has_nocache_code;
-            $this->_retvalue = new Smarty_Internal_ParseTree_Tag($this, $this->compiler->processNocacheCode("<?php echo '?>';?>\n", $this->compiler, true));
-            $this->template->has_nocache_code = $save;
-        } elseif ($this->php_handling == Smarty::PHP_PASSTHRU) {
-            $this->_retvalue = new Smarty_Internal_ParseTree_Text($this, $this->yystack[$this->yyidx + 0]->minor);
-        } elseif ($this->php_handling == Smarty::PHP_QUOTE) {
-            $this->_retvalue = new Smarty_Internal_ParseTree_Text($this, htmlspecialchars('?>', ENT_QUOTES));
-        } elseif ($this->php_handling == Smarty::PHP_ALLOW) {
-            $this->_retvalue = new Smarty_Internal_ParseTree_Tag($this, $this->compiler->processNocacheCode('?>', true));
-        } elseif ($this->php_handling == Smarty::PHP_REMOVE) {
-            $this->_retvalue = null;
-        }
-    }
-
-    #line 299 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r9()
-    {
-        if (!$this->lex->is_phpScript) {
-            $this->_retvalue = new Smarty_Internal_ParseTree_Text($this, $this->yystack[$this->yyidx + 0]->minor);
+            $this->compiler->prefix_code = array();
+            $this->_retvalue = new Smarty_Internal_ParseTree_Tag($this, $this->compiler->processNocacheCode($tmp . $code, true));
         } else {
-            $this->lex->is_phpScript = false;
-            if ($this->php_handling == Smarty::PHP_PASSTHRU) {
-                $this->_retvalue = new Smarty_Internal_ParseTree_Text($this, $this->yystack[$this->yyidx + 0]->minor);
-            } elseif ($this->php_handling == Smarty::PHP_QUOTE) {
-                $this->_retvalue = new Smarty_Internal_ParseTree_Text($this, htmlspecialchars($this->yystack[$this->yyidx + 0]->minor, ENT_QUOTES));
-            } elseif ($this->php_handling == Smarty::PHP_ALLOW) {
-                $this->_retvalue = new Smarty_Internal_ParseTree_Tag($this, $this->compiler->processNocacheCode('?>', true));
-            } elseif ($this->php_handling == Smarty::PHP_REMOVE) {
-                $this->_retvalue = null;
-            }
+            $this->_retvalue = null;
         }
     }
 
-    #line 317 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r10()
-    {
-        if ($this->php_handling == Smarty::PHP_PASSTHRU) {
-            $this->_retvalue = new Smarty_Internal_ParseTree_Text($this, $this->yystack[$this->yyidx + 0]->minor);
-        } elseif ($this->php_handling == Smarty::PHP_QUOTE) {
-            $this->_retvalue = new Smarty_Internal_ParseTree_Text($this, htmlspecialchars($this->yystack[$this->yyidx + 0]->minor, ENT_QUOTES));
-        } elseif ($this->php_handling == Smarty::PHP_ALLOW) {
-            if ($this->asp_tags) {
-                if (!($this->smarty instanceof SmartyBC)) {
-                    $this->compiler->trigger_template_error(self::Err3);
-                }
-                $this->_retvalue = new Smarty_Internal_ParseTree_Tag($this, $this->compiler->processNocacheCode('<%', true));
-            } else {
-                $this->_retvalue = new Smarty_Internal_ParseTree_Text($this, $this->yystack[$this->yyidx + 0]->minor);
-            }
-        } elseif ($this->php_handling == Smarty::PHP_REMOVE) {
-            if ($this->asp_tags) {
-                $this->_retvalue = null;
-            } else {
-                $this->_retvalue = new Smarty_Internal_ParseTree_Text($this, $this->yystack[$this->yyidx + 0]->minor);
-            }
-        }
-    }
-
-    #line 341 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r11()
-    {
-        if ($this->php_handling == Smarty::PHP_PASSTHRU) {
-            $this->_retvalue = new Smarty_Internal_ParseTree_Text($this, $this->yystack[$this->yyidx + 0]->minor);
-        } elseif ($this->php_handling == Smarty::PHP_QUOTE) {
-            $this->_retvalue = new Smarty_Internal_ParseTree_Text($this, htmlspecialchars('%>', ENT_QUOTES));
-        } elseif ($this->php_handling == Smarty::PHP_ALLOW) {
-            if ($this->asp_tags) {
-                $this->_retvalue = new Smarty_Internal_ParseTree_Tag($this, $this->compiler->processNocacheCode('%>', true));
-            } else {
-                $this->_retvalue = new Smarty_Internal_ParseTree_Text($this, $this->yystack[$this->yyidx + 0]->minor);
-            }
-        } elseif ($this->php_handling == Smarty::PHP_REMOVE) {
-            if ($this->asp_tags) {
-                $this->_retvalue = null;
-            } else {
-                $this->_retvalue = new Smarty_Internal_ParseTree_Text($this, $this->yystack[$this->yyidx + 0]->minor);
-            }
-        }
-    }
-
-    #line 363 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r12()
-    {
-        $this->compiler->tag_nocache = true;
-        $this->is_xml = true;
-        $save = $this->template->has_nocache_code;
-        $this->_retvalue = new Smarty_Internal_ParseTree_Tag($this, $this->compiler->processNocacheCode("<?php echo '<?xml';?>", $this->compiler, true));
-        $this->template->has_nocache_code = $save;
-    }
-
-    #line 372 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r13()
+    #line 256 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r7()
     {
         $this->_retvalue = $this->compiler->processText($this->yystack[$this->yyidx + 0]->minor);
     }
 
-    #line 376 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r14()
+    #line 260 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r8()
     {
         $this->_retvalue = $this->yystack[$this->yyidx + 0]->minor;
     }
 
-    #line 380 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r15()
+    #line 264 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r9()
     {
         $this->_retvalue = $this->yystack[$this->yyidx + - 1]->minor . $this->yystack[$this->yyidx + 0]->minor;
     }
 
-    #line 385 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r16()
+    #line 269 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r10()
     {
         $this->strip = true;
     }
 
-    #line 389 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r17()
+    #line 273 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r11()
     {
         $this->strip = false;
     }
 
-    #line 393 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r18()
+    #line 277 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r12()
     {
         if ($this->strip) {
             SMARTY_INTERNAL_COMPILE_BLOCK::blockSource($this->compiler, preg_replace('![\t ]*[\r\n]+[\t ]*!', '', $this->yystack[$this->yyidx + 0]->minor));
@@ -2481,72 +1309,117 @@ class Smarty_Internal_Templateparser
         }
     }
 
-    #line 402 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r19()
+    #line 286 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r13()
     {
         $this->_retvalue = '';
     }
 
-    #line 406 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r20()
+    #line 290 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r14()
     {
         $this->_retvalue = $this->yystack[$this->yyidx + - 1]->minor;
     }
 
-    #line 410 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r21()
+    #line 294 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r15()
     {
         $this->_retvalue = $this->yystack[$this->yyidx + - 1]->minor . $this->yystack[$this->yyidx + 0]->minor;
     }
 
-    #line 431 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r25()
+    #line 310 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r19()
+    {
+        $this->_retvalue = $this->yystack[$this->yyidx + - 1]->minor;
+    }
+
+    #line 316 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r20()
+    {
+        $var = trim(substr($this->yystack[$this->yyidx + 0]->minor, $this->lex->ldel_length, - $this->lex->rdel_length), ' $');
+        if (preg_match('/^(.*)(\s+nocache)$/', $var, $match)) {
+            $this->_retvalue = $this->compiler->compileTag('private_print_expression', array('nocache'), array('value' => $this->compiler->compileVariable('\'' . $match[1] . '\'')));
+        } else {
+            $this->_retvalue = $this->compiler->compileTag('private_print_expression', array(), array('value' => $this->compiler->compileVariable('\'' . $var . '\'')));
+        }
+    }
+
+    #line 326 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r21()
     {
         $this->_retvalue = $this->compiler->compileTag('private_print_expression', array(), array('value' => $this->yystack[$this->yyidx + 0]->minor));
     }
 
-    #line 435 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r26()
+    #line 330 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r22()
     {
-        $this->_retvalue = $this->compiler->compileTag('private_print_expression', $this->yystack[$this->yyidx + 0]->minor, array('value' => $this->yystack[$this->yyidx + - 2]->minor, 'modifierlist' => $this->yystack[$this->yyidx + - 1]->minor));
+        $this->_retvalue = $this->compiler->compileTag('private_print_expression', $this->yystack[$this->yyidx + 0]->minor, array('value'        => $this->yystack[$this->yyidx + - 2]->minor,
+                                                                                                                                  'modifierlist' => $this->yystack[$this->yyidx + - 1]->minor));
     }
 
-    #line 439 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r27()
+    #line 334 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r23()
     {
         $this->_retvalue = $this->compiler->compileTag('private_print_expression', $this->yystack[$this->yyidx + 0]->minor, array('value' => $this->yystack[$this->yyidx + - 1]->minor));
     }
 
-    #line 443 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r28()
+    #line 348 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r27()
     {
-        $this->_retvalue = $this->compiler->compileTag('private_print_expression', $this->yystack[$this->yyidx + 0]->minor, array('value' => $this->yystack[$this->yyidx + - 2]->minor, 'modifierlist' => $this->yystack[$this->yyidx + - 1]->minor));
+        $this->_retvalue = $this->compiler->compileTag('private_print_expression', $this->yystack[$this->yyidx + 0]->minor, array('value'        => $this->yystack[$this->yyidx + - 2]->minor,
+                                                                                                                                  'modifierlist' => $this->yystack[$this->yyidx + - 1]->minor));
     }
 
-    #line 456 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r30()
+    #line 361 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r29()
     {
-        $this->_retvalue = $this->compiler->compileTag('assign', array(array('value' => $this->yystack[$this->yyidx + 0]->minor), array('var' => "'" . $this->yystack[$this->yyidx + - 2]->minor . "'")));
+        $this->_retvalue = $this->compiler->compileTag('assign', array(array('value' => $this->yystack[$this->yyidx + 0]->minor),
+            array('var' => '\'' . substr($this->yystack[$this->yyidx + - 2]->minor, 1) . '\'')));
     }
 
-    #line 464 "../smarty/lexer/smarty_internal_templateparser.y"
+    #line 369 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r31()
+    {
+        $this->_retvalue = $this->compiler->compileTag('assign', array_merge(array(array('value' => $this->yystack[$this->yyidx + - 1]->minor),
+                                                                                 array('var' => '\'' . substr($this->yystack[$this->yyidx + - 3]->minor, 1) . '\'')), $this->yystack[$this->yyidx + 0]->minor));
+    }
+
+    #line 373 "../smarty/lexer/smarty_internal_templateparser.y"
     function yy_r32()
     {
-        $this->_retvalue = $this->compiler->compileTag('assign', array_merge(array(array('value' => $this->yystack[$this->yyidx + - 1]->minor), array('var' => "'" . $this->yystack[$this->yyidx + - 3]->minor . "'")), $this->yystack[$this->yyidx + 0]->minor));
+        $this->_retvalue = $this->compiler->compileTag('assign', array_merge(array(array('value' => $this->yystack[$this->yyidx + - 1]->minor),
+                                                                                 array('var' => $this->yystack[$this->yyidx + - 3]->minor['var'])), $this->yystack[$this->yyidx + 0]->minor), array('smarty_internal_index' => $this->yystack[$this->yyidx + - 3]->minor['smarty_internal_index']));
     }
 
-    #line 468 "../smarty/lexer/smarty_internal_templateparser.y"
+    #line 378 "../smarty/lexer/smarty_internal_templateparser.y"
     function yy_r33()
     {
-        $this->_retvalue = $this->compiler->compileTag('assign', array_merge(array(array('value' => $this->yystack[$this->yyidx + - 1]->minor), array('var' => $this->yystack[$this->yyidx + - 3]->minor['var'])), $this->yystack[$this->yyidx + 0]->minor), array('smarty_internal_index' => $this->yystack[$this->yyidx + - 3]->minor['smarty_internal_index']));
+        $tag = trim(substr($this->yystack[$this->yyidx + 0]->minor, $this->lex->ldel_length, - $this->lex->rdel_length));
+        if ($tag == 'strip') {
+            $this->strip = true;
+            $this->_retvalue = null;;
+        } else {
+            if (defined($tag)) {
+                if ($this->security) {
+                    $this->security->isTrustedConstant($tag, $this->compiler);
+                }
+                $this->_retvalue = $this->compiler->compileTag('private_print_expression', array(), array('value' => $tag));
+            } else {
+                if (preg_match('/^(.*)(\s+nocache)$/', $tag, $match)) {
+                    $this->_retvalue = $this->compiler->compileTag($match[1], array('nocache'));
+                } else {
+                    $this->_retvalue = $this->compiler->compileTag($tag, array());
+                }
+            }
+        }
     }
 
-    #line 473 "../smarty/lexer/smarty_internal_templateparser.y"
+    #line 400 "../smarty/lexer/smarty_internal_templateparser.y"
     function yy_r34()
     {
         if (defined($this->yystack[$this->yyidx + - 1]->minor)) {
-            if (isset($this->smarty->security_policy)) {
-                $this->smarty->security_policy->isTrustedConstant($this->yystack[$this->yyidx + - 1]->minor, $this->compiler);
+            if ($this->security) {
+                $this->security->isTrustedConstant($this->yystack[$this->yyidx + - 1]->minor, $this->compiler);
             }
             $this->_retvalue = $this->compiler->compileTag('private_print_expression', $this->yystack[$this->yyidx + 0]->minor, array('value' => $this->yystack[$this->yyidx + - 1]->minor));
         } else {
@@ -2554,12 +1427,12 @@ class Smarty_Internal_Templateparser
         }
     }
 
-    #line 483 "../smarty/lexer/smarty_internal_templateparser.y"
+    #line 410 "../smarty/lexer/smarty_internal_templateparser.y"
     function yy_r35()
     {
         if (defined($this->yystack[$this->yyidx + 0]->minor)) {
-            if (isset($this->smarty->security_policy)) {
-                $this->smarty->security_policy->isTrustedConstant($this->yystack[$this->yyidx + 0]->minor, $this->compiler);
+            if ($this->security) {
+                $this->security->isTrustedConstant($this->yystack[$this->yyidx + 0]->minor, $this->compiler);
             }
             $this->_retvalue = $this->compiler->compileTag('private_print_expression', array(), array('value' => $this->yystack[$this->yyidx + 0]->minor));
         } else {
@@ -2567,109 +1440,121 @@ class Smarty_Internal_Templateparser
         }
     }
 
-    #line 496 "../smarty/lexer/smarty_internal_templateparser.y"
+    #line 423 "../smarty/lexer/smarty_internal_templateparser.y"
     function yy_r36()
     {
         if (defined($this->yystack[$this->yyidx + - 2]->minor)) {
-            if (isset($this->smarty->security_policy)) {
-                $this->smarty->security_policy->isTrustedConstant($this->yystack[$this->yyidx + - 2]->minor, $this->compiler);
+            if ($this->security) {
+                $this->security->isTrustedConstant($this->yystack[$this->yyidx + - 2]->minor, $this->compiler);
             }
-            $this->_retvalue = $this->compiler->compileTag('private_print_expression', $this->yystack[$this->yyidx + 0]->minor, array('value' => $this->yystack[$this->yyidx + - 2]->minor, 'modifierlist' => $this->yystack[$this->yyidx + - 1]->minor));
+            $this->_retvalue = $this->compiler->compileTag('private_print_expression', $this->yystack[$this->yyidx + 0]->minor, array('value'        => $this->yystack[$this->yyidx + - 2]->minor,
+                                                                                                                                      'modifierlist' => $this->yystack[$this->yyidx + - 1]->minor));
         } else {
             $this->_retvalue = '<?php ob_start();?>' . $this->compiler->compileTag($this->yystack[$this->yyidx + - 2]->minor, $this->yystack[$this->yyidx + 0]->minor) . '<?php echo ';
-            $this->_retvalue .= $this->compiler->compileTag('private_modifier', array(), array('modifierlist' => $this->yystack[$this->yyidx + - 1]->minor, 'value' => 'ob_get_clean()')) . ';?>';
+            $this->_retvalue .= $this->compiler->compileTag('private_modifier', array(), array('modifierlist' => $this->yystack[$this->yyidx + - 1]->minor,
+                                                                                               'value'        => 'ob_get_clean()')) . ';?>';
         }
     }
 
-    #line 509 "../smarty/lexer/smarty_internal_templateparser.y"
+    #line 436 "../smarty/lexer/smarty_internal_templateparser.y"
     function yy_r37()
     {
         $this->_retvalue = $this->compiler->compileTag($this->yystack[$this->yyidx + - 3]->minor, $this->yystack[$this->yyidx + 0]->minor, array('object_method' => $this->yystack[$this->yyidx + - 1]->minor));
     }
 
-    #line 514 "../smarty/lexer/smarty_internal_templateparser.y"
+    #line 441 "../smarty/lexer/smarty_internal_templateparser.y"
     function yy_r38()
     {
         $this->_retvalue = '<?php ob_start();?>' . $this->compiler->compileTag($this->yystack[$this->yyidx + - 4]->minor, $this->yystack[$this->yyidx + 0]->minor, array('object_method' => $this->yystack[$this->yyidx + - 2]->minor)) . '<?php echo ';
-        $this->_retvalue .= $this->compiler->compileTag('private_modifier', array(), array('modifierlist' => $this->yystack[$this->yyidx + - 1]->minor, 'value' => 'ob_get_clean()')) . ';?>';
+        $this->_retvalue .= $this->compiler->compileTag('private_modifier', array(), array('modifierlist' => $this->yystack[$this->yyidx + - 1]->minor,
+                                                                                           'value'        => 'ob_get_clean()')) . ';?>';
     }
 
-    #line 520 "../smarty/lexer/smarty_internal_templateparser.y"
+    #line 447 "../smarty/lexer/smarty_internal_templateparser.y"
     function yy_r39()
     {
         $tag = trim(substr($this->yystack[$this->yyidx + - 1]->minor, $this->lex->ldel_length));
         $this->_retvalue = $this->compiler->compileTag(($tag == 'else if') ? 'elseif' : $tag, array(), array('if condition' => $this->yystack[$this->yyidx + 0]->minor));
     }
 
-    #line 525 "../smarty/lexer/smarty_internal_templateparser.y"
+    #line 452 "../smarty/lexer/smarty_internal_templateparser.y"
     function yy_r40()
     {
         $tag = trim(substr($this->yystack[$this->yyidx + - 2]->minor, $this->lex->ldel_length));
         $this->_retvalue = $this->compiler->compileTag(($tag == 'else if') ? 'elseif' : $tag, $this->yystack[$this->yyidx + 0]->minor, array('if condition' => $this->yystack[$this->yyidx + - 1]->minor));
     }
 
-    #line 530 "../smarty/lexer/smarty_internal_templateparser.y"
+    #line 457 "../smarty/lexer/smarty_internal_templateparser.y"
     function yy_r41()
     {
         $tag = trim(substr($this->yystack[$this->yyidx + - 1]->minor, $this->lex->ldel_length));
         $this->_retvalue = $this->compiler->compileTag(($tag == 'else if') ? 'elseif' : $tag, array(), array('if condition' => $this->yystack[$this->yyidx + 0]->minor));
     }
 
-    #line 541 "../smarty/lexer/smarty_internal_templateparser.y"
+    #line 468 "../smarty/lexer/smarty_internal_templateparser.y"
     function yy_r43()
     {
-        $this->_retvalue = $this->compiler->compileTag('for', array_merge($this->yystack[$this->yyidx + 0]->minor, array(array('start' => $this->yystack[$this->yyidx + - 9]->minor), array('ifexp' => $this->yystack[$this->yyidx + - 6]->minor), array('var' => $this->yystack[$this->yyidx + - 2]->minor), array('step' => $this->yystack[$this->yyidx + - 1]->minor))), 1);
+        $this->_retvalue = $this->compiler->compileTag('for', array_merge($this->yystack[$this->yyidx + 0]->minor, array(array('start' => $this->yystack[$this->yyidx + - 6]->minor),
+            array('ifexp' => $this->yystack[$this->yyidx + - 4]->minor),
+            array('var' => $this->yystack[$this->yyidx + - 2]->minor),
+            array('step' => $this->yystack[$this->yyidx + - 1]->minor))), 1);
     }
 
-    #line 545 "../smarty/lexer/smarty_internal_templateparser.y"
+    #line 472 "../smarty/lexer/smarty_internal_templateparser.y"
     function yy_r44()
     {
         $this->_retvalue = '=' . $this->yystack[$this->yyidx + 0]->minor;
     }
 
-    #line 553 "../smarty/lexer/smarty_internal_templateparser.y"
+    #line 480 "../smarty/lexer/smarty_internal_templateparser.y"
     function yy_r46()
     {
-        $this->_retvalue = $this->compiler->compileTag('for', array_merge($this->yystack[$this->yyidx + 0]->minor, array(array('start' => $this->yystack[$this->yyidx + - 3]->minor), array('to' => $this->yystack[$this->yyidx + - 1]->minor))), 0);
+        $this->_retvalue = $this->compiler->compileTag('for', array_merge($this->yystack[$this->yyidx + 0]->minor, array(array('start' => $this->yystack[$this->yyidx + - 3]->minor),
+            array('to' => $this->yystack[$this->yyidx + - 1]->minor))), 0);
     }
 
-    #line 557 "../smarty/lexer/smarty_internal_templateparser.y"
+    #line 484 "../smarty/lexer/smarty_internal_templateparser.y"
     function yy_r47()
     {
-        $this->_retvalue = $this->compiler->compileTag('for', array_merge($this->yystack[$this->yyidx + 0]->minor, array(array('start' => $this->yystack[$this->yyidx + - 5]->minor), array('to' => $this->yystack[$this->yyidx + - 3]->minor), array('step' => $this->yystack[$this->yyidx + - 1]->minor))), 0);
+        $this->_retvalue = $this->compiler->compileTag('for', array_merge($this->yystack[$this->yyidx + 0]->minor, array(array('start' => $this->yystack[$this->yyidx + - 5]->minor),
+            array('to' => $this->yystack[$this->yyidx + - 3]->minor),
+            array('step' => $this->yystack[$this->yyidx + - 1]->minor))), 0);
     }
 
-    #line 562 "../smarty/lexer/smarty_internal_templateparser.y"
+    #line 489 "../smarty/lexer/smarty_internal_templateparser.y"
     function yy_r48()
     {
         $this->_retvalue = $this->compiler->compileTag('foreach', $this->yystack[$this->yyidx + 0]->minor);
     }
 
-    #line 567 "../smarty/lexer/smarty_internal_templateparser.y"
+    #line 494 "../smarty/lexer/smarty_internal_templateparser.y"
     function yy_r49()
     {
-        $this->_retvalue = $this->compiler->compileTag('foreach', array_merge($this->yystack[$this->yyidx + 0]->minor, array(array('from' => $this->yystack[$this->yyidx + - 4]->minor), array('item' => $this->yystack[$this->yyidx + - 1]->minor))));
+        $this->_retvalue = $this->compiler->compileTag('foreach', array_merge($this->yystack[$this->yyidx + 0]->minor, array(array('from' => $this->yystack[$this->yyidx + - 3]->minor),
+            array('item' => $this->yystack[$this->yyidx + - 1]->minor))));
     }
 
-    #line 571 "../smarty/lexer/smarty_internal_templateparser.y"
+    #line 498 "../smarty/lexer/smarty_internal_templateparser.y"
     function yy_r50()
     {
-        $this->_retvalue = $this->compiler->compileTag('foreach', array_merge($this->yystack[$this->yyidx + 0]->minor, array(array('from' => $this->yystack[$this->yyidx + - 7]->minor), array('item' => $this->yystack[$this->yyidx + - 1]->minor), array('key' => $this->yystack[$this->yyidx + - 4]->minor))));
+        $this->_retvalue = $this->compiler->compileTag('foreach', array_merge($this->yystack[$this->yyidx + 0]->minor, array(array('from' => $this->yystack[$this->yyidx + - 5]->minor),
+            array('item' => $this->yystack[$this->yyidx + - 1]->minor),
+            array('key' => $this->yystack[$this->yyidx + - 3]->minor))));
     }
 
-    #line 584 "../smarty/lexer/smarty_internal_templateparser.y"
+    #line 511 "../smarty/lexer/smarty_internal_templateparser.y"
     function yy_r53()
     {
         $this->_retvalue = $this->compiler->compileTag('setfilter', array(), array('modifier_list' => array(array_merge(array($this->yystack[$this->yyidx + - 1]->minor), $this->yystack[$this->yyidx + 0]->minor))));
     }
 
-    #line 588 "../smarty/lexer/smarty_internal_templateparser.y"
+    #line 515 "../smarty/lexer/smarty_internal_templateparser.y"
     function yy_r54()
     {
         $this->_retvalue = $this->compiler->compileTag('setfilter', array(), array('modifier_list' => array_merge(array(array_merge(array($this->yystack[$this->yyidx + - 2]->minor), $this->yystack[$this->yyidx + - 1]->minor)), $this->yystack[$this->yyidx + 0]->minor)));
     }
 
-    #line 593 "../smarty/lexer/smarty_internal_templateparser.y"
+    #line 520 "../smarty/lexer/smarty_internal_templateparser.y"
     function yy_r55()
     {
         $j = strrpos($this->yystack[$this->yyidx + 0]->minor, '.');
@@ -2682,228 +1567,220 @@ class Smarty_Internal_Templateparser
         }
     }
 
-    #line 606 "../smarty/lexer/smarty_internal_templateparser.y"
+    #line 533 "../smarty/lexer/smarty_internal_templateparser.y"
     function yy_r56()
+    {
+        $tag = trim(substr($this->yystack[$this->yyidx + 0]->minor, $this->lex->ldel_length, - $this->lex->rdel_length), ' /');
+        if ($tag == 'strip') {
+            $this->strip = false;
+            $this->_retvalue = null;
+        } else {
+            $this->_retvalue = $this->compiler->compileTag($tag . 'close', array());
+        }
+    }
+
+    #line 542 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r57()
     {
         $this->_retvalue = $this->compiler->compileTag($this->yystack[$this->yyidx + 0]->minor . 'close', array());
     }
 
-    #line 610 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r57()
+    #line 546 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r58()
     {
         $this->_retvalue = $this->compiler->compileTag($this->yystack[$this->yyidx + - 1]->minor . 'close', array(), array('modifier_list' => $this->yystack[$this->yyidx + 0]->minor));
     }
 
-    #line 615 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r58()
+    #line 551 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r59()
     {
         $this->_retvalue = $this->compiler->compileTag($this->yystack[$this->yyidx + - 2]->minor . 'close', array(), array('object_method' => $this->yystack[$this->yyidx + 0]->minor));
     }
 
-    #line 619 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r59()
+    #line 555 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r60()
     {
-        $this->_retvalue = $this->compiler->compileTag($this->yystack[$this->yyidx + - 3]->minor . 'close', array(), array('object_method' => $this->yystack[$this->yyidx + - 1]->minor, 'modifier_list' => $this->yystack[$this->yyidx + 0]->minor));
+        $this->_retvalue = $this->compiler->compileTag($this->yystack[$this->yyidx + - 3]->minor . 'close', array(), array('object_method' => $this->yystack[$this->yyidx + - 1]->minor,
+                                                                                                                           'modifier_list' => $this->yystack[$this->yyidx + 0]->minor));
     }
 
-    #line 627 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r60()
+    #line 563 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r61()
     {
         $this->_retvalue = $this->yystack[$this->yyidx + - 1]->minor;
         $this->_retvalue[] = $this->yystack[$this->yyidx + 0]->minor;
     }
 
-    #line 633 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r61()
+    #line 569 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r62()
     {
         $this->_retvalue = array($this->yystack[$this->yyidx + 0]->minor);
     }
 
-    #line 638 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r62()
+    #line 574 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r63()
     {
         $this->_retvalue = array();
     }
 
-    #line 643 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r63()
+    #line 579 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r64()
     {
         if (defined($this->yystack[$this->yyidx + 0]->minor)) {
-            if (isset($this->smarty->security_policy)) {
-                $this->smarty->security_policy->isTrustedConstant($this->yystack[$this->yyidx + 0]->minor, $this->compiler);
+            if ($this->security) {
+                $this->security->isTrustedConstant($this->yystack[$this->yyidx + 0]->minor, $this->compiler);
             }
             $this->_retvalue = array($this->yystack[$this->yyidx + - 2]->minor => $this->yystack[$this->yyidx + 0]->minor);
         } else {
-            $this->_retvalue = array($this->yystack[$this->yyidx + - 2]->minor => "'" . $this->yystack[$this->yyidx + 0]->minor . "'");
+            $this->_retvalue = array($this->yystack[$this->yyidx + - 2]->minor => '\'' . $this->yystack[$this->yyidx + 0]->minor . '\'');
         }
     }
 
-    #line 654 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r64()
+    #line 590 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r65()
     {
         $this->_retvalue = array(trim($this->yystack[$this->yyidx + - 1]->minor, " =\n\r\t") => $this->yystack[$this->yyidx + 0]->minor);
     }
 
-    #line 662 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r66()
+    #line 598 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r67()
     {
-        $this->_retvalue = "'" . $this->yystack[$this->yyidx + 0]->minor . "'";
+        $this->_retvalue = '\'' . $this->yystack[$this->yyidx + 0]->minor . '\'';
     }
 
-    #line 674 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r69()
+    #line 610 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r70()
     {
         $this->_retvalue = array($this->yystack[$this->yyidx + - 2]->minor => $this->yystack[$this->yyidx + 0]->minor);
     }
 
-    #line 687 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r71()
+    #line 623 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r72()
     {
         $this->yystack[$this->yyidx + - 2]->minor[] = $this->yystack[$this->yyidx + 0]->minor;
         $this->_retvalue = $this->yystack[$this->yyidx + - 2]->minor;
     }
 
-    #line 692 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r72()
+    #line 628 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r73()
     {
-        $this->_retvalue = array('var' => $this->yystack[$this->yyidx + - 2]->minor, 'value' => $this->yystack[$this->yyidx + 0]->minor);
+        $this->_retvalue = array('var'   => '\'' . substr($this->yystack[$this->yyidx + - 2]->minor, 1) . '\'',
+                                 'value' => $this->yystack[$this->yyidx + 0]->minor);
     }
 
-    #line 720 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r77()
+    #line 635 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r75()
     {
-        $this->_retvalue = '$_smarty_tpl->getStreamVariable(\'' . $this->yystack[$this->yyidx + - 2]->minor . '://' . $this->yystack[$this->yyidx + 0]->minor . '\')';
+        $this->_retvalue = array('var'   => $this->yystack[$this->yyidx + - 2]->minor,
+                                 'value' => $this->yystack[$this->yyidx + 0]->minor);
     }
 
-    #line 725 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r78()
+    #line 659 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r79()
+    {
+        $this->_retvalue = '$_smarty_tpl->getStreamVariable(\'' . substr($this->yystack[$this->yyidx + - 2]->minor, 1) . '://' . $this->yystack[$this->yyidx + 0]->minor . '\')';
+    }
+
+    #line 664 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r80()
     {
         $this->_retvalue = $this->yystack[$this->yyidx + - 2]->minor . trim($this->yystack[$this->yyidx + - 1]->minor) . $this->yystack[$this->yyidx + 0]->minor;
     }
 
-    #line 744 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r82()
-    {
-        $this->_retvalue = $this->compiler->compileTag('private_modifier', array(), array('value' => $this->yystack[$this->yyidx + - 1]->minor, 'modifierlist' => $this->yystack[$this->yyidx + 0]->minor));
-    }
-
-    #line 750 "../smarty/lexer/smarty_internal_templateparser.y"
+    #line 678 "../smarty/lexer/smarty_internal_templateparser.y"
     function yy_r83()
     {
-        $this->_retvalue = $this->yystack[$this->yyidx + - 2]->minor . $this->yystack[$this->yyidx + - 1]->minor . $this->yystack[$this->yyidx + 0]->minor;
+        $this->_retvalue = $this->compiler->compileTag('private_modifier', array(), array('value'        => $this->yystack[$this->yyidx + - 1]->minor,
+                                                                                          'modifierlist' => $this->yystack[$this->yyidx + 0]->minor));
     }
 
-    #line 754 "../smarty/lexer/smarty_internal_templateparser.y"
+    #line 684 "../smarty/lexer/smarty_internal_templateparser.y"
     function yy_r84()
+    {
+        $this->_retvalue = (isset($this->yystack[$this->yyidx + - 1]->minor['pre']) ? $this->yystack[$this->yyidx + - 1]->minor['pre'] : '') . $this->yystack[$this->yyidx + - 2]->minor . $this->yystack[$this->yyidx + - 1]->minor['op'] . $this->yystack[$this->yyidx + 0]->minor . (isset($this->yystack[$this->yyidx + - 1]->minor['pre']) ? ')' : '');
+    }
+
+    #line 687 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r85()
+    {
+        $this->_retvalue = $this->yystack[$this->yyidx + 0]->minor . $this->yystack[$this->yyidx + - 1]->minor . ')';
+    }
+
+    #line 691 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r86()
     {
         $this->_retvalue = 'in_array(' . $this->yystack[$this->yyidx + - 2]->minor . ',' . $this->yystack[$this->yyidx + 0]->minor . ')';
     }
 
-    #line 758 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r85()
+    #line 695 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r87()
     {
         $this->_retvalue = 'in_array(' . $this->yystack[$this->yyidx + - 2]->minor . ',(array)' . $this->yystack[$this->yyidx + 0]->minor . ')';
     }
 
-    #line 766 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r87()
-    {
-        $this->_retvalue = '!(' . $this->yystack[$this->yyidx + - 2]->minor . ' % ' . $this->yystack[$this->yyidx + 0]->minor . ')';
-    }
-
-    #line 770 "../smarty/lexer/smarty_internal_templateparser.y"
+    #line 699 "../smarty/lexer/smarty_internal_templateparser.y"
     function yy_r88()
-    {
-        $this->_retvalue = '(' . $this->yystack[$this->yyidx + - 2]->minor . ' % ' . $this->yystack[$this->yyidx + 0]->minor . ')';
-    }
-
-    #line 774 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r89()
-    {
-        $this->_retvalue = '!(1 & ' . $this->yystack[$this->yyidx + - 1]->minor . ')';
-    }
-
-    #line 778 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r90()
-    {
-        $this->_retvalue = '(1 & ' . $this->yystack[$this->yyidx + - 1]->minor . ')';
-    }
-
-    #line 782 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r91()
-    {
-        $this->_retvalue = '!(1 & ' . $this->yystack[$this->yyidx + - 2]->minor . ' / ' . $this->yystack[$this->yyidx + 0]->minor . ')';
-    }
-
-    #line 786 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r92()
-    {
-        $this->_retvalue = '(1 & ' . $this->yystack[$this->yyidx + - 2]->minor . ' / ' . $this->yystack[$this->yyidx + 0]->minor . ')';
-    }
-
-    #line 806 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r97()
     {
         $this->_retvalue = $this->yystack[$this->yyidx + - 2]->minor . $this->yystack[$this->yyidx + - 1]->minor . $this->yystack[$this->yyidx + 0]->minor;
     }
 
-    #line 814 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r98()
+    #line 707 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r89()
     {
-        $this->_retvalue = $this->yystack[$this->yyidx + - 6]->minor . ' ? ' . $this->compiler->compileVariable("'" . $this->yystack[$this->yyidx + - 2]->minor . "'") . ' : ' . $this->yystack[$this->yyidx + 0]->minor;
+        $this->_retvalue = $this->yystack[$this->yyidx + - 5]->minor . ' ? ' . $this->compiler->compileVariable('\'' . substr($this->yystack[$this->yyidx + - 2]->minor, 1) . '\'') . ' : ' . $this->yystack[$this->yyidx + 0]->minor;
     }
 
-    #line 818 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r99()
+    #line 711 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r90()
     {
         $this->_retvalue = $this->yystack[$this->yyidx + - 5]->minor . ' ? ' . $this->yystack[$this->yyidx + - 2]->minor . ' : ' . $this->yystack[$this->yyidx + 0]->minor;
     }
 
-    #line 833 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r102()
+    #line 726 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r93()
     {
         $this->_retvalue = '!' . $this->yystack[$this->yyidx + 0]->minor;
     }
 
-    #line 854 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r107()
+    #line 747 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r98()
     {
         $this->_retvalue = $this->yystack[$this->yyidx + - 2]->minor . '.' . $this->yystack[$this->yyidx + 0]->minor;
     }
 
-    #line 858 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r108()
+    #line 751 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r99()
     {
         $this->_retvalue = $this->yystack[$this->yyidx + - 1]->minor . '.';
     }
 
-    #line 862 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r109()
+    #line 755 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r100()
     {
         $this->_retvalue = '.' . $this->yystack[$this->yyidx + 0]->minor;
     }
 
-    #line 867 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r110()
+    #line 760 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r101()
     {
         if (defined($this->yystack[$this->yyidx + 0]->minor)) {
-            if (isset($this->smarty->security_policy)) {
-                $this->smarty->security_policy->isTrustedConstant($this->yystack[$this->yyidx + 0]->minor, $this->compiler);
+            if ($this->security) {
+                $this->security->isTrustedConstant($this->yystack[$this->yyidx + 0]->minor, $this->compiler);
             }
             $this->_retvalue = $this->yystack[$this->yyidx + 0]->minor;
         } else {
-            $this->_retvalue = "'" . $this->yystack[$this->yyidx + 0]->minor . "'";
+            $this->_retvalue = '\'' . $this->yystack[$this->yyidx + 0]->minor . '\'';
         }
     }
 
-    #line 884 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r112()
+    #line 777 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r103()
     {
         $this->_retvalue = "(" . $this->yystack[$this->yyidx + - 1]->minor . ")";
     }
 
-    #line 899 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r115()
+    #line 792 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r106()
     {
         self::$prefix_number ++;
         if ($this->yystack[$this->yyidx + - 2]->minor['var'] == '\'smarty\'') {
@@ -2914,18 +1791,21 @@ class Smarty_Internal_Templateparser
         $this->_retvalue = '$_tmp' . self::$prefix_number . '::' . $this->yystack[$this->yyidx + 0]->minor[0] . $this->yystack[$this->yyidx + 0]->minor[1];
     }
 
-    #line 911 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r116()
+    #line 803 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r107()
     {
         self::$prefix_number ++;
-        $this->compiler->prefix_code[] = '<?php ob_start();?>' . $this->yystack[$this->yyidx + - 1]->minor . '<?php $_tmp' . self::$prefix_number . '=ob_get_clean();?>';
+        $tmp = $this->compiler->appendCode('<?php ob_start();?>', $this->yystack[$this->yyidx + 0]->minor);
+        $this->compiler->prefix_code[] = $this->compiler->appendCode($tmp, '<?php $_tmp' . self::$prefix_number . '=ob_get_clean();?>');
         $this->_retvalue = '$_tmp' . self::$prefix_number;
     }
 
-    #line 927 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r119()
+    #line 820 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r110()
     {
-        if (!in_array(strtolower($this->yystack[$this->yyidx + - 2]->minor), array('self', 'parent')) && (!$this->security || $this->smarty->security_policy->isTrustedStaticClassAccess($this->yystack[$this->yyidx + - 2]->minor, $this->yystack[$this->yyidx + 0]->minor, $this->compiler))) {
+        if (!in_array(strtolower($this->yystack[$this->yyidx + - 2]->minor), array('self',
+                'parent')) && (!$this->security || $this->security->isTrustedStaticClassAccess($this->yystack[$this->yyidx + - 2]->minor, $this->yystack[$this->yyidx + 0]->minor, $this->compiler))
+        ) {
             if (isset($this->smarty->registered_classes[$this->yystack[$this->yyidx + - 2]->minor])) {
                 $this->_retvalue = $this->smarty->registered_classes[$this->yystack[$this->yyidx + - 2]->minor] . '::' . $this->yystack[$this->yyidx + 0]->minor[0] . $this->yystack[$this->yyidx + 0]->minor[1];
             } else {
@@ -2936,8 +1816,14 @@ class Smarty_Internal_Templateparser
         }
     }
 
-    #line 961 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r123()
+    #line 854 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r113()
+    {
+        $this->_retvalue = $this->compiler->compileVariable('\'' . substr($this->yystack[$this->yyidx + 0]->minor, 1) . '\'');
+    }
+
+    #line 857 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r114()
     {
         if ($this->yystack[$this->yyidx + 0]->minor['var'] == '\'smarty\'') {
             $smarty_var = $this->compiler->compileTag('private_special_variable', array(), $this->yystack[$this->yyidx + 0]->minor['smarty_internal_index']);
@@ -2950,122 +1836,161 @@ class Smarty_Internal_Templateparser
         }
     }
 
-    #line 974 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r124()
+    #line 870 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r115()
     {
         $this->_retvalue = '$_smarty_tpl->tpl_vars[' . $this->yystack[$this->yyidx + - 2]->minor . ']->' . $this->yystack[$this->yyidx + 0]->minor;
     }
 
-    #line 984 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r126()
+    #line 880 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r117()
     {
         $this->_retvalue = '$_smarty_tpl->getConfigVariable( \'' . $this->yystack[$this->yyidx + - 1]->minor . '\')';
     }
 
-    #line 988 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r127()
+    #line 884 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r118()
     {
         $this->_retvalue = '(is_array($tmp = $_smarty_tpl->getConfigVariable( \'' . $this->yystack[$this->yyidx + - 2]->minor . '\')) ? $tmp' . $this->yystack[$this->yyidx + 0]->minor . ' :null)';
     }
 
-    #line 992 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r128()
+    #line 888 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r119()
     {
         $this->_retvalue = '$_smarty_tpl->getConfigVariable( ' . $this->yystack[$this->yyidx + - 1]->minor . ')';
     }
 
-    #line 996 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r129()
+    #line 892 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r120()
     {
         $this->_retvalue = '(is_array($tmp = $_smarty_tpl->getConfigVariable( ' . $this->yystack[$this->yyidx + - 2]->minor . ')) ? $tmp' . $this->yystack[$this->yyidx + 0]->minor . ' : null)';
     }
 
-    #line 1000 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r130()
+    #line 896 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r121()
     {
-        $this->_retvalue = array('var' => $this->yystack[$this->yyidx + - 1]->minor, 'smarty_internal_index' => $this->yystack[$this->yyidx + 0]->minor);
+        $this->_retvalue = array('var'                   => '\'' . substr($this->yystack[$this->yyidx + - 1]->minor, 1) . '\'',
+                                 'smarty_internal_index' => $this->yystack[$this->yyidx + 0]->minor);
     }
 
-    #line 1013 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r132()
+    #line 899 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r122()
+    {
+        $this->_retvalue = array('var'                   => $this->yystack[$this->yyidx + - 1]->minor,
+                                 'smarty_internal_index' => $this->yystack[$this->yyidx + 0]->minor);
+    }
+
+    #line 912 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r124()
     {
         return;
     }
 
-    #line 1019 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r133()
+    #line 918 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r125()
+    {
+        $this->_retvalue = '[' . $this->compiler->compileVariable('\'' . substr($this->yystack[$this->yyidx + 0]->minor, 1) . '\'') . ']';
+    }
+
+    #line 921 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r126()
     {
         $this->_retvalue = '[' . $this->compiler->compileVariable($this->yystack[$this->yyidx + 0]->minor) . ']';
     }
 
-    #line 1023 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r134()
+    #line 925 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r127()
     {
         $this->_retvalue = '[' . $this->compiler->compileVariable($this->yystack[$this->yyidx + - 2]->minor) . '->' . $this->yystack[$this->yyidx + 0]->minor . ']';
     }
 
-    #line 1027 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r135()
+    #line 929 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r128()
     {
         if (defined($this->yystack[$this->yyidx + 0]->minor)) {
-            if (isset($this->smarty->security_policy)) {
-                $this->smarty->security_policy->isTrustedConstant($this->yystack[$this->yyidx + 0]->minor, $this->compiler);
+            if ($this->security) {
+                $this->security->isTrustedConstant($this->yystack[$this->yyidx + 0]->minor, $this->compiler);
             }
-            $this->_retvalue = "[" . $this->yystack[$this->yyidx + 0]->minor . "]";
+            $this->_retvalue = '[' . $this->yystack[$this->yyidx + 0]->minor . ']';
         } else {
             $this->_retvalue = "['" . $this->yystack[$this->yyidx + 0]->minor . "']";
         }
     }
 
-    #line 1038 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r136()
+    #line 940 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r129()
     {
-        $this->_retvalue = "[" . $this->yystack[$this->yyidx + 0]->minor . "]";
+        $this->_retvalue = '[' . $this->yystack[$this->yyidx + 0]->minor . ']';
     }
 
-    #line 1043 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r137()
+    #line 945 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r130()
     {
-        $this->_retvalue = "[" . $this->yystack[$this->yyidx + - 1]->minor . "]";
+        $this->_retvalue = '[' . $this->yystack[$this->yyidx + - 1]->minor . ']';
     }
 
-    #line 1048 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r138()
+    #line 950 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r131()
     {
         $this->_retvalue = '[' . $this->compiler->compileTag('private_special_variable', array(), '[\'section\'][\'' . $this->yystack[$this->yyidx + - 1]->minor . '\'][\'index\']') . ']';
     }
 
-    #line 1052 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r139()
+    #line 954 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r132()
     {
         $this->_retvalue = '[' . $this->compiler->compileTag('private_special_variable', array(), '[\'section\'][\'' . $this->yystack[$this->yyidx + - 3]->minor . '\'][\'' . $this->yystack[$this->yyidx + - 1]->minor . '\']') . ']';
     }
 
-    #line 1062 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r141()
+    #line 957 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r133()
+    {
+        $this->_retvalue = '[' . $this->yystack[$this->yyidx + - 1]->minor . ']';
+    }
+
+    #line 963 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r135()
+    {
+        $this->_retvalue = '[' . $this->compiler->compileVariable('\'' . substr($this->yystack[$this->yyidx + - 1]->minor, 1) . '\'') . ']';;
+    }
+
+    #line 979 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r139()
     {
         $this->_retvalue = '[]';
     }
 
-    #line 1076 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r143()
+    #line 989 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r140()
+    {
+        $this->_retvalue = '\'' . substr($this->yystack[$this->yyidx + 0]->minor, 1) . '\'';
+    }
+
+    #line 993 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r141()
+    {
+        $this->_retvalue = "''";
+    }
+
+    #line 998 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r142()
     {
         $this->_retvalue = $this->yystack[$this->yyidx + - 1]->minor . '.' . $this->yystack[$this->yyidx + 0]->minor;
     }
 
-    #line 1081 "../smarty/lexer/smarty_internal_templateparser.y"
+    #line 1006 "../smarty/lexer/smarty_internal_templateparser.y"
     function yy_r144()
     {
-        $this->_retvalue = '\'' . $this->yystack[$this->yyidx + 0]->minor . '\'';
+        $var = trim(substr($this->yystack[$this->yyidx + 0]->minor, $this->lex->ldel_length, - $this->lex->rdel_length), ' $');
+        $this->_retvalue = $this->compiler->compileVariable('\'' . $var . '\'');
     }
 
-    #line 1086 "../smarty/lexer/smarty_internal_templateparser.y"
+    #line 1012 "../smarty/lexer/smarty_internal_templateparser.y"
     function yy_r145()
     {
         $this->_retvalue = '(' . $this->yystack[$this->yyidx + - 1]->minor . ')';
     }
 
-    #line 1093 "../smarty/lexer/smarty_internal_templateparser.y"
+    #line 1019 "../smarty/lexer/smarty_internal_templateparser.y"
     function yy_r146()
     {
         if ($this->yystack[$this->yyidx + - 1]->minor['var'] == '\'smarty\'') {
@@ -3075,19 +2000,19 @@ class Smarty_Internal_Templateparser
         }
     }
 
-    #line 1102 "../smarty/lexer/smarty_internal_templateparser.y"
+    #line 1028 "../smarty/lexer/smarty_internal_templateparser.y"
     function yy_r147()
     {
         $this->_retvalue = $this->yystack[$this->yyidx + 0]->minor;
     }
 
-    #line 1107 "../smarty/lexer/smarty_internal_templateparser.y"
+    #line 1033 "../smarty/lexer/smarty_internal_templateparser.y"
     function yy_r148()
     {
         $this->_retvalue = $this->yystack[$this->yyidx + - 1]->minor . $this->yystack[$this->yyidx + 0]->minor;
     }
 
-    #line 1112 "../smarty/lexer/smarty_internal_templateparser.y"
+    #line 1038 "../smarty/lexer/smarty_internal_templateparser.y"
     function yy_r149()
     {
         if ($this->security && substr($this->yystack[$this->yyidx + - 1]->minor, 0, 1) == '_') {
@@ -3096,7 +2021,7 @@ class Smarty_Internal_Templateparser
         $this->_retvalue = '->' . $this->yystack[$this->yyidx + - 1]->minor . $this->yystack[$this->yyidx + 0]->minor;
     }
 
-    #line 1119 "../smarty/lexer/smarty_internal_templateparser.y"
+    #line 1045 "../smarty/lexer/smarty_internal_templateparser.y"
     function yy_r150()
     {
         if ($this->security) {
@@ -3105,7 +2030,7 @@ class Smarty_Internal_Templateparser
         $this->_retvalue = '->{' . $this->compiler->compileVariable($this->yystack[$this->yyidx + - 1]->minor) . $this->yystack[$this->yyidx + 0]->minor . '}';
     }
 
-    #line 1126 "../smarty/lexer/smarty_internal_templateparser.y"
+    #line 1052 "../smarty/lexer/smarty_internal_templateparser.y"
     function yy_r151()
     {
         if ($this->security) {
@@ -3114,7 +2039,7 @@ class Smarty_Internal_Templateparser
         $this->_retvalue = '->{' . $this->yystack[$this->yyidx + - 2]->minor . $this->yystack[$this->yyidx + 0]->minor . '}';
     }
 
-    #line 1133 "../smarty/lexer/smarty_internal_templateparser.y"
+    #line 1059 "../smarty/lexer/smarty_internal_templateparser.y"
     function yy_r152()
     {
         if ($this->security) {
@@ -3123,16 +2048,16 @@ class Smarty_Internal_Templateparser
         $this->_retvalue = '->{\'' . $this->yystack[$this->yyidx + - 4]->minor . '\'.' . $this->yystack[$this->yyidx + - 2]->minor . $this->yystack[$this->yyidx + 0]->minor . '}';
     }
 
-    #line 1141 "../smarty/lexer/smarty_internal_templateparser.y"
+    #line 1067 "../smarty/lexer/smarty_internal_templateparser.y"
     function yy_r153()
     {
         $this->_retvalue = '->' . $this->yystack[$this->yyidx + 0]->minor;
     }
 
-    #line 1149 "../smarty/lexer/smarty_internal_templateparser.y"
+    #line 1075 "../smarty/lexer/smarty_internal_templateparser.y"
     function yy_r154()
     {
-        if (!$this->security || $this->smarty->security_policy->isTrustedPhpFunction($this->yystack[$this->yyidx + - 3]->minor, $this->compiler)) {
+        if (!$this->security || $this->security->isTrustedPhpFunction($this->yystack[$this->yyidx + - 3]->minor, $this->compiler)) {
             if (strcasecmp($this->yystack[$this->yyidx + - 3]->minor, 'isset') === 0 || strcasecmp($this->yystack[$this->yyidx + - 3]->minor, 'empty') === 0 || strcasecmp($this->yystack[$this->yyidx + - 3]->minor, 'array') === 0 || is_callable($this->yystack[$this->yyidx + - 3]->minor)) {
                 $func_name = strtolower($this->yystack[$this->yyidx + - 3]->minor);
                 if ($func_name == 'isset') {
@@ -3166,7 +2091,7 @@ class Smarty_Internal_Templateparser
         }
     }
 
-    #line 1188 "../smarty/lexer/smarty_internal_templateparser.y"
+    #line 1114 "../smarty/lexer/smarty_internal_templateparser.y"
     function yy_r155()
     {
         if ($this->security && substr($this->yystack[$this->yyidx + - 3]->minor, 0, 1) == '_') {
@@ -3175,224 +2100,190 @@ class Smarty_Internal_Templateparser
         $this->_retvalue = $this->yystack[$this->yyidx + - 3]->minor . "(" . implode(',', $this->yystack[$this->yyidx + - 1]->minor) . ")";
     }
 
-    #line 1195 "../smarty/lexer/smarty_internal_templateparser.y"
+    #line 1121 "../smarty/lexer/smarty_internal_templateparser.y"
     function yy_r156()
     {
         if ($this->security) {
             $this->compiler->trigger_template_error(self::Err2);
         }
         self::$prefix_number ++;
-        $this->compiler->prefix_code[] = '<?php $_tmp' . self::$prefix_number . '=' . $this->compiler->compileVariable("'" . $this->yystack[$this->yyidx + - 3]->minor . "'") . ';?>';
+        $this->compiler->prefix_code[] = '<?php $_tmp' . self::$prefix_number . '=' . $this->compiler->compileVariable('\'' . substr($this->yystack[$this->yyidx + - 3]->minor, 1) . '\'') . ';?>';
         $this->_retvalue = '$_tmp' . self::$prefix_number . '(' . implode(',', $this->yystack[$this->yyidx + - 1]->minor) . ')';
     }
 
-    #line 1206 "../smarty/lexer/smarty_internal_templateparser.y"
+    #line 1132 "../smarty/lexer/smarty_internal_templateparser.y"
     function yy_r157()
     {
         $this->_retvalue = array_merge($this->yystack[$this->yyidx + - 2]->minor, array($this->yystack[$this->yyidx + 0]->minor));
     }
 
-    #line 1223 "../smarty/lexer/smarty_internal_templateparser.y"
+    #line 1149 "../smarty/lexer/smarty_internal_templateparser.y"
     function yy_r160()
     {
         $this->_retvalue = array_merge($this->yystack[$this->yyidx + - 2]->minor, array(array_merge($this->yystack[$this->yyidx + - 1]->minor, $this->yystack[$this->yyidx + 0]->minor)));
     }
 
-    #line 1227 "../smarty/lexer/smarty_internal_templateparser.y"
+    #line 1153 "../smarty/lexer/smarty_internal_templateparser.y"
     function yy_r161()
     {
         $this->_retvalue = array(array_merge($this->yystack[$this->yyidx + - 1]->minor, $this->yystack[$this->yyidx + 0]->minor));
     }
 
-    #line 1235 "../smarty/lexer/smarty_internal_templateparser.y"
+    #line 1161 "../smarty/lexer/smarty_internal_templateparser.y"
     function yy_r163()
     {
         $this->_retvalue = array($this->yystack[$this->yyidx + 0]->minor);
     }
 
-    #line 1243 "../smarty/lexer/smarty_internal_templateparser.y"
+    #line 1169 "../smarty/lexer/smarty_internal_templateparser.y"
     function yy_r164()
     {
         $this->_retvalue = array_merge($this->yystack[$this->yyidx + - 1]->minor, $this->yystack[$this->yyidx + 0]->minor);
     }
 
-    #line 1262 "../smarty/lexer/smarty_internal_templateparser.y"
+    #line 1188 "../smarty/lexer/smarty_internal_templateparser.y"
     function yy_r168()
     {
         $this->_retvalue = array($this->yystack[$this->yyidx + 0]->minor, '', 'method');
     }
 
-    #line 1267 "../smarty/lexer/smarty_internal_templateparser.y"
+    #line 1193 "../smarty/lexer/smarty_internal_templateparser.y"
     function yy_r169()
     {
-        $this->_retvalue = array($this->yystack[$this->yyidx + - 1]->minor, $this->yystack[$this->yyidx + 0]->minor, 'method');
+        $this->_retvalue = array($this->yystack[$this->yyidx + - 1]->minor, $this->yystack[$this->yyidx + 0]->minor,
+            'method');
     }
 
-    #line 1272 "../smarty/lexer/smarty_internal_templateparser.y"
+    #line 1198 "../smarty/lexer/smarty_internal_templateparser.y"
     function yy_r170()
     {
         $this->_retvalue = array($this->yystack[$this->yyidx + 0]->minor, '');
     }
 
-    #line 1277 "../smarty/lexer/smarty_internal_templateparser.y"
+    #line 1203 "../smarty/lexer/smarty_internal_templateparser.y"
     function yy_r171()
     {
-        $this->_retvalue = array('$' . $this->yystack[$this->yyidx + - 1]->minor, $this->yystack[$this->yyidx + 0]->minor, 'property');
+        $this->_retvalue = array($this->yystack[$this->yyidx + - 1]->minor, $this->yystack[$this->yyidx + 0]->minor,
+            'property');
     }
 
-    #line 1282 "../smarty/lexer/smarty_internal_templateparser.y"
+    #line 1208 "../smarty/lexer/smarty_internal_templateparser.y"
     function yy_r172()
     {
-        $this->_retvalue = array('$' . $this->yystack[$this->yyidx + - 2]->minor, $this->yystack[$this->yyidx + - 1]->minor . $this->yystack[$this->yyidx + 0]->minor, 'property');
+        $this->_retvalue = array($this->yystack[$this->yyidx + - 2]->minor,
+            $this->yystack[$this->yyidx + - 1]->minor . $this->yystack[$this->yyidx + 0]->minor, 'property');
     }
 
-    #line 1288 "../smarty/lexer/smarty_internal_templateparser.y"
+    #line 1214 "../smarty/lexer/smarty_internal_templateparser.y"
     function yy_r173()
     {
-        $this->_retvalue = '==';
+        $this->_retvalue['op'] = ' ' . trim($this->yystack[$this->yyidx + 0]->minor) . ' ';
     }
 
-    #line 1292 "../smarty/lexer/smarty_internal_templateparser.y"
+    #line 1218 "../smarty/lexer/smarty_internal_templateparser.y"
     function yy_r174()
     {
-        $this->_retvalue = '!=';
+        static $lops = array('eq'          => array('op' => ' == ', 'pre' => null),
+                             'ne'          => array('op' => ' != ', 'pre' => null),
+                             'neq'         => array('op' => ' != ', 'pre' => null),
+                             'gt'          => array('op' => ' > ', 'pre' => null),
+                             'ge'          => array('op' => ' >= ', 'pre' => null),
+                             'gte'         => array('op' => ' >= ', 'pre' => null),
+                             'lt'          => array('op' => ' < ', 'pre' => null),
+                             'le'          => array('op' => ' <= ', 'pre' => null),
+                             'lte'         => array('op' => ' <= ', 'pre' => null),
+                             'mod'         => array('op' => ' % ', 'pre' => null),
+                             'and'         => array('op' => ' && ', 'pre' => null),
+                             'or'          => array('op' => ' || ', 'pre' => null),
+                             'xor'         => array('op' => ' xor ', 'pre' => null),
+                             'isdivby'     => array('op' => ' % ', 'pre' => '!('),
+                             'isnotdivby'  => array('op' => ' % ', 'pre' => '('),
+                             'isevenby'    => array('op' => ' / ', 'pre' => '!(1 & '),
+                             'isnotevenby' => array('op' => ' / ', 'pre' => '(1 & '),
+                             'isoddby'     => array('op' => ' / ', 'pre' => '(1 & '),
+                             'isnotoddby'  => array('op' => ' / ', 'pre' => '!(1 & '),);
+        $op = strtolower(str_replace(' ', '', $this->yystack[$this->yyidx + 0]->minor));
+        $this->_retvalue = $lops[$op];
     }
 
-    #line 1296 "../smarty/lexer/smarty_internal_templateparser.y"
+    #line 1244 "../smarty/lexer/smarty_internal_templateparser.y"
     function yy_r175()
     {
-        $this->_retvalue = '>';
+        static $scond = array('iseven'   => '!(1 & ', 'isnoteven' => '(1 & ', 'isodd' => '(1 & ',
+                              'isnotodd' => '!(1 & ',);
+        $op = strtolower(str_replace(' ', '', $this->yystack[$this->yyidx + 0]->minor));
+        $this->_retvalue = $scond[$op];
     }
 
-    #line 1300 "../smarty/lexer/smarty_internal_templateparser.y"
+    #line 1258 "../smarty/lexer/smarty_internal_templateparser.y"
     function yy_r176()
-    {
-        $this->_retvalue = '<';
-    }
-
-    #line 1304 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r177()
-    {
-        $this->_retvalue = '>=';
-    }
-
-    #line 1308 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r178()
-    {
-        $this->_retvalue = '<=';
-    }
-
-    #line 1312 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r179()
-    {
-        $this->_retvalue = '===';
-    }
-
-    #line 1316 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r180()
-    {
-        $this->_retvalue = '!==';
-    }
-
-    #line 1320 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r181()
-    {
-        $this->_retvalue = '%';
-    }
-
-    #line 1324 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r182()
-    {
-        $this->_retvalue = '&&';
-    }
-
-    #line 1328 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r183()
-    {
-        $this->_retvalue = '||';
-    }
-
-    #line 1332 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r184()
-    {
-        $this->_retvalue = ' XOR ';
-    }
-
-    #line 1339 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r185()
     {
         $this->_retvalue = 'array(' . $this->yystack[$this->yyidx + - 1]->minor . ')';
     }
 
-    #line 1347 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r187()
+    #line 1266 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r178()
     {
         $this->_retvalue = $this->yystack[$this->yyidx + - 2]->minor . ',' . $this->yystack[$this->yyidx + 0]->minor;
     }
 
-    #line 1355 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r189()
+    #line 1274 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r180()
     {
         $this->_retvalue = $this->yystack[$this->yyidx + - 2]->minor . '=>' . $this->yystack[$this->yyidx + 0]->minor;
     }
 
-    #line 1359 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r190()
+    #line 1278 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r181()
     {
         $this->_retvalue = '\'' . $this->yystack[$this->yyidx + - 2]->minor . '\'=>' . $this->yystack[$this->yyidx + 0]->minor;
     }
 
-    #line 1371 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r192()
-    {
-        $this->_retvalue = "''";
-    }
-
-    #line 1375 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r193()
+    #line 1294 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r184()
     {
         $this->_retvalue = $this->yystack[$this->yyidx + - 1]->minor->to_smarty_php();
     }
 
-    #line 1380 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r194()
+    #line 1299 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r185()
     {
         $this->yystack[$this->yyidx + - 1]->minor->append_subtree($this->yystack[$this->yyidx + 0]->minor);
         $this->_retvalue = $this->yystack[$this->yyidx + - 1]->minor;
     }
 
-    #line 1385 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r195()
+    #line 1304 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r186()
     {
         $this->_retvalue = new Smarty_Internal_ParseTree_Dq($this, $this->yystack[$this->yyidx + 0]->minor);
     }
 
-    #line 1389 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r196()
+    #line 1308 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r187()
     {
         $this->_retvalue = new Smarty_Internal_ParseTree_Code($this, '(string)' . $this->yystack[$this->yyidx + - 1]->minor);
     }
 
-    #line 1397 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r198()
+    #line 1316 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r189()
     {
         $this->_retvalue = new Smarty_Internal_ParseTree_Code($this, '(string)$_smarty_tpl->tpl_vars[\'' . substr($this->yystack[$this->yyidx + 0]->minor, 1) . '\']->value');
     }
 
-    #line 1405 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r200()
+    #line 1324 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r191()
     {
         $this->_retvalue = new Smarty_Internal_ParseTree_Code($this, '(string)(' . $this->yystack[$this->yyidx + - 1]->minor . ')');
     }
 
-    #line 1409 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r201()
+    #line 1328 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r192()
     {
-        $this->_retvalue = new Smarty_Internal_ParseTree_Tag($this, $this->yystack[$this->yyidx + - 1]->minor);
+        $this->_retvalue = new Smarty_Internal_ParseTree_Tag($this, $this->yystack[$this->yyidx + 0]->minor);
     }
 
-    #line 1413 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r202()
+    #line 1332 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r193()
     {
         $this->_retvalue = new Smarty_Internal_ParseTree_DqContent($this, $this->yystack[$this->yyidx + 0]->minor);
     }
@@ -3401,17 +2292,12 @@ class Smarty_Internal_Templateparser
 
     public function yy_reduce($yyruleno)
     {
-        $yymsp = $this->yystack[$this->yyidx];
-        if ($this->yyTraceFILE && $yyruleno >= 0
-            && $yyruleno < count(self::$yyRuleName)
-        ) {
-            fprintf($this->yyTraceFILE, "%sReduce (%d) [%s].\n",
-                    $this->yyTracePrompt, $yyruleno,
-                    self::$yyRuleName[$yyruleno]);
+        if ($this->yyTraceFILE && $yyruleno >= 0 && $yyruleno < count(self::$yyRuleName)) {
+            fprintf($this->yyTraceFILE, "%sReduce (%d) [%s].\n", $this->yyTracePrompt, $yyruleno, self::$yyRuleName[$yyruleno]);
         }
 
         $this->_retvalue = $yy_lefthand_side = null;
-        if (array_key_exists($yyruleno, self::$yyReduceMap)) {
+        if (isset(self::$yyReduceMap[$yyruleno])) {
             // call the action
             $this->_retvalue = null;
             $this->{'yy_r' . self::$yyReduceMap[$yyruleno]}();
@@ -3453,7 +2339,7 @@ class Smarty_Internal_Templateparser
 
     public function yy_syntax_error($yymajor, $TOKEN)
     {
-        #line 188 "../smarty/lexer/smarty_internal_templateparser.y"
+        #line 183 "../smarty/lexer/smarty_internal_templateparser.y"
 
         $this->internalError = true;
         $this->yymajor = $yymajor;
@@ -3468,7 +2354,7 @@ class Smarty_Internal_Templateparser
         while ($this->yyidx >= 0) {
             $this->yy_pop_parser_stack();
         }
-        #line 181 "../smarty/lexer/smarty_internal_templateparser.y"
+        #line 176 "../smarty/lexer/smarty_internal_templateparser.y"
 
         $this->successful = !$this->internalError;
         $this->internalError = false;
@@ -3486,20 +2372,17 @@ class Smarty_Internal_Templateparser
             $x->stateno = 0;
             $x->major = 0;
             $this->yystack = array();
-            array_push($this->yystack, $x);
+            $this->yystack[] = $x;
         }
         $yyendofinput = ($yymajor == 0);
 
         if ($this->yyTraceFILE) {
-            fprintf($this->yyTraceFILE, "%sInput %s\n",
-                    $this->yyTracePrompt, $this->yyTokenName[$yymajor]);
+            fprintf($this->yyTraceFILE, "%sInput %s\n", $this->yyTracePrompt, $this->yyTokenName[$yymajor]);
         }
 
         do {
             $yyact = $this->yy_find_shift_action($yymajor);
-            if ($yymajor < self::YYERRORSYMBOL &&
-                !$this->yy_is_expected_token($yymajor)
-            ) {
+            if ($yymajor < self::YYERRORSYMBOL && !$this->yy_is_expected_token($yymajor)) {
                 // force a syntax error
                 $yyact = self::YY_ERROR_ACTION;
             }
@@ -3515,8 +2398,7 @@ class Smarty_Internal_Templateparser
                 $this->yy_reduce($yyact - self::YYNSTATE);
             } elseif ($yyact == self::YY_ERROR_ACTION) {
                 if ($this->yyTraceFILE) {
-                    fprintf($this->yyTraceFILE, "%sSyntax Error!\n",
-                            $this->yyTracePrompt);
+                    fprintf($this->yyTraceFILE, "%sSyntax Error!\n", $this->yyTracePrompt);
                 }
                 if (self::YYERRORSYMBOL) {
                     if ($this->yyerrcnt < 0) {
@@ -3525,16 +2407,12 @@ class Smarty_Internal_Templateparser
                     $yymx = $this->yystack[$this->yyidx]->major;
                     if ($yymx == self::YYERRORSYMBOL || $yyerrorhit) {
                         if ($this->yyTraceFILE) {
-                            fprintf($this->yyTraceFILE, "%sDiscard input token %s\n",
-                                    $this->yyTracePrompt, $this->yyTokenName[$yymajor]);
+                            fprintf($this->yyTraceFILE, "%sDiscard input token %s\n", $this->yyTracePrompt, $this->yyTokenName[$yymajor]);
                         }
                         $this->yy_destructor($yymajor, $yytokenvalue);
                         $yymajor = self::YYNOCODE;
                     } else {
-                        while ($this->yyidx >= 0 &&
-                            $yymx != self::YYERRORSYMBOL &&
-                            ($yyact = $this->yy_find_shift_action(self::YYERRORSYMBOL)) >= self::YYNSTATE
-                        ) {
+                        while ($this->yyidx >= 0 && $yymx != self::YYERRORSYMBOL && ($yyact = $this->yy_find_shift_action(self::YYERRORSYMBOL)) >= self::YYNSTATE) {
                             $this->yy_pop_parser_stack();
                         }
                         if ($this->yyidx < 0 || $yymajor == 0) {
diff --git a/libs/smarty/sysplugins/smarty_internal_write_file.php b/libs/smarty/sysplugins/smarty_internal_write_file.php
index 54dbbe8f8..9ecc7c0c8 100644
--- a/libs/smarty/sysplugins/smarty_internal_write_file.php
+++ b/libs/smarty/sysplugins/smarty_internal_write_file.php
@@ -55,7 +55,9 @@ class Smarty_Internal_Write_File
          */
         if (Smarty::$_IS_WINDOWS) {
             // remove original file
-            @unlink($_filepath);
+            if (is_file($_filepath)) {
+                @unlink($_filepath);
+            }
             // rename tmp file
             $success = @rename($_tmp_file, $_filepath);
         } else {
@@ -63,17 +65,17 @@ class Smarty_Internal_Write_File
             $success = @rename($_tmp_file, $_filepath);
             if (!$success) {
                 // remove original file
-                @unlink($_filepath);
+                if (is_file($_filepath)) {
+                    @unlink($_filepath);
+                }
                 // rename tmp file
                 $success = @rename($_tmp_file, $_filepath);
             }
         }
-
         if (!$success) {
             error_reporting($_error_reporting);
             throw new SmartyException("unable to write file {$_filepath}");
         }
-
         if ($smarty->_file_perms !== null) {
             // set file permissions
             chmod($_filepath, $smarty->_file_perms);
diff --git a/libs/smarty/sysplugins/smarty_resource.php b/libs/smarty/sysplugins/smarty_resource.php
index 53f59b208..5d5e368d9 100644
--- a/libs/smarty/sysplugins/smarty_resource.php
+++ b/libs/smarty/sysplugins/smarty_resource.php
@@ -53,12 +53,12 @@ abstract class Smarty_Resource
      * @var array
      */
     protected static $sysplugins = array(
-        'file'    => true,
-        'string'  => true,
-        'extends' => true,
-        'stream'  => true,
-        'eval'    => true,
-        'php'     => true
+        'file'    => 'smarty_internal_resource_file.php',
+        'string'  => 'smarty_internal_resource_string.php',
+        'extends' => 'smarty_internal_resource_extends.php',
+        'stream'  => 'smarty_internal_resource_stream.php',
+        'eval'    => 'smarty_internal_resource_eval.php',
+        'php'     => 'smarty_internal_resource_php.php'
     );
 
     /**
@@ -171,6 +171,9 @@ abstract class Smarty_Resource
         // try sysplugins dir
         if (isset(self::$sysplugins[$type])) {
             $_resource_class = 'Smarty_Internal_Resource_' . ucfirst($type);
+            if (!class_exists($_resource_class, false)) {
+                require SMARTY_SYSPLUGINS_DIR . self::$sysplugins[$type];
+            }
             return $smarty->_resource_handlers[$type] = new $_resource_class();
         }
 
@@ -218,15 +221,15 @@ abstract class Smarty_Resource
      */
     public static function parseResourceName($resource_name, $default_resource)
     {
-        $parts = explode(':', $resource_name, 2);
-        if (!isset($parts[1]) || !isset($parts[0][1])) {
+         if (preg_match('/^([A-Za-z0-9_\-]{2,})[:]/', $resource_name, $match)) {
+            $type = $match[1];
+            $name = substr($resource_name, strlen($match[0]));
+        } else {
             // no resource given, use default
             // or single character before the colon is not a resource type, but part of the filepath
             $type = $default_resource;
             $name = $resource_name;
-        } else {
-            $type = $parts[0];
-            $name = $parts[1];
+
         }
         return array($name, $type);
     }
diff --git a/libs/smarty/sysplugins/smarty_security.php b/libs/smarty/sysplugins/smarty_security.php
index 5a70c6183..af1ca5531 100644
--- a/libs/smarty/sysplugins/smarty_security.php
+++ b/libs/smarty/sysplugins/smarty_security.php
@@ -108,7 +108,6 @@ class Smarty_Security
         'count', 'sizeof',
         'in_array', 'is_array',
         'time',
-        'nl2br',
     );
     /**
      * This is an array of trusted PHP modifiers.
@@ -119,7 +118,8 @@ class Smarty_Security
      */
     public $php_modifiers = array(
         'escape',
-        'count'
+        'count',
+        'nl2br',
     );
     /**
      * This is an array of allowed tags.
diff --git a/libs/smarty/sysplugins/smarty_template_cached.php b/libs/smarty/sysplugins/smarty_template_cached.php
index 7824dc48f..5b9043958 100644
--- a/libs/smarty/sysplugins/smarty_template_cached.php
+++ b/libs/smarty/sysplugins/smarty_template_cached.php
@@ -49,7 +49,7 @@ class Smarty_Template_Cached
      *
      * @var boolean
      */
-    public $valid = false;
+    public $valid = null;
 
     /**
      * Cache was processed
@@ -109,7 +109,13 @@ class Smarty_Template_Cached
     {
         $this->compile_id = $_template->compile_id;
         $this->cache_id = $_template->cache_id;
+        if (!isset($_template->source)) {
+            $_template->loadSource();
+        }
         $this->source = $_template->source;
+        if (!class_exists('Smarty_CacheResource', false)) {
+            require SMARTY_SYSPLUGINS_DIR . 'smarty_cacheresource.php';
+        }
         $this->handler = Smarty_CacheResource::load($_template->smarty);
     }
 
@@ -121,62 +127,83 @@ class Smarty_Template_Cached
     static function load(Smarty_Internal_Template $_template)
     {
         $_template->cached = $cached = new Smarty_Template_Cached($_template);
-
-        //
-        //    check if cache is valid
-        //
+        $cached->handler->populate($cached, $_template);
+        // caching enabled ?
         if (!($_template->caching == Smarty::CACHING_LIFETIME_CURRENT || $_template->caching == Smarty::CACHING_LIFETIME_SAVED) || $_template->source->recompiled) {
-            $cached->handler->populate($cached, $_template);
+            $cached->valid = false;
+        }
+        return $cached;
+    }
 
-            return $cached;
+    /**
+     * Check if cache is valid, lock cache if required
+     *
+     * @param \Smarty_Internal_Template $_template
+     *
+     * @return bool flag true if cache is valid
+     */
+    public function isCached(Smarty_Internal_Template $_template)
+    {
+        if ($this->valid !== null) {
+            return $this->valid;
         }
         while (true) {
             while (true) {
-                $cached->handler->populate($cached, $_template);
-                if ($cached->timestamp === false || $_template->smarty->force_compile || $_template->smarty->force_cache) {
-                    $cached->valid = false;
+                 if ($this->exists === false || $_template->smarty->force_compile || $_template->smarty->force_cache) {
+                    $this->valid = false;
                 } else {
-                    $cached->valid = true;
+                    $this->valid = true;
                 }
-                if ($cached->valid && $_template->caching == Smarty::CACHING_LIFETIME_CURRENT && $_template->cache_lifetime >= 0 && time() > ($cached->timestamp + $_template->cache_lifetime)) {
+                if ($this->valid && $_template->caching == Smarty::CACHING_LIFETIME_CURRENT && $_template->cache_lifetime >= 0 && time() > ($this->timestamp + $_template->cache_lifetime)) {
                     // lifetime expired
-                    $cached->valid = false;
+                    $this->valid = false;
                 }
-                if ($cached->valid || !$_template->smarty->cache_locking) {
+                if ($this->valid && $_template->source->timestamp > $this->timestamp) {
+                    $this->valid = false;
+                }
+                if ($this->valid || !$_template->smarty->cache_locking) {
                     break;
                 }
-                if (!$cached->handler->locked($_template->smarty, $cached)) {
-                    $cached->handler->acquireLock($_template->smarty, $cached);
+                if (!$this->handler->locked($_template->smarty, $this)) {
+                    $this->handler->acquireLock($_template->smarty, $this);
                     break 2;
                 }
+                $this->handler->populate($this, $_template);
             }
-            if ($cached->valid) {
-                if (!$_template->smarty->cache_locking || $cached->handler->locked($_template->smarty, $cached) === null) {
+            if ($this->valid) {
+                if (!$_template->smarty->cache_locking || $this->handler->locked($_template->smarty, $this) === null) {
                     // load cache file for the following checks
                     if ($_template->smarty->debugging) {
                         Smarty_Internal_Debug::start_cache($_template);
                     }
-                    $cached->process($_template);
+                    if ($this->handler->process($_template, $this) === false) {
+                        $this->valid = false;
+                    } else {
+                        $this->processed = true;
+                    }
                     if ($_template->smarty->debugging) {
                         Smarty_Internal_Debug::end_cache($_template);
                     }
                 } else {
+                    $this->is_locked = true;
                     continue;
                 }
             } else {
-                return $cached;
+                return $this->valid;
             }
-            if ($cached->valid && $_template->caching === Smarty::CACHING_LIFETIME_SAVED && $_template->properties['cache_lifetime'] >= 0 && (time() > ($_template->cached->timestamp + $_template->properties['cache_lifetime']))) {
-                $cached->valid = false;
+            if ($this->valid && $_template->caching === Smarty::CACHING_LIFETIME_SAVED && $_template->properties['cache_lifetime'] >= 0 && (time() > ($_template->cached->timestamp + $_template->properties['cache_lifetime']))) {
+                $this->valid = false;
             }
-            if (!$cached->valid && $_template->smarty->cache_locking) {
-                $cached->handler->acquireLock($_template->smarty, $cached);
-
-                return $cached;
-            } else {
-                return $cached;
+            if ($_template->smarty->cache_locking) {
+                if (!$this->valid) {
+                    $this->handler->acquireLock($_template->smarty, $this);
+                } elseif ($this->is_locked) {
+                    $this->handler->releaseLock($_template->smarty, $this);
+                }
             }
+            return $this->valid;
         }
+        return $this->valid;
     }
 
     /**
@@ -228,12 +255,18 @@ class Smarty_Template_Cached
                 $this->timestamp = time();
                 $this->exists = true;
                 $this->valid = true;
+                $this->processed = false;
                 if ($_template->smarty->cache_locking) {
                     $this->handler->releaseLock($_template->smarty, $this);
                 }
 
                 return true;
             }
+            $this->content = null;
+            $this->timestamp = false;
+            $this->exists = false;
+            $this->valid = false;
+            $this->processed = false;
         }
 
         return false;
diff --git a/libs/smarty/sysplugins/smarty_template_compiled.php b/libs/smarty/sysplugins/smarty_template_compiled.php
index 22d9418fc..3ff8fa897 100644
--- a/libs/smarty/sysplugins/smarty_template_compiled.php
+++ b/libs/smarty/sysplugins/smarty_template_compiled.php
@@ -47,7 +47,6 @@ class Smarty_Template_Compiled
 
     /**
      * create Compiled Object container
-
      */
     public function __construct()
     {
@@ -62,6 +61,9 @@ class Smarty_Template_Compiled
      */
     static function load($_template)
     {
+        if (!isset($_template->source)) {
+            $_template->loadSource();
+        }
         // check runtime cache
         if (!$_template->source->recompiled && $_template->smarty->resource_caching) {
             $_cache_key = $_template->source->unique_resource . '#';
@@ -130,8 +132,10 @@ class Smarty_Template_Compiled
         }
 
         $this->filepath = $_compile_dir . $_filepath . '.' . $_template->source->type . $_basename . $_cache . '.php';
-        $this->timestamp = @filemtime($this->filepath);
-        $this->exists = !!$this->timestamp;
+        $this->timestamp = $this->exists = is_file($this->filepath);
+        if ($this->exists) {
+            $this->timestamp = @filemtime($this->filepath);
+        }
     }
 
     /**
@@ -252,9 +256,9 @@ class Smarty_Template_Compiled
         if (!$_template->source->recompiled) {
             $obj = new Smarty_Internal_Write_File();
             if ($obj->writeFile($this->filepath, $code, $_template->smarty) === true) {
-                $this->timestamp = @filemtime($this->filepath);
-                $this->exists = !!$this->timestamp;
+                $this->timestamp = $this->exists = is_file($this->filepath);
                 if ($this->exists) {
+                    $this->timestamp = @filemtime($this->filepath);
                     return true;
                 }
             }