Merge branch 'bug/385-php7'

232 files changed, 22649 insertions, 13461 deletions

diff --git a/admin/include/c13y_internal.class.php b/admin/include/c13y_internal.class.php
index 10375095a..e0911f7e6 100644
--- a/admin/include/c13y_internal.class.php
+++ b/admin/include/c13y_internal.class.php
@@ -23,7 +23,7 @@
 
 class c13y_internal
 {
-  function c13y_internal()
+  function __construct()
   {
     add_event_handler('list_check_integrity', array(&$this, 'c13y_version'));
     add_event_handler('list_check_integrity', array(&$this, 'c13y_exif'));
diff --git a/admin/include/check_integrity.class.php b/admin/include/check_integrity.class.php
index 66ff1db8f..58893a284 100644
--- a/admin/include/check_integrity.class.php
+++ b/admin/include/check_integrity.class.php
@@ -27,7 +27,7 @@ class check_integrity
   var $retrieve_list;
   var $build_ignore_list;
 
-  function check_integrity()
+  function __construct()
   {
     $this->ignore_list = array();
     $this->retrieve_list = array();
diff --git a/admin/include/functions_upgrade.php b/admin/include/functions_upgrade.php
index b7a8763c5..eb0832879 100644
--- a/admin/include/functions_upgrade.php
+++ b/admin/include/functions_upgrade.php
@@ -174,10 +174,7 @@ UPDATE '.PREFIX_TABLE.'user_infos
 // Deactivate all templates
 function deactivate_templates()
 {
-  $query = '
-  UPDATE '.PREFIX_TABLE.'config
-    SET value = \''. array() .'\'
-  WHERE param = \'extents_for_templates\';';
+  conf_update_param('extents_for_templates', array());
 }
 
 // Check access rights
@@ -322,4 +319,4 @@ function upgrade_db_connect()
     my_error(l10n($e->getMessage()), true); 
   }
 }
-?>
\ No newline at end of file
+?>
diff --git a/admin/include/languages.class.php b/admin/include/languages.class.php
index 351e36d53..0f3e98eec 100644
--- a/admin/include/languages.class.php
+++ b/admin/include/languages.class.php
@@ -30,7 +30,7 @@ class languages
   /**
    * Initialize $fs_languages and $db_languages
   */
-  function languages($target_charset = null)
+  function __construct($target_charset = null)
   {
     $this->get_fs_languages($target_charset);
   }
@@ -408,4 +408,4 @@ UPDATE '.USER_INFOS_TABLE.'
     return strcmp(strtolower($a['extension_name']), strtolower($b['extension_name']));
   }
 }
-?>
\ No newline at end of file
+?>
diff --git a/admin/include/mysqldump.php b/admin/include/mysqldump.php
index 515d86ae9..1432675c8 100644
--- a/admin/include/mysqldump.php
+++ b/admin/include/mysqldump.php
@@ -59,7 +59,7 @@ class MySQLDump {
 	* @param boolean $compress It defines if the output file is compress (gzip) or not

 	* @param boolean $hexValue It defines if the outup values are base-16 or not

 	*/

-	function MYSQLDump($db = null, $filepath = 'dump.sql', $compress = false, $hexValue = false){

+	function __construct($db = null, $filepath = 'dump.sql', $compress = false, $hexValue = false){

 		$this->compress = $compress;

 		if ( !$this->setOutputFile($filepath) )

 			return false;

@@ -418,4 +418,4 @@ class MySQLDump {
 			@fclose($file);

 	}

 }

-?>
\ No newline at end of file
+?>

diff --git a/admin/include/pclzip.lib.php b/admin/include/pclzip.lib.php
index e7facc1ea..c2d09a50c 100644
--- a/admin/include/pclzip.lib.php
+++ b/admin/include/pclzip.lib.php
@@ -212,7 +212,7 @@
   //   Note that no real action is taken, if the archive does not exist it is not
   //   created. Use create() for that.
   // --------------------------------------------------------------------------------
-  function PclZip($p_zipname)
+  function __construct($p_zipname)
   {
 
     // ----- Tests the zlib
diff --git a/admin/include/plugins.class.php b/admin/include/plugins.class.php
index 71093a6c1..5f258f836 100644
--- a/admin/include/plugins.class.php
+++ b/admin/include/plugins.class.php
@@ -69,7 +69,7 @@ class plugins
   /**
    * Initialize $fs_plugins and $db_plugins_by_id
    */
-  function plugins()
+  function __construct()
   {
     $this->get_fs_plugins();
 
@@ -716,4 +716,4 @@ DELETE FROM '. PLUGINS_TABLE .'
     $this->fs_plugins = $active_plugins + $inactive_plugins + $not_installed;
   }
 }
-?>
\ No newline at end of file
+?>
diff --git a/admin/include/tabsheet.class.php b/admin/include/tabsheet.class.php
index c7681b611..959444a21 100644
--- a/admin/include/tabsheet.class.php
+++ b/admin/include/tabsheet.class.php
@@ -33,7 +33,7 @@ class tabsheet
     $name is the tabsheet's name inside the template .tpl file
     $titlename in the template is affected by $titlename value
   */
-  function tabsheet($name = 'TABSHEET', $titlename = 'TABSHEET_TITLE')
+  function __construct($name = 'TABSHEET', $titlename = 'TABSHEET_TITLE')
   {
     $this->sheets = array();
     $this->uniqid = null;
diff --git a/admin/include/themes.class.php b/admin/include/themes.class.php
index df0e29e66..dd6b6b1b0 100644
--- a/admin/include/themes.class.php
+++ b/admin/include/themes.class.php
@@ -60,7 +60,7 @@ class themes
   /**
    * Initialize $fs_themes and $db_themes_by_id
   */
-  function themes()
+  function __construct()
   {
     $this->get_fs_themes();
 
@@ -736,4 +736,4 @@ SELECT
   }
 
 }
-?>
\ No newline at end of file
+?>
diff --git a/admin/include/updates.class.php b/admin/include/updates.class.php
index 17a3b2578..29cefdfdb 100644
--- a/admin/include/updates.class.php
+++ b/admin/include/updates.class.php
@@ -135,15 +135,33 @@ class updates
       {

         return false;

       }

+

+      $servers = array();

+      

       foreach ($pem_exts as $ext)

       {

         if (isset($ext_to_check[$ext['extension_id']]))

         {

-          $server = 'server_'.$ext_to_check[$ext['extension_id']];

-          $this->$ext_to_check[$ext['extension_id']]->$server += array($ext['extension_id'] => $ext);

+          $type = $ext_to_check[$ext['extension_id']];

+          

+          if (!isset($servers[$type]))

+          {

+            $servers[$type] = array();

+          }

+

+          $servers[$type][ $ext['extension_id'] ] = $ext;

+          

           unset($ext_to_check[$ext['extension_id']]);

         }

       }

+

+      foreach ($servers as $server_type => $extension_list)

+      {

+        $server_string = 'server_'.$server_type;

+

+        $this->$server_type->$server_string = $extension_list;

+      }

+      

       $this->check_missing_extensions($ext_to_check);

       return true;

     }

diff --git a/include/common.inc.php b/include/common.inc.php
index 8fab02ab2..6df5efc26 100644
--- a/include/common.inc.php
+++ b/include/common.inc.php
@@ -26,7 +26,7 @@ defined('PHPWG_ROOT_PATH') or trigger_error('Hacking attempt!', E_USER_ERROR);
 // determine the initial instant to indicate the generation time of this page
 $t2 = microtime(true);
 
-@set_magic_quotes_runtime(0); // Disable magic_quotes_runtime
+// @set_magic_quotes_runtime(0); // Disable magic_quotes_runtime
 
 //
 // addslashes to vars if magic_quotes_gpc is off this is a security
diff --git a/include/passwordhash.class.php b/include/passwordhash.class.php
index 84447b277..8b8b11319 100644
--- a/include/passwordhash.class.php
+++ b/include/passwordhash.class.php
@@ -1,18 +1,18 @@
 <?php
-#
-# Portable PHP password hashing framework.
-#
-# Version 0.3 / genuine.
+/**
+ * Portable PHP password hashing framework.
+ * @package phpass
+ * @since 2.5.0
+ * @version 0.3 / WordPress
+ * @link http://www.openwall.com/phpass/
+ */
+
 #
 # Written by Solar Designer <solar at openwall.com> in 2004-2006 and placed in
 # the public domain.  Revised in subsequent years, still public domain.
 #
 # There's absolutely no warranty.
 #
-# The homepage URL for this framework is:
-#
-#	http://www.openwall.com/phpass/
-#
 # Please be sure to update the Version line if you edit this file in any way.
 # It is suggested that you leave the main version number intact, but indicate
 # your project name (after the slash) and add your own revision information.
@@ -24,13 +24,25 @@
 # Obviously, since this code is in the public domain, the above are not
 # requirements (there can be none), but merely suggestions.
 #
+
+/**
+ * Portable PHP password hashing framework.
+ *
+ * @package phpass
+ * @version 0.3 / WordPress
+ * @link http://www.openwall.com/phpass/
+ * @since 2.5.0
+ */
 class PasswordHash {
 	var $itoa64;
 	var $iteration_count_log2;
 	var $portable_hashes;
 	var $random_state;
 
-	function PasswordHash($iteration_count_log2, $portable_hashes)
+	/**
+	 * PHP5 constructor.
+	 */
+	function __construct( $iteration_count_log2, $portable_hashes )
 	{
 		$this->itoa64 = './0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz';
 
@@ -40,15 +52,20 @@ class PasswordHash {
 
 		$this->portable_hashes = $portable_hashes;
 
-		$this->random_state = microtime();
-		if (function_exists('getmypid'))
-			$this->random_state .= getmypid();
+		$this->random_state = microtime() . uniqid(rand(), TRUE); // removed getmypid() for compatibility reasons
+	}
+
+	/**
+	 * PHP4 constructor.
+	 */
+	public function PasswordHash( $iteration_count_log2, $portable_hashes ) {
+		self::__construct( $iteration_count_log2, $portable_hashes );
 	}
 
 	function get_random_bytes($count)
 	{
 		$output = '';
-		if (@is_readable('/dev/urandom') &&
+		if ( @is_readable('/dev/urandom') &&
 		    ($fh = @fopen('/dev/urandom', 'rb'))) {
 			$output = fread($fh, $count);
 			fclose($fh);
@@ -207,6 +224,10 @@ class PasswordHash {
 
 	function HashPassword($password)
 	{
+		if ( strlen( $password ) > 4096 ) {
+			return '*';
+		}
+
 		$random = '';
 
 		if (CRYPT_BLOWFISH == 1 && !$this->portable_hashes) {
@@ -242,12 +263,14 @@ class PasswordHash {
 
 	function CheckPassword($password, $stored_hash)
 	{
+		if ( strlen( $password ) > 4096 ) {
+			return false;
+		}
+
 		$hash = $this->crypt_private($password, $stored_hash);
 		if ($hash[0] == '*')
 			$hash = crypt($password, $stored_hash);
 
-		return $hash == $stored_hash;
+		return $hash === $stored_hash;
 	}
-}
-
-?>
+}
\ No newline at end of file
diff --git a/include/smarty/.gitattributes b/include/smarty/.gitattributes
new file mode 100644
index 000000000..412eeda78
--- /dev/null
+++ b/include/smarty/.gitattributes
@@ -0,0 +1,22 @@
+# Auto detect text files and perform LF normalization
+* text=auto
+
+# Custom for Visual Studio
+*.cs     diff=csharp
+*.sln    merge=union
+*.csproj merge=union
+*.vbproj merge=union
+*.fsproj merge=union
+*.dbproj merge=union
+
+# Standard to msysgit
+*.doc	 diff=astextplain
+*.DOC	 diff=astextplain
+*.docx diff=astextplain
+*.DOCX diff=astextplain
+*.dot  diff=astextplain
+*.DOT  diff=astextplain
+*.pdf  diff=astextplain
+*.PDF	 diff=astextplain
+*.rtf	 diff=astextplain
+*.RTF	 diff=astextplain
diff --git a/include/smarty/.gitignore b/include/smarty/.gitignore
new file mode 100644
index 000000000..0ff15aa49
--- /dev/null
+++ b/include/smarty/.gitignore
@@ -0,0 +1,221 @@
+#################
+## Eclipse
+#################
+
+*.pydevproject
+.project
+.metadata
+bin/
+tmp/
+*.tmp
+*.bak
+*.swp
+*~.nib
+local.properties
+.classpath
+.settings/
+.loadpath
+
+# External tool builders
+.externalToolBuilders/
+
+# Locally stored "Eclipse launch configurations"
+*.launch
+
+# CDT-specific
+.cproject
+
+# PDT-specific
+.buildpath
+
+
+#################
+## Visual Studio
+#################
+
+## Ignore Visual Studio temporary files, build results, and
+## files generated by popular Visual Studio add-ons.
+
+# User-specific files
+*.suo
+*.user
+*.sln.docstates
+
+# Build results
+
+[Dd]ebug/
+[Rr]elease/
+x64/
+build/
+[Bb]in/
+[Oo]bj/
+
+# MSTest test Results
+[Tt]est[Rr]esult*/
+[Bb]uild[Ll]og.*
+
+*_i.c
+*_p.c
+*.ilk
+*.meta
+*.obj
+*.pch
+*.pdb
+*.pgc
+*.pgd
+*.rsp
+*.sbr
+*.tlb
+*.tli
+*.tlh
+*.tmp
+*.tmp_proj
+*.log
+*.vspscc
+*.vssscc
+.builds
+*.pidb
+*.log
+*.scc
+
+# Visual C++ cache files
+ipch/
+*.aps
+*.ncb
+*.opensdf
+*.sdf
+*.cachefile
+
+# Visual Studio profiler
+*.psess
+*.vsp
+*.vspx
+
+# Guidance Automation Toolkit
+*.gpState
+
+# ReSharper is a .NET coding add-in
+_ReSharper*/
+*.[Rr]e[Ss]harper
+
+# TeamCity is a build add-in
+_TeamCity*
+
+# DotCover is a Code Coverage Tool
+*.dotCover
+
+# NCrunch
+*.ncrunch*
+.*crunch*.local.xml
+
+# Installshield output folder
+[Ee]xpress/
+
+# DocProject is a documentation generator add-in
+DocProject/buildhelp/
+DocProject/Help/*.HxT
+DocProject/Help/*.HxC
+DocProject/Help/*.hhc
+DocProject/Help/*.hhk
+DocProject/Help/*.hhp
+DocProject/Help/Html2
+DocProject/Help/html
+
+# Click-Once directory
+publish/
+
+# Publish Web Output
+*.Publish.xml
+*.pubxml
+
+# NuGet Packages Directory
+## TODO: If you have NuGet Package Restore enabled, uncomment the next line
+#packages/
+
+# Windows Azure Build Output
+csx
+*.build.csdef
+
+# Windows Store app package directory
+AppPackages/
+
+# Others
+sql/
+*.Cache
+ClientBin/
+[Ss]tyle[Cc]op.*
+~$*
+*~
+*.dbmdl
+*.[Pp]ublish.xml
+*.pfx
+*.publishsettings
+
+# RIA/Silverlight projects
+Generated_Code/
+
+# Backup & report files from converting an old project file to a newer
+# Visual Studio version. Backup files are not needed, because we have git ;-)
+_UpgradeReport_Files/
+Backup*/
+UpgradeLog*.XML
+UpgradeLog*.htm
+
+# SQL Server files
+App_Data/*.mdf
+App_Data/*.ldf
+
+#############
+## Windows detritus
+#############
+
+# Windows image file caches
+Thumbs.db
+ehthumbs.db
+
+# Folder config file
+Desktop.ini
+
+# Recycle Bin used on file shares
+$RECYCLE.BIN/
+
+# Mac crap
+.DS_Store
+
+
+#############
+## Python
+#############
+
+*.py[co]
+
+# Packages
+*.egg
+*.egg-info
+dist/
+build/
+eggs/
+parts/
+var/
+sdist/
+develop-eggs/
+.installed.cfg
+
+# Installer logs
+pip-log.txt
+
+# Unit test / coverage reports
+.coverage
+.tox
+
+#Translations
+*.mo
+
+#Mr Developer
+.mr.developer.cfg
+
+.idea/
+
+# Smarty
+lexer/*.php
+lexer/*.out
diff --git a/include/smarty/.travis.yml b/include/smarty/.travis.yml
new file mode 100644
index 000000000..fbf081bac
--- /dev/null
+++ b/include/smarty/.travis.yml
@@ -0,0 +1,25 @@
+language: php
+
+php:
+  - 5.3
+  - 5.4
+  - 5.5
+  - 5.6
+  - 7.0
+  - hhvm
+
+matrix:
+  allow_failures:
+    - php: hhvm
+
+before_script:
+    - travis_retry composer self-update
+    - travis_retry composer --prefer-source --dev install
+
+install:
+   - git clone --depth=50 --branch=master git://github.com/smarty-php/smarty-phpunit.git
+
+script:
+   - cd smarty-phpunit
+   - phpunit ./
+
diff --git a/include/smarty/COMPOSER_RELEASE_NOTES.txt b/include/smarty/COMPOSER_RELEASE_NOTES.txt
new file mode 100644
index 000000000..c943d9f2e
--- /dev/null
+++ b/include/smarty/COMPOSER_RELEASE_NOTES.txt
@@ -0,0 +1,29 @@
+
+
+Starting with Smarty 3.1.21 Composer has been configured to load the packages from github.
+
+*******************************************************************************
+*                                                                             *
+*  NOTE: Because of this change you must clear your local composer cache with *
+*                 the "composer clearcache" command                           *
+*                                                                             *
+*******************************************************************************
+
+To get the latest stable version use
+    "require": {
+        "smarty/smarty": "~3.1"
+    }
+in your composer.json file.
+
+To get the trunk version use
+    "require": {
+        "smarty/smarty": "~3.1@dev"
+    }
+
+The "smarty/smarty" package will start at libs/....   subfolder.
+
+To retrieve the development and documentation folders add
+    "require-dev": {
+        "smarty/smarty-dev": "~3.1@dev"
+    }
+
diff --git a/include/smarty/INHERITANCE_RELEASE_NOTES.txt b/include/smarty/INHERITANCE_RELEASE_NOTES.txt
new file mode 100644
index 000000000..8b2c64a1b
--- /dev/null
+++ b/include/smarty/INHERITANCE_RELEASE_NOTES.txt
@@ -0,0 +1,67 @@
+Starting with version 3.1.28 template inheritance is no longer a compile time process.
+All {block} tag parent/child relations are resolved at run time.
+This does resolve all known existing restrictions (see below).
+
+The $smarty::$inheritance_merge_compiled_includes property has been removed.
+Any access to it is ignored.
+
+This does enable some new features:
+
+Any code outside root {block} tags in child templates is now executed but any output will be ignored.
+
+   {extends 'foo.tpl'}
+   {$bar = 'on'}           // assigns variable $bar seen in parent templates
+   {block 'buh'}{/block}
+
+   {extends 'foo.tpl'}
+   {$bar}           // the output of variable bar is ignored
+   {block 'buh'}{/block}
+
+{block} tags can be dynamically en/disabled by conditions.
+
+   {block 'root'}
+      {if $foo}
+         {block 'v1'}
+             ....
+         {/block}
+      {else}
+         {block 'v1'}
+             ....
+         {/block}
+      {/if}
+   {/block}
+
+
+
+THE FOLLOWING RESTRICTIONS ARE NO LONGER EXISTING:
+In Smarty 3.1 template inheritance is a compile time process. All the extending of {block} tags
+is done at compile time and the parent and child templates are compiled in a single compiled template.
+{include} subtemplate could also {block} tags. Such subtemplate could not compiled by it's own because
+it could be used in other context where the {block} extended with a different result. For that reasion
+the compiled code of {include} subtemplates gets also merged in compiled inheritance template.
+
+Merging the code into a single compile template has some drawbacks.
+1. You could not use variable file names in {include} Smarty would use the {include} of compilation time.
+2. You could not use individual compile_id in {include}
+3. Seperate caching of subtemplate was not possible
+4. Any change of the template directory structure between calls was not necessarily seen.
+
+Starting with 3.1.15 some of the above conditions got checked and resulted in an exception. It turned out
+that a couple of users did use some of above and now got exceptions.
+
+To resolve this starting with 3.1.16 there is a new configuration parameter $inheritance_merge_compiled_includes.
+For most backward compatibility its default setting is true.
+With this setting all {include} subtemplate will be merge into the compiled inheritance template, but the above cases
+could be rejected by exception.
+
+
+If $smarty->inheritance_merge_compiled_includes = false; {include} subtemplate will not be merged. 
+You must now manually merge all {include} subtemplate which do contain {block} tags. This is done by setting the "inline" option.
+{include file='foo.bar' inline}
+
+1. In case of a variable file name like {include file=$foo inline} you must use the variable in a compile_id  $smarty->compile_id = $foo;
+2. If you use individual compile_id in {include file='foo.tpl' compile_id=$bar inline} it must be used in the 
+   global compile_id as well  $smarty->compile_id = $bar;
+3. If call templates with different template_dir configurations and a parent could same named child template from different folders
+   you must make the folder name part of the compile_id.
+
diff --git a/include/smarty/NEW_FEATURES.txt b/include/smarty/NEW_FEATURES.txt
new file mode 100644
index 000000000..595dc4d3c
--- /dev/null
+++ b/include/smarty/NEW_FEATURES.txt
@@ -0,0 +1,133 @@
+
+
+This file contains a brief description of new features which have been added to Smarty 3.1
+
+Smarty 3.1.28
+
+    OPCACHE
+    =======
+    Smarty does now invalidate automatically updated and cleared compiled or cached template files in OPCACHE.
+    Correct operation is no longer dependent on OPCACHE configuration settings.
+
+    Template inheritance
+    ====================
+    Template inheritance is now processed in run time.
+    See the INHERITANCE_RELEASE_NOTES
+
+    Modifier regex_replace
+    ======================
+    An optional limit parameter was added
+
+    fetch() and display()
+    =====================
+    The fetch() and display() methods of the template object accept now optionally the same parameter
+    as the corresponding Smarty methods to get tne content of another template.
+    Example:
+        $template->display();           Does display template of template object
+        $template->dispaly('foo.tpl');  Does display template 'foo.bar' 
+
+    File: resource
+    ==============
+    Multiple template_dir entries can now be selected  by a comma separated list of indices.
+    The template_dir array is searched in the order of the indices. (Could be used to change the default search order)
+    Example:
+        $smarty->display([1],[0]foo.bar');
+        
+    Filter support
+    ==============
+    Optional filter names
+      An optional filter name was added to $smarty->registerFilter(). It can be used to unregister a filter by name.
+      - $smarty->registerFilter('output', $callback, 'name');
+        $smarty->unregister('output', 'name');
+
+    Closures
+      $smarty->registerFilter() does now accept closures.
+      - $smarty->registerFilter('pre', function($source) {return $source;});
+      If no optional filter name was specified it gets the default name 'closure'.
+      If you register multiple closures register each with a unique filter name.
+      - $smarty->registerFilter('pre', function($source) {return $source;}, 'closure_1');
+      - $smarty->registerFilter('pre', function($source) {return $source;}, 'closure_2');
+      
+
+Smarty 3.1.22
+
+    Namespace support within templates
+    ==================================
+    Within templates you can now use namespace specifications on:
+     - Constants                like    foo\bar\FOO
+     - Class names              like    foo\bar\Baz::FOO, foo\bar\Baz::$foo, foo\bar\Baz::foo()
+     - PHP function names       like    foo\bar\baz()
+
+    Security
+    ========
+    - disable special $smarty variable -
+    The Smarty_Security class has the new property $disabled_special_smarty_vars.
+    It's an array which can be loaded with the $smarty special variable names like
+    'template_object', 'template', 'current_dir' and others which will be disabled.
+    Note: That this security check is performed at compile time.
+
+    - limit template nesting -
+    Property $max_template_nesting of Smarty_Security does set the maximum template nesting level.
+    The main template is level 1. The nesting level is checked at run time. When the maximum will be exceeded
+    an Exception will be thrown. The default setting is 0 which does disable this check.
+
+    - trusted static methods -
+   The Smarty_Security class has the new property $trusted_static_methods to restrict access to static methods.
+   It's an nested array of trusted class and method names.
+         Format:
+         array (
+                    'class_1' => array('method_1', 'method_2'), // allowed methods
+                    'class_2' => array(),                       // all methods of class allowed
+               )
+   To disable access for all methods of all classes set $trusted_static_methods = null;
+   The default value is an empty array() which does enables all methods of all classes, but for backward compatibility
+   the setting of $static_classes will be checked.
+   Note: That this security check is performed at compile time.
+
+    - trusted static properties -
+   The Smarty_Security class has the new property $trusted_static_properties to restrict access to static properties.
+   It's an nested array of trusted class and property names.
+         Format:
+         array (
+                    'class_1' => array('prop_1', 'prop_2'), // allowed properties listed
+                    'class_2' => array(),                   // all properties of class allowed
+                }
+   To disable access for all properties of all classes set $trusted_static_properties = null;
+   The default value is an empty array() which does enables all properties of all classes, but for backward compatibility
+   the setting of $static_classes will be checked.
+   Note: That this security check is performed at compile time.
+
+    - trusted constants .
+   The Smarty_Security class has the new property $trusted_constants to restrict access to constants.
+   It's an array of trusted constant names.
+         Format:
+         array (
+                    'SMARTY_DIR' , // allowed constant
+                }
+   If the array is empty (default) the usage of constants  can be controlled with the
+   Smarty_Security::$allow_constants property (default true)
+
+
+
+    Compiled Templates
+    ==================
+    Smarty does now automatically detects a change of the $merge_compiled_includes and $escape_html
+    property and creates different compiled templates files depending on the setting.
+
+    Same applies to config files and the $config_overwrite, $config_booleanize and
+    $config_read_hidden properties.
+
+    Debugging
+    =========
+    The layout of the debug window has been changed for better readability
+    
+    New class constants
+        Smarty::DEBUG_OFF
+        Smarty::DEBUG_ON
+        Smarty::DEBUG_INDIVIDUAL
+    have been introduced for setting the $debugging property.
+
+    Smarty::DEBUG_INDIVIDUAL will create for each display() and fetch() call an individual debug window.
+
+    .
+    
\ No newline at end of file
diff --git a/include/smarty/README b/include/smarty/README
index bf03403aa..08b397c3f 100644
--- a/include/smarty/README
+++ b/include/smarty/README
@@ -1,4 +1,4 @@
-Smarty 3.1.13
+Smarty 3.x
 
 Author: Monte Ohrt <monte at ohrt dot com >
 Author: Uwe Tews
@@ -120,7 +120,7 @@ $smarty->unregisterObject($object_name)
 $smarty->unregisterFilter($type, $function_name)
 $smarty->unregisterResource($resource_type)
 
-$smarty->compileAllTemplates($extention = '.tpl', $force_compile = false, $time_limit = 0, $max_errors = null)
+$smarty->compileAllTemplates($extension = '.tpl', $force_compile = false, $time_limit = 0, $max_errors = null)
 $smarty->clearCompiledTemplate($resource_name = null, $compile_id = null, $exp_time = null)
 $smarty->testInstall()
 
@@ -460,12 +460,13 @@ included template.
 PLUGINS
 =======
 
-Smarty3 are following the same coding rules as in Smarty2. 
-The only difference is that the template object is passed as additional third parameter.
+Smarty 3 plugins follow the same coding rules as in Smarty 2. 
+The main difference is that the template object is now passed in place of the smarty object. 
+The smarty object can be still be accessed through $template->smarty.
 
-smarty_plugintype_name (array $params, object $smarty, object $template)
+smarty_plugintype_name (array $params, Smarty_Internal_Template $template)
 
-The Smarty 2 plugins are still compatible as long as they do not make use of specific Smarty2 internals.
+The Smarty 2 plugins are still compatible as long as they do not make use of specific Smarty 2 internals.
 
 
 TEMPLATE INHERITANCE:
diff --git a/include/smarty/README.md b/include/smarty/README.md
new file mode 100644
index 000000000..5783eb3e0
--- /dev/null
+++ b/include/smarty/README.md
@@ -0,0 +1,65 @@
+#Smarty 3 template engine
+##Distribution repository
+
+> Smarty 3.1.28 introduces run time template inheritance
+
+> Read the NEW_FEATURES and INHERITANCE_RELEASE_NOTES file for recent extensions to Smarty 3.1 functionality
+
+Smarty versions 3.1.11 or later are now on github and can be installed with Composer.
+
+
+The "smarty/smarty" package will start at libs/....   subfolder.
+
+To get the latest stable version of Smarty 3.1 use
+
+```json
+"require": {
+    "smarty/smarty": "~3.1"
+}
+```
+
+in your composer.json file.
+
+To get the trunk version use
+
+```json
+"require": {
+    "smarty/smarty": "~3.1@dev"
+}
+```
+
+For a specific version use something like
+
+```json
+"require": {
+    "smarty/smarty": "3.1.19"
+}
+```
+
+PHPUnit test can be installed by corresponding composer entries like
+
+```json
+"require": {
+    "smarty/smarty-phpunit": "3.1.19"
+}
+```
+
+Similar applies for the lexer/parser generator
+
+```json
+"require": {
+    "smarty/smarty-lexer": "3.1.19"
+}
+```
+
+Or you could use
+
+```json
+"require": {
+    "smarty/smarty-dev": "3.1.19"
+}
+```
+
+Which is a wrapper to install all 3 packages
+
+Composer can also be used for Smarty2 versions 2.6.24 to 2.6.28
diff --git a/include/smarty/SMARTY_3.1_NOTES.txt b/include/smarty/SMARTY_3.1_NOTES.txt
index e56e56f67..57709f0d7 100644
--- a/include/smarty/SMARTY_3.1_NOTES.txt
+++ b/include/smarty/SMARTY_3.1_NOTES.txt
@@ -199,7 +199,7 @@ Relative paths are available with {include file="..."} and
 $smarty->fetch('./foo.tpl') cannot be relative to a template, an
 exception is thrown.
 
-  Adressing a specific $template_dir
+  Addressing a specific $template_dir
 
 Smarty 3.1 introduces the $template_dir index notation.
 $smarty->fetch('[foo]bar.tpl') and {include file="[foo]bar.tpl"}
diff --git a/include/smarty/change_log.txt b/include/smarty/change_log.txt
index 69642e276..cecda63d1 100644
--- a/include/smarty/change_log.txt
+++ b/include/smarty/change_log.txt
@@ -1,9 +1,684 @@
-===== Smarty-3.1.13  =====
+ ===== 3.1.28 ===== (13.12.2015)
+ 13.12.2015
+  - bugfix {foreach} and {section} with uppercase characters in name attribute did not work (forum topic 25819)
+  - bugfix $smarty->debugging_ctrl = 'URL' did not work (forum topic 25811)
+  - bugfix Debug Console could display incorrect data when using subtemplates
+  
+ 09.12.2015
+  - bugix Smarty did fail under PHP 7.0.0 with use_include_path = true;
+  
+ 09.12.2015
+  -bugfix {strip} should exclude some html tags from stripping, related to fix for https://github.com/smarty-php/smarty/issues/111
+ 
+ 08.12.2015
+  - bugfix internal template function data got stored in wrong compiled file https://github.com/smarty-php/smarty/issues/114
+  
+ 05.12.2015
+  -bugfix {strip} should insert a single space https://github.com/smarty-php/smarty/issues/111
+  
+ 25.11.2015
+  -bugfix a left delimter like '[%' did fail on [%$var_[%$variable%]%] (forum topic 25798)
+
+ 02.11.2015
+  - bugfix {include} with variable file name like {include file="foo_`$bar`.tpl"} did fail in 3.1.28-dev https://github.com/smarty-php/smarty/issues/102
+
+ 01.11.2015
+  - update config file processing
+  
+ 31.10.2015
+  - bugfix add missing $trusted_dir property to SmartyBC class (forum topic 25751)
+
+ 29.10.2015
+  - improve template scope handling
+
+ 24.10.2015
+  - more optimizations of template processing
+  - bugfix Error when using {include} within {capture} https://github.com/smarty-php/smarty/issues/100
+
+ 21.10.2015
+  - move some code into runtime extensions
+
+ 18.10.2015
+  - optimize filepath normalization
+  - rework of template inheritance
+  - speed and size optimizations
+  - bugfix under HHVM temporary cache file must only be created when caches template was updated
+  - fix compiled code for new {block} assign attribute
+  - update code generated by template function call handler
+
+ 18.09.2015
+  - bugfix {if $foo instanceof $bar} failed to compile if 2nd value is a variable https://github.com/smarty-php/smarty/issues/92
+  
+ 17.09.2015
+  - bugfix {foreach} first attribute was not correctly reset since commit 05a8fa2 of 02.08.2015 https://github.com/smarty-php/smarty/issues/90
+
+ 16.09.2015
+  - update compiler by moving no longer needed properties, code optimizations and other
+
+ 14.09.2015
+  - optimize autoloader
+  - optimize subtemplate handling
+  - update template inheritance processing
+  - move code of {call} processing back into Smarty_Internal_Template class
+  - improvement invalidate OPCACHE for cleared compiled and cached template files (forum topic 25557)
+  - bugfix unintended multiple debug windows (forum topic 25699)
+  
+ 30.08.2015
+  - size optimization move some runtime functions into extension
+  - optimize inline template processing
+  - optimization merge inheritance child and parent templates into one compiled template file
+
+ 29.08.2015
+  - improvement convert template inheritance into runtime processing
+  - bugfix {$smarty.block.parent} did always reference the root parent block https://github.com/smarty-php/smarty/issues/68
+
+ 23.08.2015
+  - introduce Smarty::$resource_cache_mode and cache template object of {include} inside loop
+  - load seldom used Smarty API methods dynamically to reduce memory footprint
+  - cache template object of {include} if same template is included several times
+  - convert debug console processing to object
+  - use output buffers for better performance and less memory usage
+  - optimize nocache hash processing
+  - remove not really needed properties
+  - optimize rendering
+  - move caching to Smarty::_cache
+  - remove properties with redundant content
+  - optimize Smarty::templateExists()
+  - optimize use_include_path processing
+  - relocate properties for size optimization
+  - remove redundant code
+  - bugfix compiling super globals like {$smarty.get.foo} did fail in the master branch https://github.com/smarty-php/smarty/issues/77
+
+ 06.08.2015
+  - avoid possible circular object references caused by parser/lexer objects
+  - rewrite compileAll... utility methods
+  - commit several  internal improvements
+  - bugfix Smarty failed when compile_id did contain "|"
+
+ 03.08.2015
+  - rework clear cache methods
+  - bugfix compileAllConfig() was broken since 3.1.22 because of the changes in config file processing
+  - improve getIncludePath() to return directory if no file was given
+
+ 02.08.2015
+  - optimization and code cleanup of {foreach} and {section} compiler
+  - rework {capture} compiler
+
+ 01.08.2015
+  - update DateTime object can be instance of DateTimeImmutable since PHP5.5 https://github.com/smarty-php/smarty/pull/75
+  - improvement show resource type and start of template source instead of uid on eval: and string: resource (forum topic 25630)
+
+ 31.07.2015
+  - optimize {foreach} and {section} compiler
+
+ 29.07.2015
+  - optimize {section} compiler for speed and size of compiled code
+
+ 28.07.2015
+  - update for PHP 7 compatibility
+
+ 26.07.2015
+  - improvement impement workaround for HHVM PHP incompatibillity https://github.com/facebook/hhvm/issues/4797
+
+ 25.07.2015
+  - bugfix parser did hang on text starting <?something https://github.com/smarty-php/smarty/issues/74
+
+ 20.07.2015
+  - bugfix config files got recompiled on each request
+  - improvement invalidate PHP 5.5 opcache for recompiled and cached templates  https://github.com/smarty-php/smarty/issues/72
+
+ 12.07.2015
+  - optimize {extends} compilation
+
+ 10.07.2015
+  - bugfix force file: resource in demo resource.extendsall.php
+
+ 08.07.2015
+  - bugfix convert each word of class names to ucfirst in in compiler. (forum topic 25588)
+
+ 07.07.2015
+  - improvement allow fetch() or display() called on a template object to get output from other template
+     like $template->fetch('foo.tpl') https://github.com/smarty-php/smarty/issues/70
+  - improvement Added $limit parameter to regex_replace modifier #71
+  - new feature multiple indices on file: resource
+
+ 06.07.2015
+  - optimize {block} compilation
+  - optimization get rid of __get and __set in source object
+
+ 01.07.2015
+  - optimize compile check handling
+  - update {foreach} compiler
+  - bugfix debugging console did not display string values containing \n, \r or \t correctly https://github.com/smarty-php/smarty/issues/66
+  - optimize source resources
+
+ 28.06.2015
+  - move $smarty->enableSecurity() into Smarty_Security class
+  - optimize security isTrustedResourceDir()
+  - move auto load filter methods into extension
+  - move $smarty->getTemplateVars() into extension
+  - move getStreamVariable() into extension
+  - move $smarty->append() and $smarty->appendByRef() into extension
+  - optimize autoloader
+  - optimize file path normalization
+  - bugfix PATH_SEPARATOR was replaced by mistake in autoloader
+  - remove redundant code
+
+ 27.06.2015
+  - bugfix resolve naming conflict between custom Smarty delimiter '<%' and PHP ASP tags https://github.com/smarty-php/smarty/issues/64
+  - update $smarty->_realpath for relative path not starting with './'
+  - update Smarty security with new realpath handling
+  - update {include_php} with new realpath handling
+  - move $smarty->loadPlugin() into extension
+  - minor compiler optimizations
+  - bugfix allow function plugins with name ending with 'close' https://github.com/smarty-php/smarty/issues/52
+  - rework of $smarty->clearCompiledTemplate() and move it to its own extension
+
+ 19.06.2015
+  - improvement allow closures as callback at $smarty->registerFilter() https://github.com/smarty-php/smarty/issues/59
+
+ ===== 3.1.27===== (18.06.2015)
+ 18.06.2015
+  - bugfix another update on file path normalization failed on path containing something like "/.foo/" https://github.com/smarty-php/smarty/issues/56
+
+ ===== 3.1.26===== (18.06.2015)
+ 18.06.2015
+  - bugfix file path normalization failed on path containing something like "/.foo/" https://github.com/smarty-php/smarty/issues/56
+
+ 17.06.2015
+  - bugfix calling a plugin with nocache option but no other attributes like {foo nocache} caused call to undefined function https://github.com/smarty-php/smarty/issues/55
+
+ ===== 3.1.25===== (15.06.2015)
+ 15.06.2015
+  - optimization of smarty_cachereource_keyvaluestore.php code
+
+ 14.06.2015
+  - bugfix a relative sub template path could fail if template_dir path did contain /../ https://github.com/smarty-php/smarty/issues/50
+  - optimization rework of path normalization
+  - bugfix an output tag with variable, modifier followed by an operator like {$foo|modifier+1} did fail https://github.com/smarty-php/smarty/issues/53
+
+ 13.06.2015
+  - bugfix a custom cache resource using smarty_cachereource_keyvaluestore.php did fail if php.ini mbstring.func_overload = 2 (forum topic 25568)
+
+ 11.06.2015
+  - bugfix the lexer could hang on very large quoted strings (forum topic 25570)
+
+ 08.06.2015
+  - bugfix using {$foo} as array index like $bar.{$foo} or in double quoted string like "some {$foo} thing" failed https://github.com/smarty-php/smarty/issues/49
+
+ 04.06.2015
+  - bugfix possible error message on unset() while compiling {block} tags https://github.com/smarty-php/smarty/issues/46
+
+ 01.06.2015
+  - bugfix <?xml ... ?> including template variables broken  since 3.1.22 https://github.com/smarty-php/smarty/issues/47
+  
+ 27.05.2015
+  - bugfix {include} with variable file name must not create by default individual cache file (since 3.1.22) https://github.com/smarty-php/smarty/issues/43
+  
+ 24.05.2015
+  - bugfix if condition string 'neq' broken due to a typo https://github.com/smarty-php/smarty/issues/42
+
+ ===== 3.1.24===== (23.05.2015)
+ 23.05.2015
+  - improvement on php_handling to allow very large PHP sections, better error handling
+  - improvement allow extreme large comment sections (forum 25538)
+  
+ 21.05.2015
+  - bugfix broken PHP 5.2 compatibility when compiling <?php tags https://github.com/smarty-php/smarty/issues/40
+  - bugfix named {foreach} comparison like $smarty.foreach.foobar.index > 1 did compile into wrong code https://github.com/smarty-php/smarty/issues/41
+  
+ 19.05.2015
+  - bugfix compiler did overwrite existing variable value when setting the nocache attribute https://github.com/smarty-php/smarty/issues/39
+  - bugfix output filter trimwhitespace could run into the pcre.backtrack_limit on large output (code.google issue 220)
+  - bugfix compiler could run into the pcre.backtrack_limit on larger comment or {php} tag sections (forum 25538)
+
+ 18.05.2015
+  - improvement introduce shortcuts in lexer/parser rules for most frequent terms for higher
+    compilation speed 
+
+ 16.05.2015
+  - bugfix {php}{/php} did work just for single lines https://github.com/smarty-php/smarty/issues/33
+  - improvement remove not needed ?><?php transitions from compiled code
+  - improvement reduce number of lexer tokens on operators and if conditions
+  - improvement higher compilation speed by modified lexer/parser generator at "smarty/smarty-lexer"
+ 
+ 13.05.2015
+  - improvement remove not needed ?><?php transitions from compiled code
+  - improvement of debugging:
+      - use fresh Smarty object to display the debug console because of possible problems when the Smarty
+        was extended or Smarty properties had been modified in the class source
+      - display Smarty version number
+      - Truncate lenght of Origin display and extend strin value display to 80 character
+  - bugfix in Smarty_Security  'nl2br' should be a trusted modifier, not PHP function (code.google issue 223)
+  
+ 12.05.2015
+  - bugfix {$smarty.constant.TEST} did fail  on undefined constant https://github.com/smarty-php/smarty/issues/28
+  - bugfix access to undefined config variable like {#undef#} did fail https://github.com/smarty-php/smarty/issues/29
+  - bugfix in nested {foreach} saved item attributes got overwritten https://github.com/smarty-php/smarty/issues/33
+
+ ===== 3.1.23 ===== (12.05.2015)
+ 12.05.2015
+  - bugfix of smaller performance issue introduce in 3.1.22 when caching is enabled
+  - bugfix missig entry for smarty-temmplate-config in autoloader
+   
+ ===== 3.1.22 ===== tag was deleted because 3.1.22 did fail caused by the missing entry for smarty-temmplate-config in autoloader
+ 10.05.2015
+  - bugfix custom cache resource did not observe compile_id and cache_id when $cache_locking == true
+  - bugfix cache lock was not handled correctly after timeout when $cache_locking == true
+  - improvement added constants for $debugging
+
+ 07.05.2015
+  - improvement of the debugging console. Read NEW_FEATURES.txt
+  - optimization of resource class loading
+
+ 06.05.2015
+  - bugfix in 3.1.22-dev cache resource must not be loaded for subtemplates
+  - bugfix/improvement in 3.1.22-dev cache locking did not work as expected
+  
+ 05.05.2015
+  - optimization on cache update when main template is modified
+  - optimization move <?php ?> handling from parser to new compiler module
+
+ 05.05.2015
+  - bugfix code could be messed up when {tags} are used in multiple attributes https://github.com/smarty-php/smarty/issues/23
+ 
+ 04.05.2015
+  - bugfix Smarty_Resource::parseResourceName incompatible with Google AppEngine (https://github.com/smarty-php/smarty/issues/22)
+  - improvement use is_file() checks to avoid errors suppressed by @ which could still cause problems (https://github.com/smarty-php/smarty/issues/24)
+
+ 28.04.2015
+  - bugfix plugins of merged subtemplates not loaded in 3.1.22-dev (forum topic 25508) 2nd fix
+
+ 28.04.2015
+  - bugfix plugins of merged subtemplates not loaded in 3.1.22-dev (forum topic 25508)
+ 
+ 23.04.2015 
+  - bugfix a nocache template variable used as parameter at {insert} was by mistake cached
+  
+ 20.04.2015
+  - bugfix at a template function containing nocache code a parmeter could overwrite a template variable of same name
+  
+ 27.03.2015
+  - bugfix Smarty_Security->allow_constants=false; did also disable true, false and null (change of 16.03.2015)
+  - improvement added a whitelist for trusted constants to security Smarty_Security::$trusted_constants (forum topic 25471)
+
+ 20.03.2015
+  - bugfix make sure that function properties get saved only in compiled files containing the fuction definition {forum topic 25452}
+  - bugfix correct update of global variable values on exit of template functions. (reported under Smarty Developers)
+  
+ 16.03.2015
+ - bugfix  problems with {function}{/function} and {call} tags in different subtemplate cache files {forum topic 25452}
+ - bugfix  Smarty_Security->allow_constants=false; did not disallow direct usage of defined constants like {SMARTY_DIR} {forum topic 25457}
+ - bugfix  {block}{/block} tags did not work inside double quoted strings https://github.com/smarty-php/smarty/issues/18
+ 
+ 
+ 15.03.2015
+ - bugfix  $smarty->compile_check must be restored before rendering of a just updated cache file {forum 25452}
+ 
+ 14.03.2015
+ - bugfix  {nocache}  {/nocache} tags corrupted code when used within a nocache section caused by a nocache template variable.
+ 
+ - bugfix  template functions defined with {function} in an included subtemplate could not be called in nocache
+           mode with {call... nocache} if the subtemplate had it's own cache file {forum 25452}
+ 
+ 10.03.2015
+ - bugfix {include ... nocache} whith variable file or compile_id attribute was not executed in nocache mode.
+ 
+ 12.02.2015
+ - bugfix multiple Smarty::fetch() of same template when $smarty->merge_compiled_includes = true; could cause function already defined error
+ 
+ 11.02.2015
+ - bugfix recursive {includes} did create E_NOTICE message when $smarty->merge_compiled_includes = true; (github issue #16)
+ 
+ 22.01.2015
+ - new feature security can now control access to static methods and properties
+                see also NEW_FEATURES.txt
+
+ 21.01.2015
+ - bugfix clearCompiledTemplates(), clearAll() and clear() could try to delete whole drive at wrong path permissions because realpath() fail (forum 25397)
+ - bugfix 'self::' and 'parent::' was interpreted in template syntax as static class 
+ 
+ 04.01.2015
+ - push last weeks changes to github
+
+ - different optimizations
+ - improvement automatically create different versions of compiled templates and config files depending
+   on property settings.
+ - optimization restructure template processing by moving code into classes it better belongs to
+ - optimization restructure config file processing
+
+ 31.12.2014
+ - bugfix use function_exists('mb_get_info') for setting Smarty::$_MBSTRING. 
+   Function mb_split could be overloaded depending on php.ini mbstring.func_overload
+   
+   
+ 29.12.2014
+ - new feature security can now limit the template nesting level by property $max_template_nesting
+                see also NEW_FEATURES.txt (forum 25370)
+
+ 29.12.2014
+ - new feature security can now disable special $smarty variables listed in property $disabled_special_smarty_vars
+                see also NEW_FEATURES.txt (forum 25370)
+
+ 27.12.2014
+  - bugfix clear internal _is_file_cache when plugins_dir was modified
+
+ 13.12.2014
+  - improvement optimization of lexer and parser resulting in a up to 30% higher compiling speed
+ 
+ 11.12.2014
+  - bugfix resolve parser ambiguity between constant print tag {CONST} and other smarty tags after change of 09.12.2014
+  
+ 09.12.2014
+  - bugfix variables $null, $true and $false did not work after the change of 12.11.2014 (forum 25342)
+  - bugfix call of template function by a variable name did not work after latest changes (forum 25342)
+  
+ 23.11.2014
+  - bugfix a plugin with attached modifier could fail if the tag was immediately followed by another Smarty tag (since 3.1.21) (forum 25326)
+
+ 13.11.2014
+  - improvement move autoload code into Autoloader.php. Use Composer autoloader when possible
+
+ 12.11.2014
+ - new feature added support of namespaces to template code
+
+ 08.11.2014 - 10.11.2014
+ - bugfix subtemplate called in nocache mode could be called with wrong compile_id when it did change on one of the calling templates
+ - improvement add code of template functions called in nocache mode dynamically to cache file (related to bugfix of 01.11.2014)
+ - bugfix Debug Console did not include all data from merged compiled subtemplates
+
+ 04.11.2014
+ - new feature $smarty->debugging = true; => overwrite existing Debug Console window (old behaviour)
+               $smarty->debugging = 2; => individual Debug Console window by template name
+ 
+ 03.11.2014
+ - bugfix Debug Console did not show included subtemplates since 3.1.17 (forum 25301)
+ - bugfix Modifier debug_print_var did not limit recursion or prevent recursive object display at Debug Console
+    (ATTENTION: parameter order has changed to be able to specify maximum recursion)
+ - bugfix Debug consol did not include subtemplate information with $smarty->merge_compiled_includes = true 
+ - improvement The template variables are no longer displayed as objects on the Debug Console
+ - improvement $smarty->createData($parent = null, $name = null) new optional name parameter for display at Debug Console
+ - addition of some hooks for future extension of Debug Console
+
+ 01.11.2014
+ - bugfix and enhancement on subtemplate {include} and template {function} tags.
+   * Calling a template which has a nocache section could fail if it was called from a cached and a not cached subtemplate.
+   * Calling the same subtemplate cached and not cached with the $smarty->merge_compiled_includes enabled could cause problems
+   * Many smaller related changes
+
+ 30.10.2014
+ - bugfix access to class constant by object like {$object::CONST} or variable class name {$class::CONST} did not work (forum 25301)
+
+ 26.10.2014
+ - bugfix E_NOTICE message was created during compilation when ASP tags '<%' or '%>' are in template source text
+ - bugfix merge_compiled_includes option failed when caching  enables and same subtemplate was included cached and not cached
+ 
+ ===== 3.1.21 ===== (18.10.2014)
+ 18.10.2014
+  - composer moved to github
+
+ 17.10.2014
+ - bugfix on $php_handling security and optimization of smarty_internal_parsetree (Thue Kristensen)
+
+ 16.10.2014
+ - bugfix composer.json update
+
+ 15.10.2014
+ - bugfix calling a new created cache file with fetch() and Smarty::CACHING_LIFETIME_SAVED multiple times did fail (forum 22350)
+
+ 14.10.2014
+ - bugfix any tag placed within "<script language=php>" will throw a security exception to close all thinkable holes
+ - bugfix classmap in root composer.json should start at "libs/..."
+ - improvement cache is_file(file_exists) results of loadPlugin() to avoid unnecessary calls during compilation (Issue 201}
+
+ 12.10.2014
+ - bugfix a comment like "<script{*foo*} language=php>" bypassed $php_handling checking (Thue Kristensen)
+ - bugfix change of 08.10.2014 could create E_NOTICE meassage when using "<?php" tags
+ - bugfix "<script language=php>" with $php_handling PHP_PASSTHRU was executed in {nocache} sections
+
+ ===== 3.1.20 ===== (09.10.2014)
+ 08.10.2014
+ - bugfix security mode of "<script language=php>" must be controlled by $php_handling property (Thue Kristensen)
+ 
+ 01.10.2014
+ - bugfix template resource of inheritance blocks could get invalid if the default resource type is not 'file'(Issue 202)
+ - bugfix existing child {block} tag must override parent {block} tag append / prepend setting (topic 25259)
+ 
+ 02.08.2014
+ - bugfix modifier wordwrap did output break string wrong if first word was exceeding length with cut = true (topic 25193)
+ 
+ 24.07.2014
+ - bugfix cache clear when cache folder does not exist
+
+ 16.07.2014
+ - enhancement remove BOM automatically from template source (topic 25161)
+ 
+ 04.07.2014
+ - bugfix the bufix of 02.06.2014 broke correct handling of child templates with same name but different template folders in extends resource (issue 194 and topic 25099)
+ 
+ ===== 3.1.19 ===== (30.06.2014)
+ 20.06.2014
+ - bugfix template variables could not be passed as parameter in {include} when the include was in a {nocache} section (topic 25131)
+ 
+ 17.06.2014
+ - bugfix large template text of some charsets could cause parsing errors (topic 24630)
+ 
+ 08.06.2014
+ - bugfix registered objects did not work after spelling fixes of 06.06.2014
+ - bugfix {block} tags within {literal} .. {/literal} got not displayed correctly (topic 25024)
+ - bugfix UNC WINDOWS PATH like "\\psf\path\to\dir" did not work as template directory (Issue 192)
+ - bugfix {html_image} security check did fail on files relative to basedir (Issue 191)
+ 
+ 06.06.2014
+ - fixed PHPUnit outputFilterTrimWhitespaceTests.php assertion of test result
+ - fixed spelling, PHPDoc , minor errors, code cleanup
+ 
+ 02.06.2014
+ - using multiple cwd with relative template dirs could result in identical compiled file names. (issue 194 and topic 25099)
+ 
+ 19.04.2014
+ - bugfix calling createTemplate(template, data) with empty data array caused notice of array to string conversion (Issue 189)
+ - bugfix clearCompiledTemplate() did not delete files on WINDOWS when a compile_id was specified
+ 
+ 18.04.2014
+ - revert bugfix of 5.4.2014 because %-e date format is not supported on all operating systems
+
+ ===== 3.1.18 ===== (07.04.2014)
+ 06.04.2014 
+ - bugfix template inheritance fail when using custom resource after patch of 8.3.2014 (Issue 187)
+ - bugfix update of composer file (Issue 168 and 184)
+
+ 05.04.2014
+ - bugfix default date format leads to extra spaces when displaying dates with single digit days (Issue 165)
+ 
+ 26.03.2014
+ - bugfix Smart_Resource_Custom should not lowercase the resource name (Issue 183)
+ 
+ 24.03.2014
+ - bugfix using a {foreach} property like @iteration could fail when used in inheritance parent templates (Issue 182)
+ 
+ 20.03.2014
+ - bugfix $smarty->auto_literal and mbsting.func_overload 2, 6 or 7 did fail (forum topic 24899)
+ 
+ 18.03.2014
+ - revert change of 17.03.2014
+ 
+17.03.2014
+ - bugfix $smarty->auto_literal and mbsting.func_overload 2, 6 or 7 did fail (forum topic 24899)
+ 
+ 15.03.2014
+ - bugfix Smarty_CacheResource_Keyvaluestore did use different keys on read/writes and clearCache() calls (Issue 169)
+
+ 13.03.2014
+ - bugfix clearXxx() change of 27.1.2014 did not work when specifing cache_id or compile_id  (forum topic 24868 and 24867)
+ 
+ ===== 3.1.17 =====
+ 08.03.2014
+ - bugfix relative file path {include} within {block} of child templates did throw exception on first call (Issue 177)
+ 
+ 17.02.2014
+ - bugfix Smarty failed when executing PHP on HHVM (Hip Hop 2.4) because uniqid('',true) does return string with ',' (forum topic 20343)
+ 
+ 16.02.2014
+ - bugfix a '//' or '\\' in template_dir path could produce wrong path on relative filepath in {include} (Issue 175)
+ 
+ 05.02.2014
+ - bugfix shared.literal_compiler_param.php did throw an exception when literal did contain a '-' (smarty-developers group)
+ 
+ 27.01.2014
+ - bugfix $smarty->debugging = true; did show the variable of the $smarty object not the variables used in display() call (forum topic 24764)
+ - bugfix clearCompiledTemplate(), clearAll() and clear() should use realpath to avoid possible exception from RecursiveDirectoryIterator (Issue 171)
+ 
+ 26.01.2014
+ - bugfix  undo block nesting checks for {nocache} for reasons like forum topic 23280 (forum topic 24762)
+ 
+ 18.01.2014
+ - bugfix the compiler did fail when using template inheritance and recursive {include} (smarty-developers group)
+ 
+ 11.01.2014
+ - bugfix "* }" (spaces before right delimiter) was interpreted by mistake as comment end tag (Issue 170)
+ - internals  content cache should be clear when updating cache file
+ 
+ 08.01.2014
+ - bugfix Smarty_CacheResource_Custom did not handle template resource type specifications on clearCache() calls (Issue 169)
+ - bugfix SmartyBC.class.php should use require_once to load Smarty.class.php (forum topic 24683)
+ 
+ ===== 3.1.16 =====
+ 15.12.2013
+ - bugfix {include} with {block} tag handling (forum topic 24599, 24594, 24682) (Issue 161)
+   Read 3.1.16_RELEASE_NOTES for more details
+ - enhancement additional debug output at $smarty->_parserdebug = true;
+ 
+ 07.11.2013
+ - bugfix too restrictive handling of {include} within {block} tags. 3.1.15 did throw errors where 3.1.14 did not (forum topic 24599)
+ - bugfix compiler could fail if PHP mbstring.func_overload is enabled  (Issue 164)
+ 
+ 28.10.2013
+ - bugfix variable resource name at custom resource plugin did not work within {block} tags (Issue 163)
+ - bugfix notice "Trying to get property of non-object" removed (Issue 163)
+ - bugfix correction of modifier capitalize fix from 3.10.2013  (issue 159)
+ - bugfix multiple {block}s with same name in parent did not work (forum topic 24631) 
+ 
+ 20.10.2013
+ - bugfix a variable file name at {extends} tag did fail (forum topic 24618)
+ 
+ 14.10.2013
+ - bugfix yesterdays fix could result in an undefined variable
+ 
+ 13.10.2013
+ - bugfix variable names on {include} in template inheritance did unextepted error message (forum topic 24594) (Issue 161)
+.- bugfix relative includes with same name like {include './foo.tpl'} from different folder failed (forum topic 24590)(Issue 161) 
+
+ 04.10.2013
+ - bugfix variable file names at {extends} had been disbabled by mistake with the rewrite of 
+   template inheritance of 24.08.2013   (forum topic 24585)
+   
+03.10.2013
+ - bugfix loops using modifier capitalize did eat up memory (issue 159)
+ 
+ ===== Smarty 3.1.15 =====
+01.10.2013
+ - use current delimiters in compiler error messages (issue 157)
+ - improvement on performance when using error handler and multiple template folders (issue 152)
+
+17.09.2013
+ - improvement added patch for additional SmartyCompilerException properties for better access to scource information (forum topic 24559)
+
+16.09.2013
+ - bugfix recompiled templates did not show on first request with zend opcache cache (forum topic 24320)
+ 
+13.09.2013
+ - bugfix html_select_time defaulting error for the Meridian dropdown (forum topic 24549)
+
+09.09.2012
+- bugfix incorrect compiled code with array(object,method) callback at registered Variable Filter (forum topic 24542)
+
+27.08.2013
+- bugfix delimiter followed by linebreak did not work as auto literal after update from 24.08.2013 (forum topic 24518)
+
+24.08.2013
+- bugfix and enhancement
+  Because several recent problems with template inheritance the {block} tag compiler has been rewriten
+   - Error messages shown now the correct child template file and line number
+   - The compiler could fail on some larger UTF-8 text block (forum topic 24455)
+   - The {strip} tag can now be placed outside {block} tags in child templates (forum topic 24289)
+- change SmartyException::$escape  is now false by default
+- change PHP traceback has been remove for SmartyException and SmartyCompilerException
+   
+14.08.2013
+- bugfix compiled filepath of config file did not observe different config_dir (forum topic 24493)
+
+13.08.2013
+- bugfix the internal resource cache did not observe config_dir changes (forum topic 24493)
+
+12.08.2013
+- bugfix internal $tmpx variables must be unique over all inheritance templates (Issue 149)
+
+10.08.2013
+- bugfix a newline was eaten when a <?xml ... ?> was passed by a Smarty variable and caching was enabled (forum topic 24482)
+
+29.07.2013
+- bugfix headers already send warning thrown when using 'SMARTY_DEBUG=on' from URL (Issue 148)
+
+27.07.2013
+- enhancement allow access to properties of registered opjects for Smarty2 BC (forum topic 24344)
+
+26.07.2013
+- bugfix template inheritance nesting problem (forum topic 24387)
+
+15.7.2013
+- update code generated by PSR-2 standards fixer which introduced PHP 5.4 incompatibilities of 14.7.2013
+
+14.7.2013
+- bugfix increase of internal maximum parser stacksize to allow more complex tag code {forum topic 24426}
+- update for PHP 5.4 compatibility
+- reformat source to PSR-2 standard
+
+12.7.2013
+- bugfix Do not remove '//' from file path at normalization (Issue 142)
+
+2.7.2013
+- bugfix trimwhitespace would replace captured items in wrong order (forum topic 24387)
+
+===== Smarty-3.1.14 =====
+27.06.2013
+- bugfix removed PHP 5.5 deprecated preg_replace /e option in modifier capitalize (forum topic 24389)
+
+17.06.2013
+- fixed spelling in sources and documentation (from smarty-developers forum Veres Lajos)
+- enhancement added constant SMARTY::CLEAR_EXPIRED for the change of 26.05.2013 (forum topic 24310)
+- bugfix added smarty_security.php to composer.json (Issue 135)
+
+26.05.2013
+- enhancement an expire_time of -1 in clearCache() and clearAllCache() will delete outdated cache files
+  by their individual cache_lifetime used at creation (forum topic 24310)
+
+21.05.2013
+- bugfix modifier strip_tags:true was compiled into wrong code (Forum Topic 24287)
+- bugfix /n after ?> in Smarty.class.php did start output buffering (Issue 138)
+
+25.04.2013
+- bugfix escape and wordrap modifier could be compiled into wrong code when used in {nocache}{/nocache}
+  section but caching is disabled  (Forum Topic 24260)
+  
+05.04.2013
+- bugfix post filter must not run when compiling inheritance child blocks (Forum Topic 24094)
+- bugfix after the fix for Issue #130 compiler exceptions got double escaped (Forum Topic 24199)
+
+28.02.2013
+- bugfix nocache blocks could be lost when using CACHING_LIFETIME_SAVED (Issue #133)
+- bugfix Compile ID gets nulled when compiling child blocks (Issue #134)
+
+
+24.01.2013
+- bugfix wrong tag type in smarty_internal_templatecompilerbase.php could cause wrong plugin search order (Forum Topic 24028)
+
+===== Smarty-3.1.13 =====
 13.01.2013
 - enhancement allow to disable exception message escaping by SmartyException::$escape = false;  (Issue #130)
 
 09.01.2013
-- bugfix compilation did fail when a prefilter did modify an {extends} tag (Forum Topic 23966)
+- bugfix compilation did fail when a prefilter did modify an {extends} tag c
 - bugfix template inheritance could fail if nested {block} tags in childs did contain {$smarty.block.child} (Issue #127)
 - bugfix template inheritance could fail if {block} tags in childs did have similar name as used plugins (Issue #128)
 - added abstract method declaration doCompile() in Smarty_Internal_TemplateCompilerBase (Forum Topic 23969)
@@ -417,7 +1092,7 @@
 03/09/2011
 - bugfix createTemplate() must default to cache_id and compile_id of Smarty object
 - bugfix Smarty_CacheResource_KeyValueStore must include $source->uid in cache filepath to keep templates with same
-  name but different folders seperated
+  name but different folders separated
 - added cacheresource.apc.php example in demo folder
 
 02/09/2011
@@ -470,7 +1145,7 @@
 
 15/07/2011
 - bugfix individual cache_lifetime of {include} did not work correctly inside {block} tags
-- added caches for Smarty_Template_Source and Smarty_Template_Compiled to reduce I/O for multiple cache_id rendering
+- added caches for Smarty_Internal_TemplateSource and Smarty_Internal_TemplateCompiled to reduce I/O for multiple cache_id rendering
 
 14/07/2011
 - made Smarty::loadPlugin() respect the include_path if required
@@ -608,7 +1283,7 @@
 - changed ./ and ../ behaviour
 
 14/02/2011
-- added {block ... hide} option to supress block if no child is defined
+- added {block ... hide} option to suppress block if no child is defined
 
 13/02/2011
 - update handling of recursive subtemplate calls
@@ -722,7 +1397,7 @@
 - bugfix on compiler object destruction. compiler_object property was by mistake unset.
 
 09/03/2011
--bugfix a variable filter should run before modifers on an output tag (see change of 23/07/2010)
+-bugfix a variable filter should run before modifiers on an output tag (see change of 23/07/2010)
 
 08/03/2011
 - bugfix loading config file without section should load only defaults
@@ -1026,10 +1701,10 @@ request_use_auto_globals
 - bugfix passing scope attributes in doublequoted strings did not work at {include} {assign} and {append}
 
 25/07/2010
-- another bugfix of change from 23/07/2010 when compiling modifer
+- another bugfix of change from 23/07/2010 when compiling modifier
 
 24/07/2010
-- bugfix of change from 23/07/2010 when compiling modifer
+- bugfix of change from 23/07/2010 when compiling modifier
 
 23/07/2010
 - changed execution order. A variable filter does now run before modifiers on output of variables
@@ -1336,7 +2011,7 @@ request_use_auto_globals
 - bugfix on {if} tags 
 
 01/12/2010
-- changed back modifer handling in parser. Some restrictions still apply:
+- changed back modifier handling in parser. Some restrictions still apply:
     if modifiers are used in side {if...} expression or in mathematical expressions 
     parentheses must be used.
 - bugfix the {function..} tag did not accept the name attribute in double quotes
@@ -1948,7 +2623,7 @@ NOTICE: existing compiled template and cache files must be deleted
 - fixed exceptions in function plugins
 - fixed notice error in Smarty.class.php
 - allow chained objects to span multiple lines
-- fixed error in modifers 
+- fixed error in modifiers 
 
 03/20/2009
 - moved /plugins folder into /libs folder
@@ -1956,7 +2631,7 @@ NOTICE: existing compiled template and cache files must be deleted
 - autoappend a directory separator if the xxxxx_dir definition have no trailing one
 
 03/19/2009
-- allow array definition as modifer parameter
+- allow array definition as modifier parameter
 - changed modifier to use multi byte string funktions. 
 
 03/17/2009
diff --git a/include/smarty/composer.json b/include/smarty/composer.json
new file mode 100644
index 000000000..2a1a43ae7
--- /dev/null
+++ b/include/smarty/composer.json
@@ -0,0 +1,43 @@
+{
+    "name": "smarty/smarty",
+    "type": "library",
+    "description": "Smarty - the compiling PHP template engine",
+    "keywords": ["templating"],
+    "homepage": "http://www.smarty.net",
+    "license": "LGPL-3.0",
+    "authors": [
+        {
+            "name": "Monte Ohrt",
+            "email": "monte@ohrt.com"
+        },
+        {
+            "name": "Uwe Tews",
+            "email": "uwe.tews@googlemail.com"
+        },
+        {
+            "name": "Rodney Rehm",
+            "email": "rodney.rehm@medialize.de"
+        }
+    ],
+    "support": {
+        "irc": "irc://irc.freenode.org/smarty",
+        "issues": "https://github.com/smarty-php/smarty/issues",
+        "forum": "http://www.smarty.net/forums/"
+    },
+    "require": {
+        "php": ">=5.2"
+    },
+    "autoload": {
+        "classmap": [
+            "libs/Smarty.class.php",
+            "libs/SmartyBC.class.php",
+            "libs/sysplugins/"
+        ]
+    },
+    "extra": {
+        "branch-alias": {
+            "dev-master": "3.1.x-dev"
+        }
+    }
+
+}
diff --git a/include/smarty/lexer/smarty_internal_configfilelexer.plex b/include/smarty/lexer/smarty_internal_configfilelexer.plex
new file mode 100644
index 000000000..9a45a5f00
--- /dev/null
+++ b/include/smarty/lexer/smarty_internal_configfilelexer.plex
@@ -0,0 +1,318 @@
+<?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_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 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;
+
+    /**
+     * token names
+     *
+     * @var array
+     */
+    public $smarty_token_names = array(        // Text for parser error messages
+    );
+
+    /**
+     * constructor
+     *
+     * @param   string                             $data template source
+     * @param Smarty_Internal_Config_File_Compiler $compiler
+     */
+    function __construct($data, Smarty_Internal_Config_File_Compiler $compiler)
+    {
+        // set instance object
+        self::instance($this);
+        $this->data = $data . "\n"; //now all lines are \n-terminated
+        $this->counter = 0;
+        if (preg_match('/^\xEF\xBB\xBF/', $this->data, $match)) {
+            $this->counter += strlen($match[0]);
+        }
+        $this->line = 1;
+        $this->compiler = $compiler;
+        $this->smarty = $compiler->smarty;
+        $this->configBooleanize = $this->smarty->config_booleanize;
+    }
+
+    public static function &instance($new_instance = null)
+    {
+        static $instance = null;
+        if (isset($new_instance) && is_object($new_instance)) {
+            $instance = $new_instance;
+        }
+        return $instance;
+    }
+
+    public function PrintTrace()
+    {
+        $this->yyTraceFILE = fopen('php://output', 'w');
+        $this->yyTracePrompt = '<br>';
+    }
+
+
+/*!lex2php
+%input $this->data
+%counter $this->counter
+%token $this->token
+%value $this->value
+%line $this->line
+commentstart = /#|;/
+openB = /\[/
+closeB = /\]/
+section = /.*?(?=[\.=\[\]\r\n])/
+equal = /=/
+whitespace = /[ \t\r]+/
+dot = /\./
+id = /[0-9]*[a-zA-Z_]\w*/
+newline = /\n/
+single_quoted_string = /'[^'\\]*(?:\\.[^'\\]*)*'(?=[ \t\r]*[\n#;])/
+double_quoted_string = /"[^"\\]*(?:\\.[^"\\]*)*"(?=[ \t\r]*[\n#;])/
+tripple_quotes = /"""/
+tripple_quotes_end = /"""(?=[ \t\r]*[\n#;])/
+text = /[\S\s]/
+float = /\d+\.\d+(?=[ \t\r]*[\n#;])/
+int = /\d+(?=[ \t\r]*[\n#;])/
+maybe_bool = /[a-zA-Z]+(?=[ \t\r]*[\n#;])/
+naked_string = /[^\n]+?(?=[ \t\r]*\n)/
+*/
+
+/*!lex2php
+%statename START
+
+commentstart {
+    $this->token = Smarty_Internal_Configfileparser::TPC_COMMENTSTART;
+    $this->yypushstate(self::COMMENT);
+}
+openB {
+    $this->token = Smarty_Internal_Configfileparser::TPC_OPENB;
+    $this->yypushstate(self::SECTION);
+}
+closeB {
+    $this->token = Smarty_Internal_Configfileparser::TPC_CLOSEB;
+}
+equal {
+    $this->token = Smarty_Internal_Configfileparser::TPC_EQUAL;
+    $this->yypushstate(self::VALUE);
+}
+whitespace {
+    return false;
+}
+newline {
+    $this->token = Smarty_Internal_Configfileparser::TPC_NEWLINE;
+}
+id {
+    $this->token = Smarty_Internal_Configfileparser::TPC_ID;
+}
+text {
+    $this->token = Smarty_Internal_Configfileparser::TPC_OTHER;
+}
+
+*/
+
+/*!lex2php
+%statename VALUE
+
+whitespace {
+    return false;
+}
+float {
+    $this->token = Smarty_Internal_Configfileparser::TPC_FLOAT;
+    $this->yypopstate();
+}
+int {
+    $this->token = Smarty_Internal_Configfileparser::TPC_INT;
+    $this->yypopstate();
+}
+tripple_quotes {
+    $this->token = Smarty_Internal_Configfileparser::TPC_TRIPPLE_QUOTES;
+    $this->yypushstate(self::TRIPPLE);
+}
+single_quoted_string {
+    $this->token = Smarty_Internal_Configfileparser::TPC_SINGLE_QUOTED_STRING;
+    $this->yypopstate();
+}
+double_quoted_string {
+    $this->token = Smarty_Internal_Configfileparser::TPC_DOUBLE_QUOTED_STRING;
+    $this->yypopstate();
+}
+maybe_bool {
+    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();
+    }
+}
+naked_string {
+    $this->token = Smarty_Internal_Configfileparser::TPC_NAKED_STRING;
+    $this->yypopstate();
+}
+newline {
+    $this->token = Smarty_Internal_Configfileparser::TPC_NAKED_STRING;
+    $this->value = "";
+    $this->yypopstate();
+}
+
+*/
+
+/*!lex2php
+%statename NAKED_STRING_VALUE
+
+naked_string {
+    $this->token = Smarty_Internal_Configfileparser::TPC_NAKED_STRING;
+    $this->yypopstate();
+}
+
+*/
+
+/*!lex2php
+%statename COMMENT
+
+whitespace {
+    return false;
+}
+naked_string {
+    $this->token = Smarty_Internal_Configfileparser::TPC_NAKED_STRING;
+}
+newline {
+    $this->token = Smarty_Internal_Configfileparser::TPC_NEWLINE;
+    $this->yypopstate();
+}
+
+*/
+
+/*!lex2php
+%statename SECTION
+
+dot {
+    $this->token = Smarty_Internal_Configfileparser::TPC_DOT;
+}
+section {
+    $this->token = Smarty_Internal_Configfileparser::TPC_SECTION;
+    $this->yypopstate();
+}
+
+*/
+/*!lex2php
+%statename TRIPPLE
+
+tripple_quotes_end {
+    $this->token = Smarty_Internal_Configfileparser::TPC_TRIPPLE_QUOTES_END;
+    $this->yypopstate();
+    $this->yypushstate(self::START);
+}
+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/include/smarty/lexer/smarty_internal_configfileparser.y b/include/smarty/lexer/smarty_internal_configfileparser.y
new file mode 100644
index 000000000..ac961772d
--- /dev/null
+++ b/include/smarty/lexer/smarty_internal_configfileparser.y
@@ -0,0 +1,362 @@
+/**
+* Smarty Internal Plugin Configfileparser
+*
+* This is the config file parser
+* 
+* 
+* @package Smarty
+* @subpackage Config
+* @author Uwe Tews
+*/
+%name TPC_
+%declare_class {
+/**
+* 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
+}
+%include_class
+{
+    /**
+     * result status
+     *
+     * @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('\\' => '\\',
+                                           '\'' => '\'');
+
+    /**
+     * constructor
+     *
+     * @param Smarty_Internal_Configfilelexer      $lex
+     * @param Smarty_Internal_Config_File_Compiler $compiler
+     */
+    function __construct(Smarty_Internal_Configfilelexer $lex, Smarty_Internal_Config_File_Compiler $compiler)
+    {
+        // set instance object
+        self::instance($this);
+        $this->lex = $lex;
+        $this->smarty = $compiler->smarty;
+        $this->compiler = $compiler;
+        $this->configOverwrite = $this->smarty->config_overwrite;
+        $this->configReadHidden = $this->smarty->config_read_hidden;
+    }
+
+    /**
+     * @param null $new_instance
+     *
+     * @return null
+     */
+    public static function &instance($new_instance = null)
+    {
+        static $instance = null;
+        if (isset($new_instance) && is_object($new_instance)) {
+            $instance = $new_instance;
+        }
+        return $instance;
+    }
+
+    /**
+     * parse optional boolean keywords
+     *
+     * @param string $str
+     *
+     * @return bool
+     */
+    private function parse_bool($str)
+    {
+        $str = strtolower($str);
+        if (in_array($str, array('on', 'yes', 'true'))) {
+            $res = true;
+        } else {
+            $res = false;
+        }
+        return $res;
+    }
+
+    /**
+     * parse single quoted string
+     *  remove outer quotes
+     *  unescape inner quotes
+     *
+     * @param string $qstr
+     *
+     * @return string
+     */
+    private static function parse_single_quoted_string($qstr)
+    {
+        $escaped_string = substr($qstr, 1, strlen($qstr) - 2); //remove outer quotes
+
+        $ss = preg_split('/(\\\\.)/', $escaped_string, - 1, PREG_SPLIT_DELIM_CAPTURE);
+
+        $str = "";
+        foreach ($ss as $s) {
+            if (strlen($s) === 2 && $s[0] === '\\') {
+                if (isset(self::$escapes_single[$s[1]])) {
+                    $s = self::$escapes_single[$s[1]];
+                }
+            }
+            $str .= $s;
+        }
+        return $str;
+    }
+
+    /**
+     * parse double quoted string
+     *
+     * @param string $qstr
+     *
+     * @return string
+     */
+    private static function parse_double_quoted_string($qstr)
+    {
+        $inner_str = substr($qstr, 1, strlen($qstr) - 2);
+        return stripcslashes($inner_str);
+    }
+
+    /**
+     * parse triple quoted string
+     *
+     * @param string $qstr
+     *
+     * @return string
+     */
+    private static function parse_tripple_double_quoted_string($qstr)
+    {
+        return stripcslashes($qstr);
+    }
+
+    /**
+     * set a config variable in target array
+     *
+     * @param array $var
+     * @param array $target_array
+     */
+    private function set_var(Array $var, Array &$target_array)
+    {
+        $key = $var["key"];
+        $value = $var["value"];
+
+        if ($this->configOverwrite || !isset($target_array['vars'][$key])) {
+            $target_array['vars'][$key] = $value;
+        } else {
+            settype($target_array['vars'][$key], 'array');
+            $target_array['vars'][$key][] = $value;
+        }
+    }
+
+    /**
+     * add config variable to global vars
+     *
+     * @param array $vars
+     */
+    private function add_global_vars(Array $vars)
+    {
+        if (!isset($this->compiler->config_data['vars'])) {
+            $this->compiler->config_data['vars'] = Array();
+        }
+        foreach ($vars as $var) {
+            $this->set_var($var, $this->compiler->config_data);
+        }
+    }
+
+    /**
+     * add config variable to section
+     *
+     * @param string $section_name
+     * @param array  $vars
+     */
+    private function add_section_vars($section_name, Array $vars)
+    {
+        if (!isset($this->compiler->config_data['sections'][$section_name]['vars'])) {
+            $this->compiler->config_data['sections'][$section_name]['vars'] = Array();
+        }
+        foreach ($vars as $var) {
+            $this->set_var($var, $this->compiler->config_data['sections'][$section_name]);
+        }
+    }
+}
+
+%token_prefix TPC_
+
+%parse_accept
+{
+    $this->successful = !$this->internalError;
+    $this->internalError = false;
+    $this->retvalue = $this->_retvalue;
+}
+
+%syntax_error
+{
+    $this->internalError = true;
+    $this->yymajor = $yymajor;
+    $this->compiler->trigger_config_file_error();
+}
+
+%stack_overflow
+{
+    $this->internalError = true;
+    $this->compiler->trigger_config_file_error("Stack overflow in configfile parser");
+}
+
+// Complete config file
+start(res) ::= global_vars sections. {
+    res = null;
+}
+
+// Global vars
+global_vars(res) ::= var_list(vl). {
+    $this->add_global_vars(vl);
+    res = null;
+}
+
+// Sections
+sections(res) ::= sections section. {
+    res = null;
+}
+
+sections(res) ::= . {
+    res = null;
+}
+
+section(res) ::= OPENB SECTION(i) CLOSEB newline var_list(vars). {
+    $this->add_section_vars(i, vars);
+    res = null;
+}
+
+section(res) ::= OPENB DOT SECTION(i) CLOSEB newline var_list(vars). {
+    if ($this->configReadHidden) {
+        $this->add_section_vars(i, vars);
+    }
+    res = null;
+}
+
+// Var list
+var_list(res) ::= var_list(vl) newline. {
+    res = vl;
+}
+
+var_list(res) ::= var_list(vl) var(v). {
+    res = array_merge(vl, Array(v));
+}
+
+var_list(res) ::= . {
+    res = Array();
+}
+
+
+// Var
+var(res) ::= ID(id) EQUAL value(v). {
+    res = Array("key" => id, "value" => v);
+}
+
+
+value(res) ::= FLOAT(i). {
+    res = (float) i;
+}
+
+value(res) ::= INT(i). {
+    res = (int) i;
+}
+
+value(res) ::= BOOL(i). {
+    res = $this->parse_bool(i);
+}
+
+value(res) ::= SINGLE_QUOTED_STRING(i). {
+    res = self::parse_single_quoted_string(i);
+}
+
+value(res) ::= DOUBLE_QUOTED_STRING(i). {
+    res = self::parse_double_quoted_string(i);
+}
+
+value(res) ::= TRIPPLE_QUOTES(i) TRIPPLE_TEXT(c) TRIPPLE_QUOTES_END(ii). {
+    res = self::parse_tripple_double_quoted_string(c);
+}
+
+value(res) ::= TRIPPLE_QUOTES(i) TRIPPLE_QUOTES_END(ii). {
+    res = '';
+}
+
+value(res) ::= NAKED_STRING(i). {
+    res = i;
+}
+
+// NOTE: this is not a valid rule
+// It is added hier to produce a usefull error message on a missing '=';
+value(res) ::= OTHER(i). {
+    res = i;
+}
+
+
+// Newline and comments
+newline(res) ::= NEWLINE. {
+    res = null;
+}
+
+newline(res) ::= COMMENTSTART NEWLINE. {
+    res = null;
+}
+
+newline(res) ::= COMMENTSTART NAKED_STRING NEWLINE. {
+    res = null;
+}
diff --git a/include/smarty/lexer/smarty_internal_templatelexer.plex b/include/smarty/lexer/smarty_internal_templatelexer.plex
new file mode 100644
index 000000000..721b528c6
--- /dev/null
+++ b/include/smarty/lexer/smarty_internal_templatelexer.plex
@@ -0,0 +1,672 @@
+<?php
+/*
+ * This file is part of Smarty.
+ *
+ * (c) 2015 Uwe Tews
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * Smarty_Internal_Templatelexer
+ * This is the template file lexer.
+ * It is generated from the smarty_internal_templatelexer.plex file
+ *
+ *
+ * @author Uwe Tews <uwe.tews@googlemail.com>
+ */
+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;
+
+    /**
+     * php code type
+     *
+     * @var string
+     */
+    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
+     */
+    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;
+
+    /**
+    * XML flag true while processing xml
+    *
+    * @var bool
+    */
+    public $is_xml = false;
+
+    /**
+     * state names
+     *
+     * @var array
+     */
+    public $state_name = array(1 => 'TEXT', 2 => 'TAG', 3 => 'TAGBODY', 4 => 'LITERAL', 5 => 'DOUBLEQUOTEDSTRING',);
+
+    /**
+     * 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;
+
+    /**
+     * token names
+     *
+     * @var array
+     */
+   public $smarty_token_names = array(        // Text for parser error messages
+                                               '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
+     *
+     * @param   string                             $data template source
+     * @param Smarty_Internal_TemplateCompilerBase $compiler
+     */
+    function __construct($data, Smarty_Internal_TemplateCompilerBase $compiler)
+    {
+        $this->data = $data;
+        $this->counter = 0;
+        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_length = strlen($this->smarty->left_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;
+    }
+
+   public function PrintTrace()
+   {
+        $this->yyTraceFILE = fopen('php://output', 'w');
+        $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;
+   }
+
+     /*!lex2php
+     %input $this->data
+     %counter $this->counter
+     %token $this->token
+     %value $this->value
+     %line $this->line
+     linebreak = ~[\t ]*[\r\n]+[\t ]*~
+     text = ~[\S\s]~
+     textdoublequoted = ~([^"\\]*?)((?:\\.[^"\\]*?)*?)(?=(SMARTYldel|\$|`\$|"))~
+     namespace = ~([0-9]*[a-zA-Z_]\w*)?(\\[0-9]*[a-zA-Z_]\w*)+~
+     all = ~[\S\s]+~
+     emptyjava = ~[{][}]~
+     phptag = ~(SMARTYldel\s*php(.*?)SMARTYrdel)|(SMARTYldel\s*[/]phpSMARTYrdel)~
+     phpstart = ~(<[?]((php\s+|=)|\s+))|(<[%])|(<[?]xml\s+)|(<script\s+language\s*=\s*["']?\s*php\s*["']?\s*>)|([?][>])|([%][>])~
+     slash = ~[/]~
+     ldel = ~SMARTYldel\s*~
+     rdel = ~\s*SMARTYrdel~
+     nocacherdel = ~(\s+nocache)?\s*SMARTYrdel~
+     notblockid = ~(?:(?!block)[0-9]*[a-zA-Z_]\w*)~
+     smartyblockchildparent = ~[\$]smarty\.block\.(child|parent)~
+     integer = ~\d+~
+     hex =  ~0[xX][0-9a-fA-F]+~
+     math = ~\s*([*]{1,2}|[%/^&]|[<>]{2})\s*~
+     comment = ~SMARTYldel[*]~
+     incdec = ~([+]|[-]){2}~
+     unimath = ~\s*([+]|[-])\s*~
+     openP = ~\s*[(]\s*~
+     closeP = ~\s*[)]~
+     openB = ~\[\s*~
+     closeB = ~\s*\]~
+     dollar = ~[$]~
+     dot = ~[.]~
+     comma = ~\s*[,]\s*~
+     doublecolon = ~[:]{2}~
+     colon = ~\s*[:]\s*~
+     at = ~[@]~
+     hatch = ~[#]~
+     semicolon = ~\s*[;]\s*~
+     equal = ~\s*[=]\s*~
+     space = ~\s+~
+     ptr = ~\s*[-][>]\s*~
+     aptr = ~\s*[=][>]\s*~
+     singlequotestring = ~'[^'\\]*(?:\\.[^'\\]*)*'~
+     backtick = ~[`]~
+     vert = ~[|]~
+     qmark = ~\s*[?]\s*~
+     constant = ~([_]+[A-Z0-9][0-9A-Z_]*|[A-Z][0-9A-Z_]*)(?![0-9A-Z_]*[a-z])~
+     attr = ~\s+[0-9]*[a-zA-Z_][a-zA-Z0-9_\-:]*\s*[=]\s*~
+     id = ~[0-9]*[a-zA-Z_]\w*~
+     literal = ~literal~
+     strip = ~strip~
+     lop = ~\s*(([!=][=]{1,2})|([<][=>]?)|([>][=]?)|[&|]{2})\s*~
+     tlop = ~\s+(eq|ne|neq|gt|ge|gte|lt|le|lte|mod|and|or|xor|(is\s+(not\s+)?(odd|even|div)\s+by))\s+~
+     scond = ~\s+is\s+(not\s+)?(odd|even)~
+     isin = ~\s+is\s+in\s+~
+     as = ~\s+as\s+~
+     to = ~\s+to\s+~
+     step = ~\s+step\s+~
+     block = ~block~
+     if = ~(if|elseif|else if|while)\s+~
+     for = ~for\s+~
+     foreach = ~foreach(?![^\s])~
+     setfilter = ~setfilter\s+~
+     instanceof = ~\s+instanceof\s+~
+     not = ~([!]\s*)|(not\s+)~
+     typecast = ~[(](int(eger)?|bool(ean)?|float|double|real|string|binary|array|object)[)]\s*~
+     double_quote = ~["]~
+     single_quote = ~[']~
+     */
+     /*!lex2php
+     %statename TEXT
+     emptyjava {
+       $this->token = Smarty_Internal_Templateparser::TP_TEXT;
+     }
+     comment {
+        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->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;
+     }
+     phptag {
+       $obj = new Smarty_Internal_Compile_Private_Php();
+       $obj->parsePhp($this);
+     }
+     ldel literal rdel {
+       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_LITERALSTART;
+         $this->yypushstate(self::LITERAL);
+        }
+     }
+     ldel {
+       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;
+       }
+     }
+     rdel {
+       $this->token = Smarty_Internal_Templateparser::TP_TEXT;
+     }
+     phpstart {
+       $obj = new Smarty_Internal_Compile_Private_Php();
+       $obj->parsePhp($this);
+     }
+     text {
+       $to = strlen($this->data);
+       preg_match("~($this->ldel)|(<[?]((php\s+|=)|\s+))|(<[%])|(<[?]xml\s+)|(<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];
+       }
+       $this->value = substr($this->data,$this->counter,$to-$this->counter);
+       $this->token = Smarty_Internal_Templateparser::TP_TEXT;
+     }
+     */
+     /*!lex2php
+     %statename TAG
+     ldel if {
+          $this->token = Smarty_Internal_Templateparser::TP_LDELIF;
+          $this->yybegin(self::TAGBODY);
+          $this->taglineno = $this->line;
+     }
+     ldel for {
+          $this->token = Smarty_Internal_Templateparser::TP_LDELFOR;
+          $this->yybegin(self::TAGBODY);
+          $this->taglineno = $this->line;
+     }
+     ldel foreach {
+          $this->token = Smarty_Internal_Templateparser::TP_LDELFOREACH;
+          $this->yybegin(self::TAGBODY);
+          $this->taglineno = $this->line;
+     }
+     ldel setfilter {
+          $this->token = Smarty_Internal_Templateparser::TP_LDELSETFILTER;
+          $this->yybegin(self::TAGBODY);
+          $this->taglineno = $this->line;
+     }
+     ldel id nocacherdel {
+          $this->yypopstate();
+          $this->token = Smarty_Internal_Templateparser::TP_SIMPLETAG;
+          $this->taglineno = $this->line;
+     }
+     ldel slash notblockid rdel {
+         $this->yypopstate();
+         $this->token = Smarty_Internal_Templateparser::TP_CLOSETAG;
+         $this->taglineno = $this->line;
+     }
+     ldel dollar id nocacherdel {
+         if ($this->_yy_stack[count($this->_yy_stack)-1] == self::TEXT) {
+            $this->yypopstate();
+            $this->token = Smarty_Internal_Templateparser::TP_SIMPELOUTPUT;
+            $this->taglineno = $this->line;
+         } else {
+            $this->value = $this->smarty->left_delimiter;
+            $this->token = Smarty_Internal_Templateparser::TP_LDEL;
+            $this->yybegin(self::TAGBODY);
+            $this->taglineno = $this->line;
+         }
+     }
+     ldel slash {
+         $this->token = Smarty_Internal_Templateparser::TP_LDELSLASH;
+         $this->yybegin(self::TAGBODY);
+         $this->taglineno = $this->line;
+     }
+     ldel {
+          $this->token = Smarty_Internal_Templateparser::TP_LDEL;
+          $this->yybegin(self::TAGBODY);
+          $this->taglineno = $this->line;
+     }
+     */
+     /*!lex2php
+     %statename TAGBODY
+     rdel {
+       $this->token = Smarty_Internal_Templateparser::TP_RDEL;
+       $this->yypopstate();
+     }
+     ldel {
+        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;
+        }
+     }
+    double_quote {
+       $this->token = Smarty_Internal_Templateparser::TP_QUOTE;
+       $this->yypushstate(self::DOUBLEQUOTEDSTRING);
+     }
+     singlequotestring {
+       $this->token = Smarty_Internal_Templateparser::TP_SINGLEQUOTESTRING;
+     }
+     smartyblockchildparent {
+          $this->token = Smarty_Internal_Templateparser::TP_SMARTYBLOCKCHILDPARENT;
+          $this->taglineno = $this->line;
+     }
+     dollar id {
+       $this->token = Smarty_Internal_Templateparser::TP_DOLLARID;
+     }
+     dollar {
+       $this->token = Smarty_Internal_Templateparser::TP_DOLLAR;
+     }
+     isin {
+       $this->token = Smarty_Internal_Templateparser::TP_ISIN;
+     }
+     as {
+       $this->token = Smarty_Internal_Templateparser::TP_AS;
+     }
+     to {
+       $this->token = Smarty_Internal_Templateparser::TP_TO;
+     }
+     step {
+       $this->token = Smarty_Internal_Templateparser::TP_STEP;
+     }
+     instanceof {
+       $this->token = Smarty_Internal_Templateparser::TP_INSTANCEOF;
+     }
+     lop {
+       $this->token = Smarty_Internal_Templateparser::TP_LOGOP;
+     }
+     tlop {
+       $this->token = Smarty_Internal_Templateparser::TP_TLOGOP;
+     }
+     scond {
+       $this->token = Smarty_Internal_Templateparser::TP_SINGLECOND;
+     }
+     not{
+       $this->token = Smarty_Internal_Templateparser::TP_NOT;
+     }
+     typecast {
+       $this->token = Smarty_Internal_Templateparser::TP_TYPECAST;
+     }
+     openP {
+       $this->token = Smarty_Internal_Templateparser::TP_OPENP;
+     }
+     closeP {
+       $this->token = Smarty_Internal_Templateparser::TP_CLOSEP;
+     }
+     openB {
+       $this->token = Smarty_Internal_Templateparser::TP_OPENB;
+     }
+     closeB {
+       $this->token = Smarty_Internal_Templateparser::TP_CLOSEB;
+     }
+     ptr {
+       $this->token = Smarty_Internal_Templateparser::TP_PTR;
+     }
+     aptr {
+       $this->token = Smarty_Internal_Templateparser::TP_APTR;
+     }
+     equal {
+       $this->token = Smarty_Internal_Templateparser::TP_EQUAL;
+     }
+     incdec {
+       $this->token = Smarty_Internal_Templateparser::TP_INCDEC;
+     }
+     unimath {
+       $this->token = Smarty_Internal_Templateparser::TP_UNIMATH;
+     }
+     math {
+       $this->token = Smarty_Internal_Templateparser::TP_MATH;
+     }
+     at {
+       $this->token = Smarty_Internal_Templateparser::TP_AT;
+     }
+     hatch {
+       $this->token = Smarty_Internal_Templateparser::TP_HATCH;
+     }
+     attr {
+       // 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);
+          $this->value = $match[0];
+          $this->token = Smarty_Internal_Templateparser::TP_SPACE;
+       } else {
+          $this->token = Smarty_Internal_Templateparser::TP_ATTR;
+       }
+     }
+     namespace {
+        $this->token = Smarty_Internal_Templateparser::TP_NAMESPACE;
+     }
+     id {
+        $this->token = Smarty_Internal_Templateparser::TP_ID;
+     }
+     integer {
+       $this->token = Smarty_Internal_Templateparser::TP_INTEGER;
+     }
+     backtick {
+       $this->token = Smarty_Internal_Templateparser::TP_BACKTICK;
+       $this->yypopstate();
+     }
+     vert {
+       $this->token = Smarty_Internal_Templateparser::TP_VERT;
+     }
+     dot {
+       $this->token = Smarty_Internal_Templateparser::TP_DOT;
+     }
+     comma {
+       $this->token = Smarty_Internal_Templateparser::TP_COMMA;
+     }
+     semicolon {
+       $this->token = Smarty_Internal_Templateparser::TP_SEMICOLON;
+     }
+     doublecolon {
+       $this->token = Smarty_Internal_Templateparser::TP_DOUBLECOLON;
+     }
+     colon {
+       $this->token = Smarty_Internal_Templateparser::TP_COLON;
+     }
+     qmark {
+       $this->token = Smarty_Internal_Templateparser::TP_QMARK;
+     }
+     hex {
+       $this->token = Smarty_Internal_Templateparser::TP_HEX;
+     }
+     space {
+       $this->token = Smarty_Internal_Templateparser::TP_SPACE;
+     }
+     text {
+       $this->token = Smarty_Internal_Templateparser::TP_TEXT;
+     }
+     */
+
+     /*!lex2php
+     %statename LITERAL
+     ldel literal rdel {
+       $this->literal_cnt++;
+       $this->token = Smarty_Internal_Templateparser::TP_LITERAL;
+     }
+     ldel slash literal rdel {
+       if ($this->literal_cnt) {
+         $this->literal_cnt--;
+         $this->token = Smarty_Internal_Templateparser::TP_LITERAL;
+       } else {
+         $this->token = Smarty_Internal_Templateparser::TP_LITERALEND;
+         $this->yypopstate();
+       }
+     }
+     text {
+       $to = strlen($this->data);
+       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 {
+         $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_Templateparser::TP_LITERAL;
+     }
+     */
+     /*!lex2php
+     %statename DOUBLEQUOTEDSTRING
+     ldel literal rdel {
+         $this->token = Smarty_Internal_Templateparser::TP_TEXT;
+     }
+     ldel slash literal rdel {
+         $this->token = Smarty_Internal_Templateparser::TP_TEXT;
+     }
+     ldel slash {
+       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;
+       }
+     }
+     ldel id {
+       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;
+       }
+     }
+     ldel {
+       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->taglineno = $this->line;
+          $this->yypushstate(self::TAGBODY);
+       }
+     }
+     double_quote {
+       $this->token = Smarty_Internal_Templateparser::TP_QUOTE;
+       $this->yypopstate();
+     }
+     backtick dollar {
+       $this->token = Smarty_Internal_Templateparser::TP_BACKTICK;
+       $this->value = substr($this->value,0,-1);
+       $this->yypushstate(self::TAGBODY);
+       $this->taglineno = $this->line;
+     }
+     dollar id {
+       $this->token = Smarty_Internal_Templateparser::TP_DOLLARID;
+     }
+     dollar {
+       $this->token = Smarty_Internal_Templateparser::TP_TEXT;
+     }
+     textdoublequoted {
+       $this->token = Smarty_Internal_Templateparser::TP_TEXT;
+     }
+     text {
+       $to = strlen($this->data);
+       $this->value = substr($this->data,$this->counter,$to-$this->counter);
+       $this->token = Smarty_Internal_Templateparser::TP_TEXT;
+     }
+     */
+  }
+
+     
\ No newline at end of file
diff --git a/include/smarty/lexer/smarty_internal_templateparser.y b/include/smarty/lexer/smarty_internal_templateparser.y
new file mode 100644
index 000000000..47d81c014
--- /dev/null
+++ b/include/smarty/lexer/smarty_internal_templateparser.y
@@ -0,0 +1,1360 @@
+/*
+ * This file is part of Smarty.
+ *
+ * (c) 2015 Uwe Tews
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+%stack_size 500
+%name TP_
+%declare_class {
+/**
+* Smarty Template Parser Class
+*
+* This is the template parser.
+* It is generated from the smarty_internal_templateparser.y file
+* 
+* @author Uwe Tews <uwe.tews@googlemail.com>
+*/
+class Smarty_Internal_Templateparser
+}
+%include_class
+{
+    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";
+
+    /**
+     * result status
+     *
+     * @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
+     */
+    public $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;
+
+    /**
+     * security object
+     *
+     * @var Smarty_Security
+     */
+    public $security = null;
+
+    /**
+     * template prefix array
+     *
+     * @var \Smarty_Internal_ParseTree[]
+     */
+    public $template_prefix = array();
+
+    /**
+     * security object
+     *
+     * @var \Smarty_Internal_ParseTree[]
+     */
+    public $template_postfix = array();
+
+    /**
+     * constructor
+     *
+     * @param Smarty_Internal_Templatelexer        $lex
+     * @param Smarty_Internal_TemplateCompilerBase $compiler
+     */
+    function __construct(Smarty_Internal_Templatelexer $lex, Smarty_Internal_TemplateCompilerBase $compiler)
+    {
+        $this->lex = $lex;
+        $this->compiler = $compiler;
+        $this->template = $this->compiler->template;
+        $this->smarty = $this->template->smarty;
+        $this->security = isset($this->smarty->security_policy) ? $this->smarty->security_policy : false;
+        $this->current_buffer = $this->root_buffer = new Smarty_Internal_ParseTree_Template();
+    }
+
+    /**
+     * insert PHP code in current buffer
+     *
+     * @param string $code
+     */
+    public function insertPhpCode($code)
+    {
+        $this->current_buffer->append_subtree($this, new Smarty_Internal_ParseTree_Tag($this, $code));
+    }
+
+   /**
+     *  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 .= $preCode;
+        }
+        $this->compiler->prefix_code=array();
+        $tmp .= $code;
+        return new Smarty_Internal_ParseTree_Tag($this, $this->compiler->processNocacheCode($tmp,true));
+    }
+
+}
+
+%token_prefix TP_
+
+%parse_accept
+{
+    $this->successful = !$this->internalError;
+    $this->internalError = false;
+    $this->retvalue = $this->_retvalue;
+}
+
+%syntax_error
+{
+    $this->internalError = true;
+    $this->yymajor = $yymajor;
+    $this->compiler->trigger_template_error();
+}
+
+%stack_overflow
+{
+    $this->internalError = true;
+    $this->compiler->trigger_template_error("Stack overflow in template parser");
+}
+
+%left VERT.
+%left COLON.
+
+    //
+    // complete template
+    //
+start(res)       ::= template. {
+    $this->root_buffer->prepend_array($this, $this->template_prefix);
+    $this->root_buffer->append_array($this, $this->template_postfix);
+    res = $this->root_buffer->to_smarty_php($this);
+}
+
+    //
+    // loop over template elements
+    //
+                      // single template element
+template       ::= template_element(e). {
+    if (e != null) {
+        $this->current_buffer->append_subtree($this, e);
+    }
+}
+
+                      // loop of elements
+template       ::= template template_element(e). {
+    if (e != null) {
+        // because of possible code injection
+        $this->current_buffer->append_subtree($this, e);
+    }
+}
+
+                      // empty template
+template       ::= . 
+
+//
+// template elements
+//
+                      // Smarty tag
+template_element(res)::= smartytag(st). {
+     if ($this->compiler->has_code) {
+         res = $this->mergePrefixCode(st);
+     } else {
+         res = null;
+     }
+    $this->compiler->has_variable_string = false;
+    $this->block_nesting_level = count($this->compiler->_tag_stack);
+} 
+
+                      // Literal
+template_element(res) ::= literal(l). {
+    res = new Smarty_Internal_ParseTree_Text(l);
+}
+                      // php tags
+template_element(res)::= PHP(o). {
+    $code = $this->compiler->compileTag('private_php',array(array('code' => o), array('type' => $this->lex->phpType )),array());
+    if ($this->compiler->has_code && !empty($code)) {
+        $tmp =''; foreach ($this->compiler->prefix_code as $code) {$tmp.=$code;} $this->compiler->prefix_code=array();
+        res = new Smarty_Internal_ParseTree_Tag($this, $this->compiler->processNocacheCode($tmp.$code,true));
+    } else {
+        res = null;
+    }
+}
+
+                      // nocache code
+template_element(res)::= NOCACHE(c). {
+        $this->compiler->tag_nocache = true;
+        $save = $this->template->compiled->has_nocache_code;
+        res = new Smarty_Internal_ParseTree_Tag($this, $this->compiler->processNocacheCode("<?php echo '{c}';?>\n", $this->compiler, true));
+        $this->template->compiled->has_nocache_code = $save;
+}
+                      // template text
+template_element(res)::= text_content(t). {
+        res = $this->compiler->processText(t);
+}
+
+text_content(res) ::= TEXT(o). {
+    res = o;
+}
+
+text_content(res) ::= text_content(t) TEXT(o). {
+    res = t . o;
+}
+
+                      // strip on
+template_element ::= STRIPON(d). {
+    $this->strip = true;
+}
+                      // strip off
+template_element ::= STRIPOFF(d). {
+    $this->strip = false;
+}
+
+                    // Litteral
+literal(res) ::= LITERALSTART LITERALEND. {
+    res = '';
+}
+
+literal(res) ::= LITERALSTART literal_elements(l) LITERALEND. {
+    res = l;
+}
+ 
+literal_elements(res) ::= literal_elements(l1) literal_element(l2). {
+    res = l1.l2;
+}
+
+literal_elements(res) ::= . {
+    res = '';
+}
+
+literal_element(res) ::= literal(l). {
+    res = l;
+}
+
+literal_element(res) ::= LITERAL(l). {
+    res = l;
+}
+
+smartytag(res)   ::= tag(t) RDEL. {
+    res  = t;
+}
+//
+// output tags start here
+//
+smartytag(res)   ::= SIMPELOUTPUT(i). {
+    $var = trim(substr(i, $this->lex->ldel_length, -$this->lex->rdel_length), ' $');
+    if (preg_match('/^(.*)(\s+nocache)$/', $var, $match)) {
+        res = $this->compiler->compileTag('private_print_expression',array('nocache'),array('value'=>$this->compiler->compileVariable('\''.$match[1].'\'')));
+    } else {
+        res = $this->compiler->compileTag('private_print_expression',array(),array('value'=>$this->compiler->compileVariable('\''.$var.'\'')));
+    }
+}
+
+                  // output with optional attributes
+tag(res)   ::= LDEL variable(e). {
+    res = $this->compiler->compileTag('private_print_expression',array(),array('value'=>e));
+}
+
+tag(res)   ::= LDEL variable(e) modifierlist(l) attributes(a). {
+    res = $this->compiler->compileTag('private_print_expression',a,array('value'=>e, 'modifierlist'=>l));
+}
+
+tag(res)   ::= LDEL variable(e) attributes(a). {
+    res = $this->compiler->compileTag('private_print_expression',a,array('value'=>e));
+}
+tag(res)   ::= LDEL value(e). {
+    res = $this->compiler->compileTag('private_print_expression',array(),array('value'=>e));
+}
+tag(res)   ::= LDEL value(e) modifierlist(l) attributes(a). {
+    res = $this->compiler->compileTag('private_print_expression',a,array('value'=>e, 'modifierlist'=>l));
+}
+
+tag(res)   ::= LDEL value(e) attributes(a). {
+    res = $this->compiler->compileTag('private_print_expression',a,array('value'=>e));
+}
+
+tag(res)   ::= LDEL expr(e) modifierlist(l) attributes(a). {
+    res = $this->compiler->compileTag('private_print_expression',a,array('value'=>e,'modifierlist'=>l));
+}
+
+tag(res)   ::= LDEL expr(e) attributes(a). {
+    res = $this->compiler->compileTag('private_print_expression',a,array('value'=>e));
+}
+
+//
+// Smarty tags start here
+//
+
+                  // assign new style
+tag(res)   ::= LDEL DOLLARID(i) EQUAL value(e). {
+    res = $this->compiler->compileTag('assign',array(array('value'=>e),array('var'=>'\''.substr(i,1).'\'')));
+}
+                  
+tag(res)   ::= LDEL DOLLARID(i) EQUAL expr(e). {
+    res = $this->compiler->compileTag('assign',array(array('value'=>e),array('var'=>'\''.substr(i,1).'\'')));
+}
+                 
+tag(res)   ::= LDEL DOLLARID(i) EQUAL expr(e) attributes(a). {
+    res = $this->compiler->compileTag('assign',array_merge(array(array('value'=>e),array('var'=>'\''.substr(i,1).'\'')),a));
+}                  
+
+tag(res)   ::= LDEL varindexed(vi) EQUAL expr(e) attributes(a). {
+    res = $this->compiler->compileTag('assign',array_merge(array(array('value'=>e),array('var'=>vi['var'])),a),array('smarty_internal_index'=>vi['smarty_internal_index']));
+}
+
+// simple tag like {name}
+smartytag(res)::= SIMPLETAG(t). {
+    $tag = trim(substr(t, $this->lex->ldel_length, -$this->lex->rdel_length));
+    if ($tag == 'strip') {
+        $this->strip = true;
+        res = null;;
+    } else {
+        if (defined($tag)) {
+            if ($this->security) {
+               $this->security->isTrustedConstant($tag, $this->compiler);
+            }
+            res = $this->compiler->compileTag('private_print_expression',array(),array('value'=>$tag));
+        } else {
+            if (preg_match('/^(.*)(\s+nocache)$/', $tag, $match)) {
+                res = $this->compiler->compileTag($match[1],array("'nocache'"));
+            } else {
+                res = $this->compiler->compileTag($tag,array());
+            }
+        }
+    }
+}
+
+                  // tag with optional Smarty2 style attributes
+tag(res)   ::= LDEL ID(i) attributes(a). {
+        if (defined(i)) {
+            if ($this->security) {
+                $this->security->isTrustedConstant(i, $this->compiler);
+            }
+            res = $this->compiler->compileTag('private_print_expression',a,array('value'=>i));
+        } else {
+            res = $this->compiler->compileTag(i,a);
+        }
+}
+tag(res)   ::= LDEL ID(i). {
+        if (defined(i)) {
+            if ($this->security) {
+                $this->security->isTrustedConstant(i, $this->compiler);
+            }
+            res = $this->compiler->compileTag('private_print_expression',array(),array('value'=>i));
+        } else {
+            res = $this->compiler->compileTag(i,array());
+        }
+}
+
+
+                  // tag with modifier and optional Smarty2 style attributes
+tag(res)   ::= LDEL ID(i) modifierlist(l)attributes(a). {
+        if (defined(i)) {
+            if ($this->security) {
+                $this->security->isTrustedConstant(i, $this->compiler);
+            }
+            res = $this->compiler->compileTag('private_print_expression',a,array('value'=>i, 'modifierlist'=>l));
+        } else {
+            res = '<?php ob_start();?>'.$this->compiler->compileTag(i,a).'<?php echo ';
+            res .= $this->compiler->compileTag('private_modifier',array(),array('modifierlist'=>l,'value'=>'ob_get_clean()')).';?>';
+        }
+}
+
+                  // registered object tag
+tag(res)   ::= LDEL ID(i) PTR ID(m) attributes(a). {
+    res = $this->compiler->compileTag(i,a,array('object_method'=>m));
+}
+
+                  // registered object tag with modifiers
+tag(res)   ::= LDEL ID(i) PTR ID(me) modifierlist(l) attributes(a). {
+    res = '<?php ob_start();?>'.$this->compiler->compileTag(i,a,array('object_method'=>me)).'<?php echo ';
+    res .= $this->compiler->compileTag('private_modifier',array(),array('modifierlist'=>l,'value'=>'ob_get_clean()')).';?>';
+}
+
+                  // {if}, {elseif} and {while} tag
+tag(res)   ::= LDELIF(i) expr(ie). {
+    $tag = trim(substr(i,$this->lex->ldel_length)); 
+    res = $this->compiler->compileTag(($tag == 'else if')? 'elseif' : $tag,array(),array('if condition'=>ie));
+}
+
+tag(res)   ::= LDELIF(i) expr(ie) attributes(a). {
+    $tag = trim(substr(i,$this->lex->ldel_length));
+    res = $this->compiler->compileTag(($tag == 'else if')? 'elseif' : $tag,a,array('if condition'=>ie));
+}
+
+tag(res)   ::= LDELIF(i) statement(ie). {
+    $tag = trim(substr(i,$this->lex->ldel_length));
+    res = $this->compiler->compileTag(($tag == 'else if')? 'elseif' : $tag,array(),array('if condition'=>ie));
+}
+
+tag(res)   ::= LDELIF(i) statement(ie)  attributes(a). {
+    $tag = trim(substr(i,$this->lex->ldel_length));
+    res = $this->compiler->compileTag(($tag == 'else if')? 'elseif' : $tag,a,array('if condition'=>ie));
+}
+
+                  // {for} tag
+tag(res)   ::= LDELFOR statements(st) SEMICOLON expr(ie) SEMICOLON varindexed(v2) foraction(e2) attributes(a). {
+    res = $this->compiler->compileTag('for',array_merge(a,array(array('start'=>st),array('ifexp'=>ie),array('var'=>v2),array('step'=>e2))),1);
+}
+
+  foraction(res)   ::= EQUAL expr(e). {
+    res = '='.e;
+}
+
+  foraction(res)   ::= INCDEC(e). {
+    res = e;
+}
+
+tag(res)   ::= LDELFOR statement(st) TO expr(v) attributes(a). {
+    res = $this->compiler->compileTag('for',array_merge(a,array(array('start'=>st),array('to'=>v))),0);
+}
+
+tag(res)   ::= LDELFOR statement(st) TO expr(v) STEP expr(v2) attributes(a). {
+    res = $this->compiler->compileTag('for',array_merge(a,array(array('start'=>st),array('to'=>v),array('step'=>v2))),0);
+}
+
+                  // {foreach} tag
+tag(res)   ::= LDELFOREACH attributes(a). {
+    res = $this->compiler->compileTag('foreach',a);
+}
+
+                  // {foreach $array as $var} tag
+tag(res)   ::= LDELFOREACH SPACE value(v1) AS varvar(v0) attributes(a). {
+    res = $this->compiler->compileTag('foreach',array_merge(a,array(array('from'=>v1),array('item'=>v0))));
+}
+
+tag(res)   ::= LDELFOREACH SPACE value(v1) AS varvar(v2) APTR varvar(v0) attributes(a). {
+    res = $this->compiler->compileTag('foreach',array_merge(a,array(array('from'=>v1),array('item'=>v0),array('key'=>v2))));
+}
+
+tag(res)   ::= LDELFOREACH SPACE expr(e) AS varvar(v0) attributes(a). {
+    res = $this->compiler->compileTag('foreach',array_merge(a,array(array('from'=>e),array('item'=>v0))));
+}
+
+tag(res)   ::= LDELFOREACH SPACE expr(e) AS varvar(v1) APTR varvar(v0) attributes(a). {
+    res = $this->compiler->compileTag('foreach',array_merge(a,array(array('from'=>e),array('item'=>v0),array('key'=>v1))));
+}
+
+                  // {setfilter}
+tag(res)   ::= LDELSETFILTER ID(m) modparameters(p). {
+    res = $this->compiler->compileTag('setfilter',array(),array('modifier_list'=>array(array_merge(array(m),p))));
+}
+
+tag(res)   ::= LDELSETFILTER ID(m) modparameters(p) modifierlist(l). {
+    res = $this->compiler->compileTag('setfilter',array(),array('modifier_list'=>array_merge(array(array_merge(array(m),p)),l)));
+}
+
+                  // {$smarty.block.child} or {$smarty.block.parent}
+tag(res)   ::= LDEL SMARTYBLOCKCHILDPARENT(i). {
+    $j = strrpos(i,'.');
+    if (i[$j+1] == 'c') {
+        // {$smarty.block.child}
+        res = SMARTY_INTERNAL_COMPILE_BLOCK::compileChildBlock($this->compiler);
+    } else {
+        // {$smarty.block.parent}
+        res = SMARTY_INTERNAL_COMPILE_BLOCK::compileParentBlock($this->compiler);
+    }
+}
+
+                  
+                  // end of block tag  {/....}                  
+smartytag(res)::= CLOSETAG(t). {
+    $tag = trim(substr(t, $this->lex->ldel_length, -$this->lex->rdel_length), ' /');
+    if ($tag == 'strip') {
+        $this->strip = false;
+        res = null;
+    } else {
+       res = $this->compiler->compileTag($tag.'close',array());
+    }
+ }
+tag(res)   ::= LDELSLASH ID(i). {
+    res = $this->compiler->compileTag(i.'close',array());
+}
+
+tag(res)   ::= LDELSLASH ID(i) modifierlist(l). {
+    res = $this->compiler->compileTag(i.'close',array(),array('modifier_list'=>l));
+}
+
+                  // end of block object tag  {/....}                 
+tag(res)   ::= LDELSLASH ID(i) PTR ID(m). {
+    res = $this->compiler->compileTag(i.'close',array(),array('object_method'=>m));
+}
+
+tag(res)   ::= LDELSLASH ID(i) PTR ID(m) modifierlist(l). {
+    res = $this->compiler->compileTag(i.'close',array(),array('object_method'=>m, 'modifier_list'=>l));
+}
+
+//
+//Attributes of Smarty tags 
+//
+                  // list of attributes
+attributes(res)  ::= attributes(a1) attribute(a2). {
+    res = a1;
+    res[] = a2;
+}
+
+                  // single attribute
+attributes(res)  ::= attribute(a). {
+    res = array(a);
+}
+
+                  // no attributes
+attributes(res)  ::= . {
+    res = array();
+}
+                  
+                  // attribute
+attribute(res)   ::= SPACE ID(v) EQUAL ID(id). {
+    if (defined(id)) {
+        if ($this->security) {
+            $this->security->isTrustedConstant(id, $this->compiler);
+        }
+        res = array(v=>id);
+    } else {
+        res = array(v=>'\''.id.'\'');
+    }
+}
+
+attribute(res)   ::= ATTR(v) expr(e). {
+    res = array(trim(v," =\n\r\t")=>e);
+}
+
+attribute(res)   ::= ATTR(v) value(e). {
+    res = array(trim(v," =\n\r\t")=>e);
+}
+
+attribute(res)   ::= SPACE ID(v). {
+    res = '\''.v.'\'';
+}
+
+attribute(res)   ::= SPACE expr(e). {
+    res = e;
+}
+
+attribute(res)   ::= SPACE value(v). {
+    res = v;
+}
+
+attribute(res)   ::= SPACE INTEGER(i) EQUAL expr(e). {
+    res = array(i=>e);
+}
+
+                  
+
+//
+// statement
+//
+statements(res)   ::= statement(s). {
+    res = array(s);
+}
+
+statements(res)   ::= statements(s1) COMMA statement(s). {
+    s1[]=s;
+    res = s1;
+}
+
+statement(res)    ::= DOLLARID(i) EQUAL INTEGER(e). {
+    res = array('var' => '\''.substr(i,1).'\'', 'value'=>e);
+}
+statement(res)    ::= DOLLARID(i) EQUAL expr(e). {
+    res = array('var' => '\''.substr(i,1).'\'', 'value'=>e);
+}
+
+statement(res)    ::= varindexed(vi) EQUAL expr(e). {
+    res = array('var' => vi, 'value'=>e);
+}
+
+statement(res)    ::= OPENP statement(st) CLOSEP. {
+    res = st;
+}
+
+
+//
+// expressions
+//
+
+                  // single value
+expr(res)        ::= value(v). {
+    res = v;
+}
+
+                 // ternary
+expr(res)        ::= ternary(v). {
+    res = v;
+}
+
+                 // resources/streams
+expr(res)        ::= DOLLARID(i) COLON ID(i2). {
+    res = '$_smarty_tpl->getStreamVariable(\''.substr(i,1).'://' . i2 . '\')';
+}
+
+                  // arithmetic expression
+expr(res)        ::= expr(e) MATH(m) value(v). {
+    res = e . trim(m) . v;
+}
+
+expr(res)        ::= expr(e) UNIMATH(m) value(v). {
+    res = e . trim(m) . v;
+}
+ 
+                  // array
+expr(res)       ::= array(a). {
+    res = a;
+}
+
+                  // modifier
+expr(res)        ::= expr(e) modifierlist(l). {
+    res = $this->compiler->compileTag('private_modifier',array(),array('value'=>e,'modifierlist'=>l));
+}
+
+// if expression
+                    // simple expression
+expr(res)        ::= expr(e1) lop(c) expr(e2). {
+    res = (isset(c['pre']) ? c['pre'] : '') . e1.c['op'].e2 . (isset(c['pre']) ? ')' : '');
+}
+expr(res)        ::= expr(e1) scond(c). {
+    res = c . e1 . ')';
+}
+
+expr(res)        ::= expr(e1) ISIN array(a).  {
+    res = 'in_array('.e1.','.a.')';
+}
+
+expr(res)        ::= expr(e1) ISIN value(v).  {
+    res = 'in_array('.e1.',(array)'.v.')';
+}
+
+expr(res)        ::= variable(v1) INSTANCEOF(i) ns1(v2). {
+      res = v1.i.v2;
+}
+
+expr(res)        ::= variable(v1) INSTANCEOF(i) variable(v2). {
+      res = v1.i.v2;
+}
+
+
+//
+// ternary
+//
+ternary(res)        ::= OPENP expr(v) CLOSEP  QMARK DOLLARID(e1) COLON  expr(e2). {
+    res = v.' ? '. $this->compiler->compileVariable('\''.substr(e1,1).'\'') . ' : '.e2;
+}
+
+ternary(res)        ::= OPENP expr(v) CLOSEP  QMARK  expr(e1) COLON  expr(e2). {
+    res = v.' ? '.e1.' : '.e2;
+}
+
+                 // value
+value(res)       ::= variable(v). {
+    res = v;
+}
+
+                  // +/- value
+value(res)        ::= UNIMATH(m) value(v). {
+    res = m.v;
+}
+
+                  // logical negation
+value(res)       ::= NOT value(v). {
+    res = '!'.v;
+}
+
+value(res)       ::= TYPECAST(t) value(v). {
+    res = t.v;
+}
+
+value(res)       ::= variable(v) INCDEC(o). {
+    res = v.o;
+}
+
+                 // numeric
+value(res)       ::= HEX(n). {
+    res = n;
+}
+
+value(res)       ::= INTEGER(n). {
+    res = n;
+}
+
+value(res)       ::= INTEGER(n1) DOT INTEGER(n2). {
+    res = n1.'.'.n2;
+}
+
+value(res)       ::= INTEGER(n1) DOT. {
+    res = n1.'.';
+}
+
+value(res)       ::= DOT INTEGER(n1). {
+    res = '.'.n1;
+}
+
+                 // ID, true, false, null
+value(res)       ::= ID(id). {
+    if (defined(id)) {
+        if ($this->security) {
+             $this->security->isTrustedConstant(id, $this->compiler);
+        }
+        res = id;
+    } else {
+        res = '\''.id.'\'';
+    }
+}
+
+                  // function call
+value(res)       ::= function(f). {
+    res = f;
+}
+
+                  // expression
+value(res)       ::= OPENP expr(e) CLOSEP. {
+    res = "(". e .")";
+}
+
+                  // singele quoted string
+value(res)       ::= SINGLEQUOTESTRING(t). {
+    res = t;
+}
+
+                  // double quoted string
+value(res)       ::= doublequoted_with_quotes(s). {
+    res = s;
+}
+
+
+value(res)    ::= varindexed(vi) DOUBLECOLON static_class_access(r). {
+    self::$prefix_number++;
+    if (vi['var'] == '\'smarty\'') {
+        $this->compiler->prefix_code[] = '<?php $_tmp'.self::$prefix_number.' = '. $this->compiler->compileTag('private_special_variable',array(),vi['smarty_internal_index']).';?>';
+     } else {
+        $this->compiler->prefix_code[] = '<?php $_tmp'.self::$prefix_number.' = '. $this->compiler->compileVariable(vi['var']).vi['smarty_internal_index'].';?>';
+    }
+    res = '$_tmp'.self::$prefix_number.'::'.r[0].r[1];
+}
+
+                  // Smarty tag
+value(res)       ::= smartytag(st). {
+   self::$prefix_number++;
+    $tmp = $this->compiler->appendCode('<?php ob_start();?>', st);
+    $this->compiler->prefix_code[] = $this->compiler->appendCode($tmp, '<?php $_tmp'.self::$prefix_number.'=ob_get_clean();?>');
+    res = '$_tmp'.self::$prefix_number;
+}
+
+value(res)       ::= value(v) modifierlist(l). {
+    res = $this->compiler->compileTag('private_modifier',array(),array('value'=>v,'modifierlist'=>l));
+}
+                  // name space constant
+value(res)       ::= NAMESPACE(c). {
+    res = c;
+}
+
+
+                  // static class access
+value(res)       ::= ns1(c)DOUBLECOLON static_class_access(s). {
+    if (!in_array(strtolower(c), array('self', 'parent')) && (!$this->security || $this->security->isTrustedStaticClassAccess(c, s, $this->compiler))) {
+        if (isset($this->smarty->registered_classes[c])) {
+            res = $this->smarty->registered_classes[c].'::'.s[0].s[1];
+        } else {
+            res = c.'::'.s[0].s[1];
+        } 
+    } else {
+        $this->compiler->trigger_template_error ("static class '".c."' is undefined or not allowed by security setting");
+    }
+}
+//
+// namespace stuff
+//
+
+ns1(res)           ::= ID(i). {
+    res = i;
+}
+
+ns1(res)           ::= NAMESPACE(i). {
+    res = i;
+    }
+
+
+
+
+//
+// variables 
+//
+                  // Smarty variable (optional array)
+variable(res)    ::= DOLLARID(i). {
+   res = $this->compiler->compileVariable('\''.substr(i,1).'\'');
+}
+variable(res)    ::= varindexed(vi). {
+    if (vi['var'] == '\'smarty\'') {
+        $smarty_var = $this->compiler->compileTag('private_special_variable',array(),vi['smarty_internal_index']);
+        res = $smarty_var;
+    } else {
+        // used for array reset,next,prev,end,current 
+        $this->last_variable = vi['var'];
+        $this->last_index = vi['smarty_internal_index'];
+        res = $this->compiler->compileVariable(vi['var']).vi['smarty_internal_index'];
+    }
+}
+
+                  // variable with property
+variable(res)    ::= varvar(v) AT ID(p). {
+    res = '$_smarty_tpl->tpl_vars['. v .']->'.p;
+}
+
+                  // object
+variable(res)    ::= object(o). {
+    res = o;
+}
+
+                  // config variable
+variable(res)    ::= HATCH ID(i) HATCH. {
+    res = $this->compiler->compileConfigVariable("'" . i . "'");
+}
+
+variable(res)    ::= HATCH ID(i) HATCH arrayindex(a). {
+    res = '(is_array($tmp = ' . $this->compiler->compileConfigVariable("'" . i . "'") . ') ? $tmp'.a.' :null)';
+}
+
+variable(res)    ::= HATCH variable(v) HATCH. {
+    res = $this->compiler->compileConfigVariable(v);
+}
+
+variable(res)    ::= HATCH variable(v) HATCH arrayindex(a). {
+    res = '(is_array($tmp = ' . $this->compiler->compileConfigVariable(v) . ') ? $tmp'.a.' : null)';
+}
+
+varindexed(res)  ::= DOLLARID(i) arrayindex(a). {
+    res = array('var'=>'\''.substr(i,1).'\'', 'smarty_internal_index'=>a);
+}
+varindexed(res)  ::= varvar(v) arrayindex(a). {
+    res = array('var'=>v, 'smarty_internal_index'=>a);
+}
+
+//
+// array index
+//
+                    // multiple array index
+arrayindex(res)  ::= arrayindex(a1) indexdef(a2). {
+    res = a1.a2;
+}
+
+                    // no array index
+arrayindex        ::= . {
+    return;
+}
+
+// single index definition
+                    // Smarty2 style index 
+indexdef(res)    ::= DOT DOLLARID(i).  {
+    res = '['.$this->compiler->compileVariable('\''.substr(i,1).'\'').']';
+}
+indexdef(res)    ::= DOT varvar(v).  {
+    res = '['.$this->compiler->compileVariable(v).']';
+}
+
+indexdef(res)    ::= DOT varvar(v) AT ID(p). {
+    res = '['.$this->compiler->compileVariable(v).'->'.p.']';
+}
+
+indexdef(res)   ::= DOT ID(i). {
+    if (defined(i)) {
+            if ($this->security) {
+                $this->security->isTrustedConstant(i, $this->compiler);
+            }
+            res = '['. i .']';
+        } else {
+            res = "['". i ."']";
+        }
+}
+
+indexdef(res)   ::= DOT INTEGER(n). {
+    res = '['. n .']';
+}
+
+
+indexdef(res)   ::= DOT LDEL expr(e) RDEL. {
+    res = '['. e .']';
+}
+
+                    // section tag index
+indexdef(res)   ::= OPENB ID(i)CLOSEB. {
+    res = '['.$this->compiler->compileTag('private_special_variable',array(),'[\'section\'][\''.i.'\'][\'index\']').']';
+}
+
+indexdef(res)   ::= OPENB ID(i) DOT ID(i2) CLOSEB. {
+    res = '['.$this->compiler->compileTag('private_special_variable',array(),'[\'section\'][\''.i.'\'][\''.i2.'\']').']';
+}
+indexdef(res)   ::= OPENB SINGLEQUOTESTRING(s) CLOSEB. {
+    res = '['.s.']';
+}
+indexdef(res)   ::= OPENB INTEGER(n) CLOSEB. {
+    res = '['.n.']';
+}
+indexdef(res)   ::= OPENB DOLLARID(i) CLOSEB. {
+    res = '['.$this->compiler->compileVariable('\''.substr(i,1).'\'').']';;
+}
+indexdef(res)   ::= OPENB variable(v) CLOSEB. {
+    res = '['.v.']';
+}
+indexdef(res)   ::= OPENB value(v) CLOSEB. {
+    res = '['.v.']';
+}
+
+                    // PHP style index
+indexdef(res)   ::= OPENB expr(e) CLOSEB. {
+    res = '['. e .']';
+}
+
+                    // for assign append array
+indexdef(res)  ::= OPENB CLOSEB. {
+    res = '[]';
+}
+
+
+//
+// variable variable names
+//
+
+                    // singel identifier element
+varvar(res)      ::= DOLLARID(i). {
+    res = '\''.substr(i,1).'\'';
+}
+                    // single $
+varvar(res)      ::= DOLLAR. {
+    res = "''";
+}
+
+                    // sequence of identifier elements
+varvar(res)      ::= varvar(v1) varvarele(v2). {
+    res = v1.'.'.v2;
+}
+
+                    // fix sections of element
+varvarele(res)   ::= ID(s). {
+    res = '\''.s.'\'';
+}
+varvarele(res)   ::= SIMPELOUTPUT(i). {
+    $var = trim(substr(i, $this->lex->ldel_length, -$this->lex->rdel_length), ' $');
+    res = $this->compiler->compileVariable('\''.$var.'\'');
+}
+
+                    // variable sections of element
+varvarele(res)   ::= LDEL expr(e) RDEL. {
+    res = '('.e.')';
+}
+
+//
+// objects
+//
+object(res)    ::= varindexed(vi) objectchain(oc). {
+    if (vi['var'] == '\'smarty\'') {
+        res =  $this->compiler->compileTag('private_special_variable',array(),vi['smarty_internal_index']).oc;
+    } else {
+        res = $this->compiler->compileVariable(vi['var']).vi['smarty_internal_index'].oc;
+    }
+}
+
+                    // single element
+objectchain(res) ::= objectelement(oe). {
+    res  = oe;
+}
+
+                    // chain of elements 
+objectchain(res) ::= objectchain(oc) objectelement(oe). {
+    res  = oc.oe;
+}
+
+                    // variable
+objectelement(res)::= PTR ID(i) arrayindex(a). {
+    if ($this->security && substr(i,0,1) == '_') {
+        $this->compiler->trigger_template_error (self::Err1);
+    }
+    res = '->'.i.a;
+}
+
+objectelement(res)::= PTR varvar(v) arrayindex(a). {
+    if ($this->security) {
+        $this->compiler->trigger_template_error (self::Err2);
+    }
+    res = '->{'.$this->compiler->compileVariable(v).a.'}';
+}
+
+objectelement(res)::= PTR LDEL expr(e) RDEL arrayindex(a). {
+    if ($this->security) {
+        $this->compiler->trigger_template_error (self::Err2);
+    }
+    res = '->{'.e.a.'}';
+}
+
+objectelement(res)::= PTR ID(ii) LDEL expr(e) RDEL arrayindex(a). {
+    if ($this->security) {
+        $this->compiler->trigger_template_error (self::Err2);
+    }
+    res = '->{\''.ii.'\'.'.e.a.'}';
+}
+
+                    // method
+objectelement(res)::= PTR method(f).  {
+    res = '->'.f;
+}
+
+
+//
+// function
+//
+function(res)     ::= ns1(f) OPENP params(p) CLOSEP. {
+    if (!$this->security || $this->security->isTrustedPhpFunction(f, $this->compiler)) {
+        if (strcasecmp(f,'isset') === 0 || strcasecmp(f,'empty') === 0 || strcasecmp(f,'array') === 0 || is_callable(f)) {
+            $func_name = strtolower(f);
+            if ($func_name == 'isset') {
+                if (count(p) == 0) {
+                    $this->compiler->trigger_template_error ('Illegal number of paramer in "isset()"');
+                }
+                $par = implode(',',p);
+                if (strncasecmp($par,'$_smarty_tpl->smarty->ext->_config->_getConfigVariable',strlen('$_smarty_tpl->smarty->ext->_config->_getConfigVariable')) === 0) {
+                    self::$prefix_number++;
+                    $this->compiler->prefix_code[] = '<?php $_tmp'.self::$prefix_number.'='.str_replace(')',', false)',$par).';?>';
+                    $isset_par = '$_tmp'.self::$prefix_number;
+                } else {
+                    $isset_par=str_replace("')->value","',null,true,false)->value",$par);
+                }
+                res = f . "(". $isset_par .")";
+            } elseif (in_array($func_name,array('empty','reset','current','end','prev','next'))){
+                if (count(p) != 1) {
+                    $this->compiler->trigger_template_error ('Illegal number of paramer in "empty()"');
+                }
+                if ($func_name == 'empty') {
+                    res = $func_name.'('.str_replace("')->value","',null,true,false)->value",p[0]).')';
+                } else {
+                    res = $func_name.'('.p[0].')';
+                }
+            } else {
+                res = f . "(". implode(',',p) .")";
+            }
+        } else {
+            $this->compiler->trigger_template_error ("unknown function \"" . f . "\"");
+        }
+    }
+}
+
+
+//
+// method
+//
+method(res)     ::= ID(f) OPENP params(p) CLOSEP. {
+    if ($this->security && substr(f,0,1) == '_') {
+        $this->compiler->trigger_template_error (self::Err1);
+    }
+    res = f . "(". implode(',',p) .")";
+}
+
+method(res)     ::= DOLLARID(f) OPENP params(p) CLOSEP.  {
+    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('\''.substr(f,1).'\'').';?>';
+    res = '$_tmp'.self::$prefix_number.'('. implode(',',p) .')';
+}
+
+// function/method parameter
+                    // multiple parameters
+params(res)       ::= params(p) COMMA expr(e). {
+    res = array_merge(p,array(e));
+}
+
+                    // single parameter
+params(res)       ::= expr(e). {
+    res = array(e);
+}
+
+                    // kein parameter
+params(res)       ::= . {
+    res = array();
+}
+
+//
+// modifier
+// 
+modifierlist(res) ::= modifierlist(l) modifier(m) modparameters(p). {
+    res = array_merge(l,array(array_merge(m,p)));
+}
+
+modifierlist(res) ::= modifier(m) modparameters(p). {
+    res = array(array_merge(m,p));
+}
+ 
+modifier(res)    ::= VERT AT ID(m). {
+    res = array(m);
+}
+
+modifier(res)    ::= VERT ID(m). {
+    res =  array(m);
+}
+
+//
+// modifier parameter
+//
+                    // multiple parameter
+modparameters(res) ::= modparameters(mps) modparameter(mp). {
+    res = array_merge(mps,mp);
+}
+
+                    // no parameter
+modparameters(res)      ::= . {
+    res = array();
+}
+
+                    // parameter expression
+modparameter(res) ::= COLON value(mp). {
+    res = array(mp);
+}
+
+modparameter(res) ::= COLON array(mp). {
+    res = array(mp);
+}
+
+                  // static class methode call
+static_class_access(res)       ::= method(m). {
+    res = array(m, '', 'method');
+}
+
+                  // static class methode call with object chainig
+static_class_access(res)       ::= method(m) objectchain(oc). {
+    res = array(m, oc, 'method');
+}
+
+                  // static class constant
+static_class_access(res)       ::= ID(v). {
+    res = array(v, '');
+}
+
+                  // static class variables
+static_class_access(res)       ::=  DOLLARID(v) arrayindex(a). {
+    res = array(v, a, 'property');
+}
+
+                  // static class variables with object chain
+static_class_access(res)       ::= DOLLARID(v) arrayindex(a) objectchain(oc). {
+    res = array(v, a.oc, 'property');
+}
+
+
+// if conditions and operators
+lop(res)        ::= LOGOP(o). {
+    res['op'] = ' '. trim(o) . ' ';
+}
+
+lop(res)        ::= TLOGOP(o). {
+    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(preg_replace('/\s*/', '', o));
+    res = $lops[$op];
+}
+
+scond(res)  ::= SINGLECOND(o). {
+        static $scond = array (
+            'iseven' => '!(1 & ',
+            'isnoteven' => '(1 & ',
+            'isodd' => '(1 & ',
+            'isnotodd' => '!(1 & ',
+        );
+   $op = strtolower(str_replace(' ', '', o));
+   res = $scond[$op];
+}
+
+//
+// ARRAY element assignment
+//
+array(res)           ::=  OPENB arrayelements(a) CLOSEB.  {
+    res = 'array('.a.')';
+}
+
+arrayelements(res)   ::=  arrayelement(a).  {
+    res = a;
+}
+
+arrayelements(res)   ::=  arrayelements(a1) COMMA arrayelement(a).  {
+    res = a1.','.a;
+}
+
+arrayelements        ::=  .  {
+    return;
+}
+
+arrayelement(res)    ::=  value(e1) APTR expr(e2). {
+    res = e1.'=>'.e2;
+}
+
+arrayelement(res)    ::=  ID(i) APTR expr(e2). { 
+    res = '\''.i.'\'=>'.e2;
+}
+
+arrayelement(res)    ::=  expr(e). {
+    res = e;
+}
+
+
+//
+// double qouted strings
+//
+doublequoted_with_quotes(res) ::= QUOTE QUOTE. {
+    res = "''";
+}
+
+doublequoted_with_quotes(res) ::= QUOTE doublequoted(s) QUOTE. {
+    res = s->to_smarty_php($this);
+}
+
+
+doublequoted(res)          ::= doublequoted(o1) doublequotedcontent(o2). {
+    o1->append_subtree($this, o2);
+    res = o1;
+}
+
+doublequoted(res)          ::= doublequotedcontent(o). {
+    res = new Smarty_Internal_ParseTree_Dq($this, o);
+}
+
+doublequotedcontent(res)           ::=  BACKTICK variable(v) BACKTICK. {
+    res = new Smarty_Internal_ParseTree_Code('(string)'.v);
+}
+
+doublequotedcontent(res)           ::=  BACKTICK expr(e) BACKTICK. {
+    res = new Smarty_Internal_ParseTree_Code('(string)'.e);
+}
+
+doublequotedcontent(res)           ::=  DOLLARID(i). {
+    res = new Smarty_Internal_ParseTree_Code('(string)$_smarty_tpl->tpl_vars[\''. substr(i,1) .'\']->value');
+}
+
+doublequotedcontent(res)           ::=  LDEL variable(v) RDEL. {
+    res = new Smarty_Internal_ParseTree_Code('(string)'.v);
+}
+
+doublequotedcontent(res)           ::=  LDEL expr(e) RDEL. {
+    res = new Smarty_Internal_ParseTree_Code('(string)('.e.')');
+}
+
+doublequotedcontent(res)     ::=  smartytag(st). {
+    res = new Smarty_Internal_ParseTree_Tag($this, st);
+}
+
+doublequotedcontent(res)           ::=  TEXT(o). {
+    res = new Smarty_Internal_ParseTree_DqContent(o);
+}
+
diff --git a/include/smarty/libs/Autoloader.php b/include/smarty/libs/Autoloader.php
new file mode 100644
index 000000000..7d0c388a6
--- /dev/null
+++ b/include/smarty/libs/Autoloader.php
@@ -0,0 +1,124 @@
+<?php
+/**
+ * Smarty Autoloader
+ *
+ * @package    Smarty
+ */
+
+/**
+ * Smarty Autoloader
+ *
+ * @package    Smarty
+ * @author     Uwe Tews
+ *             Usage:
+ *             require_once '...path/Autoloader.php';
+ *             Smarty_Autoloader::register();
+ *             $smarty = new Smarty();
+ *             Note:       This autoloader is not needed if you use Composer.
+ *             Composer will automatically add the classes of the Smarty package to it common autoloader.
+ */
+class Smarty_Autoloader
+{
+    /**
+     * Filepath to Smarty root
+     *
+     * @var string
+     */
+    public static $SMARTY_DIR = '';
+
+    /**
+     * Filepath to Smarty internal plugins
+     *
+     * @var string
+     */
+    public static $SMARTY_SYSPLUGINS_DIR = '';
+
+    /**
+     * Array with Smarty core classes and their filename
+     *
+     * @var array
+     */
+    public static $rootClasses = array('smarty' => 'Smarty.class.php', 'smartybc' => 'SmartyBC.class.php',);
+
+    /**
+     * Registers Smarty_Autoloader backward compatible to older installations.
+     *
+     * @param bool $prepend Whether to prepend the autoloader or not.
+     */
+    public static function registerBC($prepend = false)
+    {
+        /**
+         * register the class autoloader
+         */
+        if (!defined('SMARTY_SPL_AUTOLOAD')) {
+            define('SMARTY_SPL_AUTOLOAD', 0);
+        }
+        if (SMARTY_SPL_AUTOLOAD &&
+            set_include_path(get_include_path() . PATH_SEPARATOR . SMARTY_SYSPLUGINS_DIR) !== false
+        ) {
+            $registeredAutoLoadFunctions = spl_autoload_functions();
+            if (!isset($registeredAutoLoadFunctions['spl_autoload'])) {
+                spl_autoload_register();
+            }
+        } else {
+            self::register($prepend);
+        }
+    }
+
+    /**
+     * Registers Smarty_Autoloader as an SPL autoloader.
+     *
+     * @param bool $prepend Whether to prepend the autoloader or not.
+     */
+    public static function register($prepend = false)
+    {
+        self::$SMARTY_DIR = defined('SMARTY_DIR') ? SMARTY_DIR : dirname(__FILE__) . DIRECTORY_SEPARATOR;
+        self::$SMARTY_SYSPLUGINS_DIR = defined('SMARTY_SYSPLUGINS_DIR') ? SMARTY_SYSPLUGINS_DIR :
+            self::$SMARTY_DIR . 'sysplugins' . DIRECTORY_SEPARATOR;
+        if (version_compare(phpversion(), '5.3.0', '>=')) {
+            spl_autoload_register(array(__CLASS__, 'autoload'), true, $prepend);
+        } else {
+            spl_autoload_register(array(__CLASS__, 'autoload'));
+        }
+    }
+
+    /**
+     * Handles auto loading of classes.
+     *
+     * @param string $class A class name.
+     */
+    public static function autoload($class)
+    {
+        $_class = strtolower($class);
+        $file = self::$SMARTY_SYSPLUGINS_DIR . $_class . '.php';
+        if (strpos($_class, 'smarty_internal_') === 0) {
+            if (strpos($_class, 'smarty_internal_compile_') === 0) {
+                if (is_file($file)) {
+                    require $file;
+                }
+                return;
+            }
+            @include $file;
+            return;
+        }
+        if (preg_match('/^(smarty_(((template_(source|config|cache|compiled|resource_base))|((cached|compiled)?resource)|(variable|security)))|(smarty(bc)?)$)/',
+                       $_class, $match)) {
+            if (!empty($match[3])) {
+                @include $file;
+                return;
+            } elseif (!empty($match[9]) && isset(self::$rootClasses[$_class])) {
+                $file = self::$rootClasses[$_class];
+                require $file;
+                return;
+            }
+        }
+        if (0 !== strpos($_class, 'smarty')) {
+            return;
+        }
+        if (is_file($file)) {
+            require $file;
+            return;
+        }
+        return;
+    }
+}
diff --git a/include/smarty/libs/Smarty.class.php b/include/smarty/libs/Smarty.class.php
index 40532fc2a..17457131c 100644
--- a/include/smarty/libs/Smarty.class.php
+++ b/include/smarty/libs/Smarty.class.php
@@ -2,7 +2,6 @@
 /**
  * Project:     Smarty: the PHP compiling template engine
  * File:        Smarty.class.php
- * SVN:         $Id: Smarty.class.php 4694 2013-01-13 21:13:14Z uwe.tews@googlemail.com $
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -17,18 +16,18 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
  * For questions, help, comments, discussion, etc., please join the
  * Smarty mailing list. Send a blank e-mail to
  * smarty-discussion-subscribe@googlegroups.com
  *
- * @link http://www.smarty.net/
- * @copyright 2008 New Digital Group, Inc.
- * @author Monte Ohrt <monte at ohrt dot com>
- * @author Uwe Tews
- * @author Rodney Rehm
- * @package Smarty
- * @version 3.1.13
+ * @link      http://www.smarty.net/
+ * @copyright 2015 New Digital Group, Inc.
+ * @copyright 2015 Uwe Tews
+ * @author    Monte Ohrt <monte at ohrt dot com>
+ * @author    Uwe Tews
+ * @author    Rodney Rehm
+ * @package   Smarty
+ * @version   3.1.28
  */
 
 /**
@@ -57,7 +56,7 @@ if (!defined('SMARTY_PLUGINS_DIR')) {
     define('SMARTY_PLUGINS_DIR', SMARTY_DIR . 'plugins' . DS);
 }
 if (!defined('SMARTY_MBSTRING')) {
-    define('SMARTY_MBSTRING', function_exists('mb_split'));
+    define('SMARTY_MBSTRING', function_exists('mb_get_info'));
 }
 if (!defined('SMARTY_RESOURCE_CHAR_SET')) {
     // UTF-8 can only be done properly when mbstring is available!
@@ -74,38 +73,44 @@ if (!defined('SMARTY_RESOURCE_DATE_FORMAT')) {
 }
 
 /**
- * register the class autoloader
+ * Try loading the Smarty_Internal_Data class
+ * If we fail we must load Smarty's autoloader.
+ * Otherwise we may have a global autoloader like Composer
  */
-if (!defined('SMARTY_SPL_AUTOLOAD')) {
-    define('SMARTY_SPL_AUTOLOAD', 0);
-}
-
-if (SMARTY_SPL_AUTOLOAD && set_include_path(get_include_path() . PATH_SEPARATOR . SMARTY_SYSPLUGINS_DIR) !== false) {
-    $registeredAutoLoadFunctions = spl_autoload_functions();
-    if (!isset($registeredAutoLoadFunctions['spl_autoload'])) {
-        spl_autoload_register();
+if (!class_exists('Smarty_Autoloader', false)) {
+    if (!class_exists('Smarty_Internal_Data', true)) {
+        require_once dirname(__FILE__) . '/Autoloader.php';
+        Smarty_Autoloader::registerBC();
     }
-} else {
-    spl_autoload_register('smartyAutoload');
 }
 
 /**
  * Load always needed external class files
  */
-include_once SMARTY_SYSPLUGINS_DIR.'smarty_internal_data.php';
-include_once SMARTY_SYSPLUGINS_DIR.'smarty_internal_templatebase.php';
-include_once SMARTY_SYSPLUGINS_DIR.'smarty_internal_template.php';
-include_once SMARTY_SYSPLUGINS_DIR.'smarty_resource.php';
-include_once SMARTY_SYSPLUGINS_DIR.'smarty_internal_resource_file.php';
-include_once SMARTY_SYSPLUGINS_DIR.'smarty_cacheresource.php';
-include_once SMARTY_SYSPLUGINS_DIR.'smarty_internal_cacheresource_file.php';
+if (!class_exists('Smarty_Internal_Data', false)) {
+    require_once SMARTY_SYSPLUGINS_DIR . 'smarty_internal_data.php';
+}
+require_once SMARTY_SYSPLUGINS_DIR . 'smarty_internal_extension_handler.php';
+require_once SMARTY_SYSPLUGINS_DIR . 'smarty_internal_templatebase.php';
+require_once SMARTY_SYSPLUGINS_DIR . 'smarty_internal_template.php';
+require_once SMARTY_SYSPLUGINS_DIR . 'smarty_resource.php';
+require_once SMARTY_SYSPLUGINS_DIR . 'smarty_variable.php';
+require_once SMARTY_SYSPLUGINS_DIR . 'smarty_template_source.php';
+require_once SMARTY_SYSPLUGINS_DIR . 'smarty_template_resource_base.php';
 
 /**
  * This is the main Smarty class
+ *
  * @package Smarty
+ *
+ * @method int clearAllCache(int $exp_time = null, string $type = null)
+ * @method int clearCache(string $template_name, string $cache_id = null, string $compile_id = null, int $exp_time = null, string $type = null)
+ * @method int compileAllTemplates(Smarty $smarty, string $extension = '.tpl', bool $force_compile = false, int $time_limit = 0, int $max_errors = null)
+ * @method int compileAllConfig(Smarty $smarty, string $extension = '.conf', bool $force_compile = false, int $time_limit = 0, int $max_errors = null)
+ *
  */
-class Smarty extends Smarty_Internal_TemplateBase {
-
+class Smarty extends Smarty_Internal_TemplateBase
+{
     /**#@+
      * constant definitions
      */
@@ -113,50 +118,103 @@ class Smarty extends Smarty_Internal_TemplateBase {
     /**
      * smarty version
      */
-    const SMARTY_VERSION = 'Smarty-3.1.13';
+    const SMARTY_VERSION = '3.1.28';
 
     /**
      * define variable scopes
      */
     const SCOPE_LOCAL = 0;
-    const SCOPE_PARENT = 1;
-    const SCOPE_ROOT = 2;
-    const SCOPE_GLOBAL = 3;
+
+    const SCOPE_PARENT = 2;
+
+    const SCOPE_TPL_ROOT = 4;
+
+    const SCOPE_ROOT = 8;
+
+    const SCOPE_SMARTY = 16;
+
+    const SCOPE_GLOBAL = 32;
+
+    const SCOPE_BUBBLE_UP = 64;
+
     /**
      * 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 dates
+     */
+    const CLEAR_EXPIRED = - 1;
+
     /**
      * 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';
 
+    /**
+     * Resource caching modes
+     */
+    const RESOURCE_CACHE_OFF = 0;
+
+    const RESOURCE_CACHE_AUTOMATIC = 1; // cache template objects by rules
+
+    const RESOURCE_CACHE_TEMPLATE = 2; // cache all template objects
+
+    const RESOURCE_CACHE_ON = 4;    // cache source and compiled resources
+
     /**#@-*/
 
     /**
@@ -165,26 +223,31 @@ class Smarty extends Smarty_Internal_TemplateBase {
     public static $global_tpl_vars = array();
 
     /**
-     * error handler returned by set_error_hanlder() in Smarty::muteExpectedErrors()
+     * error handler returned by set_error_handler() 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();
+
     /**
      * 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
      */
@@ -200,216 +263,227 @@ class Smarty extends Smarty_Internal_TemplateBase {
      */
 
     /**
-     * auto literal on delimiters with whitspace
+     * auto literal on delimiters with whitespace
+     *
      * @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
+     * look up relative file path in include_path
+     *
      * @var boolean
      */
     public $use_include_path = false;
+
     /**
      * template directory
+     *
      * @var array
      */
-    private $template_dir = array();
+    private $template_dir = array('./templates/');
+
     /**
      * joined template directory string used in cache keys
+     *
      * @var string
      */
-    public $joined_template_dir = null;
+    public $_joined_template_dir = null;
+
     /**
      * joined config directory string used in cache keys
+     *
      * @var string
      */
-    public $joined_config_dir = null;
+    public $_joined_config_dir = null;
+
     /**
      * 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 = null;
+    private $compile_dir = './templates_c/';
+
     /**
      * plugins directory
+     *
      * @var array
      */
-    private $plugins_dir = array();
+    private $plugins_dir = null;
+
     /**
      * cache directory
+     *
      * @var string
      */
-    private $cache_dir = null;
+    private $cache_dir = './cache/';
+
     /**
      * config directory
+     *
      * @var array
      */
-    private $config_dir = 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;
-    /**
-     * caching enabled
-     * @var boolean
-     */
-    public $caching = false;
+
     /**
      * merge compiled includes
+     *
      * @var boolean
      */
     public $merge_compiled_includes = false;
-    /**
-     * cache lifetime in seconds
-     * @var integer
-     */
-    public $cache_lifetime = 3600;
+
     /**
      * force cache file creation
+     *
      * @var boolean
      */
     public $force_cache = false;
-    /**
-     * Set this if you want different sets of cache files for the same
-     * templates.
-     *
-     * @var string
-     */
-    public $cache_id = null;
-    /**
-     * Set this if you want different sets of compiled files for the same
-     * templates.
-     *
-     * @var string
-     */
-    public $compile_id = null;
+
     /**
      * template left-delimiter
+     *
      * @var string
      */
     public $left_delimiter = "{";
+
     /**
      * template right-delimiter
+     *
      * @var string
      */
     public $right_delimiter = "}";
+
     /**#@+
      * security
      */
     /**
      * class name
-     *
      * This should be instance of Smarty_Security.
      *
      * @var string
      * @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
-     * Currently used by Smarty_Internal_Template only.
-     * }}
-     *
-     * @var boolean
-     */
-    public $direct_access_security = true;
+
     /**#@-*/
     /**
      * debug mode
-     *
      * Setting this to true enables the debug-console.
      *
      * @var boolean
      */
     public $debugging = false;
+
     /**
      * This determines if debugging is enable-able from the browser.
      * <ul>
      *  <li>NONE => no debugging control allowed</li>
      *  <li>URL => enable debugging when SMARTY_DEBUG is found in the URL.</li>
      * </ul>
+     *
      * @var string
      */
     public $debugging_ctrl = 'NONE';
+
     /**
      * Name of debugging URL-param.
-     *
      * Only used when $debugging_ctrl is set to 'URL'.
      * The name of the URL-parameter that activates debugging.
      *
-     * @var type
+     * @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.
+     *
      * @var int
      */
     public $error_reporting = null;
-    /**
-     * Internal flag for getTags()
-     * @var boolean
-     */
-    public $get_used_tags = false;
 
     /**#@+
      * config var settings
@@ -417,16 +491,21 @@ class Smarty extends Smarty_Internal_TemplateBase {
 
     /**
      * Controls whether variables with the same name overwrite each other.
+     *
      * @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.
+     *
      * @var boolean
      */
     public $config_read_hidden = false;
@@ -439,16 +518,21 @@ class Smarty extends Smarty_Internal_TemplateBase {
 
     /**
      * locking concurrent compiles
+     *
      * @var boolean
      */
     public $compile_locking = true;
+
     /**
-     * Controls whether cache resources should emply locking mechanism
+     * Controls whether cache resources should use locking mechanism
+     *
      * @var boolean
      */
     public $cache_locking = false;
+
     /**
      * seconds to wait for acquiring a lock before ignoring the write lock
+     *
      * @var float
      */
     public $locking_timeout = 10;
@@ -456,270 +540,198 @@ class Smarty extends Smarty_Internal_TemplateBase {
     /**#@-*/
 
     /**
-     * global template functions
-     * @var array
-     */
-    public $template_functions = array();
-    /**
      * resource type used if none given
-     *
      * Must be an valid key of $registered_resources.
+     *
      * @var string
      */
     public $default_resource_type = 'file';
+
     /**
      * caching type
-     *
      * Must be an element of $cache_resource_types.
      *
      * @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
+     * enable resource caching
+     *
+     * @var bool
      */
-    public $template_objects = array();
+    public $resource_cache_mode = 1;
+
     /**
      * 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');
+
     /**
      * 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();
-    /**
-     * self pointer to Smarty object
-     * @var Smarty
-     */
-    public $smarty;
+
     /**
      * required by the compiler for BC
+     *
      * @var string
      */
     public $_current_file = null;
+
     /**
      * internal flag to enable parser debugging
+     *
      * @var bool
      */
     public $_parserdebug = false;
+
+    /**
+     * This object type (Smarty = 1, template = 2, data = 4)
+     *
+     * @var int
+     */
+    public $_objType = 1;
+
     /**
-     * Saved parameter of merged templates during compilation
+     * Debug object
+     *
+     * @var Smarty_Internal_Debug
+     */
+    public $_debug = null;
+
+    /**
+     * removed properties
      *
      * @var array
      */
-    public $merged_templates_func = array();
+    private static $obsoleteProperties = array('resource_caching', 'template_resource_caching',
+                                               'direct_access_security', '_dir_perms', '_file_perms',
+                                               'plugin_search_order', 'inheritance_merge_compiled_includes');
+
+    private static $accessMap = array('template_dir' => 'getTemplateDir', 'config_dir' => 'getConfigDir',
+                                      'plugins_dir'  => 'getPluginsDir', 'compile_dir' => 'getCompileDir',
+                                      'cache_dir'    => 'getCacheDir',);
+
     /**#@-*/
 
     /**
      * Initialize new Smarty object
-     *
      */
     public function __construct()
     {
-        // selfpointer needed by some other class methods
-        $this->smarty = $this;
+        parent::__construct();
         if (is_callable('mb_internal_encoding')) {
             mb_internal_encoding(Smarty::$_CHARSET);
         }
         $this->start_time = microtime(true);
-        // set default dirs
-        $this->setTemplateDir('.' . DS . 'templates' . DS)
-            ->setCompileDir('.' . DS . 'templates_c' . DS)
-            ->setPluginsDir(SMARTY_PLUGINS_DIR)
-            ->setCacheDir('.' . DS . 'cache' . DS)
-            ->setConfigDir('.' . DS . 'configs' . DS);
-
-        $this->debug_tpl = 'file:' . dirname(__FILE__) . '/debug.tpl';
+
         if (isset($_SERVER['SCRIPT_NAME'])) {
-            $this->assignGlobal('SCRIPT_NAME', $_SERVER['SCRIPT_NAME']);
+            Smarty::$global_tpl_vars['SCRIPT_NAME'] = new Smarty_Variable($_SERVER['SCRIPT_NAME']);
         }
-    }
-
-
-    /**
-     * Class destructor
-     */
-    public function __destruct()
-    {
-        // intentionally left blank
-    }
-
-    /**
-     * <<magic>> set selfpointer on cloned object
-     */
-    public function __clone()
-    {
-        $this->smarty = $this;
-    }
 
+        // Check if we're running on windows
+        Smarty::$_IS_WINDOWS = strtoupper(substr(PHP_OS, 0, 3)) === 'WIN';
 
-    /**
-     * <<magic>> Generic getter.
-     *
-     * Calls the appropriate getter function.
-     * Issues an E_USER_NOTICE if no valid getter is found.
-     *
-     * @param string $name property name
-     * @return mixed
-     */
-    public function __get($name)
-    {
-        $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]}();
-        } else {
-            trigger_error('Undefined property: '. get_class($this) .'::$'. $name, E_USER_NOTICE);
-        }
-    }
-
-    /**
-     * <<magic>> Generic setter.
-     *
-     * Calls the appropriate setter function.
-     * Issues an E_USER_NOTICE if no valid setter is found.
-     *
-     * @param string $name  property name
-     * @param mixed  $value parameter passed to setter
-     */
-    public function __set($name, $value)
-    {
-        $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);
-        } else {
-            trigger_error('Undefined property: ' . get_class($this) . '::$' . $name, E_USER_NOTICE);
+        // let PCRE (preg_*) treat strings as ISO-8859-1 if we're not dealing with UTF-8
+        if (Smarty::$_CHARSET !== 'UTF-8') {
+            Smarty::$_UTF8_MODIFIER = '';
         }
     }
 
     /**
      * Check if a template resource exists
      *
-     * @param string $resource_name template name
+     * @param  string $resource_name template name
+     *
      * @return boolean status
      */
     public function templateExists($resource_name)
     {
-        // create template object
-        $save = $this->template_objects;
-        $tpl = new $this->template_class($resource_name, $this);
-        // check if it does exists
-        $result = $tpl->source->exists;
-        $this->template_objects = $save;
-        return $result;
+        // create source object
+        $source = Smarty_Template_Source::load(null, $this, $resource_name);
+        return $source->exists;
     }
 
     /**
      * Returns a single or all global  variables
      *
-     * @param object $smarty
-     * @param string $varname variable name or null
+     * @param  string $varname variable name or null
+     *
      * @return string variable value or or array of variables
      */
     public function getGlobal($varname = null)
@@ -735,74 +747,28 @@ class Smarty extends Smarty_Internal_TemplateBase {
             foreach (self::$global_tpl_vars AS $key => $var) {
                 $_result[$key] = $var->value;
             }
+
             return $_result;
         }
     }
 
     /**
-     * Empty cache folder
-     *
-     * @param integer $exp_time expiration time
-     * @param string  $type     resource type
-     * @return integer number of cache files deleted
-     */
-    function clearAllCache($exp_time = null, $type = null)
-    {
-        // load cache resource and call clearAll
-        $_cache_resource = Smarty_CacheResource::load($this, $type);
-        Smarty_CacheResource::invalidLoadedCache($this);
-        return $_cache_resource->clearAll($this, $exp_time);
-    }
-
-    /**
-     * Empty cache for a specific template
-     *
-     * @param string  $template_name template name
-     * @param string  $cache_id      cache id
-     * @param string  $compile_id    compile id
-     * @param integer $exp_time      expiration time
-     * @param string  $type          resource type
-     * @return integer number of cache files deleted
-     */
-    public function clearCache($template_name, $cache_id = null, $compile_id = null, $exp_time = null, $type = null)
-    {
-        // load cache resource and call clear
-        $_cache_resource = Smarty_CacheResource::load($this, $type);
-        Smarty_CacheResource::invalidLoadedCache($this);
-        return $_cache_resource->clear($this, $template_name, $cache_id, $compile_id, $exp_time);
-    }
-
-    /**
      * Loads security class and enables security
      *
-     * @param string|Smarty_Security $security_class if a string is used, it must be class-name
-     * @return Smarty current Smarty instance for chaining
-     * @throws SmartyException when an invalid class name is provided
+     * @param  string|Smarty_Security $security_class if a string is used, it must be class-name
+     *
+     * @return Smarty                 current Smarty instance for chaining
+     * @throws SmartyException        when an invalid class name is provided
      */
     public function enableSecurity($security_class = null)
     {
-        if ($security_class instanceof Smarty_Security) {
-            $this->security_policy = $security_class;
-            return $this;
-        } elseif (is_object($security_class)) {
-            throw new SmartyException("Class '" . get_class($security_class) . "' must extend Smarty_Security.");
-        }
-        if ($security_class == null) {
-            $security_class = $this->security_class;
-        }
-        if (!class_exists($security_class)) {
-            throw new SmartyException("Security class '$security_class' is not defined");
-        } elseif ($security_class !== 'Smarty_Security' && !is_subclass_of($security_class, 'Smarty_Security')) {
-            throw new SmartyException("Class '$security_class' must extend Smarty_Security.");
-        } else {
-            $this->security_policy = new $security_class($this);
-        }
-
+        Smarty_Security::enableSecurity($this, $security_class);
         return $this;
     }
 
     /**
      * Disable security
+     *
      * @return Smarty current Smarty instance for chaining
      */
     public function disableSecurity()
@@ -815,179 +781,145 @@ class Smarty extends Smarty_Internal_TemplateBase {
     /**
      * Set template directory
      *
-     * @param string|array $template_dir directory(s) of template sources
-     * @return Smarty current Smarty instance for chaining
+     * @param  string|array $template_dir directory(s) of template sources
+     * @param bool          $isConfig     true for config_dir
+     *
+     * @return \Smarty current Smarty instance for chaining
      */
-    public function setTemplateDir($template_dir)
+    public function setTemplateDir($template_dir, $isConfig = false)
     {
-        $this->template_dir = array();
-        foreach ((array) $template_dir as $k => $v) {
-            $this->template_dir[$k] = rtrim($v, '/\\') . DS;
-        }
-
-        $this->joined_template_dir = join(DIRECTORY_SEPARATOR, $this->template_dir);
+        $type = $isConfig ? 'config_dir' : 'template_dir';
+        $joined = '_joined_' . $type;
+        $this->{$type} = (array) $template_dir;
+        $this->{$joined} = join(' # ', $this->{$type});
+        $this->_cache[$type . '_new'] = true;
+        $this->_cache[$type] = false;
         return $this;
     }
 
     /**
      * Add template directory(s)
      *
-     * @param string|array $template_dir directory(s) of template sources
-     * @param string       $key          of the array element to assign the template dir to
-     * @return Smarty current Smarty instance for chaining
-     * @throws SmartyException when the given template directory is not valid
+     * @param  string|array $template_dir directory(s) of template sources
+     * @param  string       $key          of the array element to assign the template dir to
+     * @param bool          $isConfig     true for config_dir
+     *
+     * @return Smarty          current Smarty instance for chaining
      */
-    public function addTemplateDir($template_dir, $key=null)
+    public function addTemplateDir($template_dir, $key = null, $isConfig = false)
     {
-        // make sure we're dealing with an array
-        $this->template_dir = (array) $this->template_dir;
-
-        if (is_array($template_dir)) {
-            foreach ($template_dir as $k => $v) {
-                if (is_int($k)) {
-                    // indexes are not merged but appended
-                    $this->template_dir[] = rtrim($v, '/\\') . DS;
-                } else {
-                    // string indexes are overridden
-                    $this->template_dir[$k] = rtrim($v, '/\\') . DS;
-                }
-            }
-        } elseif ($key !== null) {
-            // override directory at specified index
-            $this->template_dir[$key] = rtrim($template_dir, '/\\') . DS;
-        } else {
-            // append new directory
-            $this->template_dir[] = rtrim($template_dir, '/\\') . DS;
+        $type = $isConfig ? 'config_dir' : 'template_dir';
+        $joined = '_joined_' . $type;
+        if (!isset($this->_cache[$type])) {
+            $this->{$type} = (array) $this->{$type};
+            $this->{$joined} = join(' # ', $this->{$type});
+            $this->_cache[$type . '_new'] = true;
+            $this->_cache[$type] = false;
         }
-        $this->joined_template_dir = join(DIRECTORY_SEPARATOR, $this->template_dir);
+        $this->{$joined} .= ' # ' . join(' # ', (array) $template_dir);
+        $this->_addDir($type, $template_dir, $key);
         return $this;
     }
 
     /**
      * Get template directories
      *
-     * @param mixed index of directory to get, null to get all
-     * @return array|string list of template directories, or directory of $index
+     * @param mixed $index    index of directory to get, null to get all
+     * @param bool  $isConfig true for config_dir
+     *
+     * @return array list of template directories, or directory of $index
      */
-    public function getTemplateDir($index=null)
+    public function getTemplateDir($index = null, $isConfig = false)
     {
+        $type = $isConfig ? 'config_dir' : 'template_dir';
+        if (!isset($this->_cache[$type])) {
+            $joined = '_joined_' . $type;
+            $this->{$type} = (array) $this->{$type};
+            $this->{$joined} = join(' # ', $this->{$type});
+            $this->_cache[$type] = false;
+        }
+        if ($this->_cache[$type] == false) {
+            foreach ($this->{$type} as $k => $v) {
+                $this->{$type}[$k] = $this->_realpath($v . DS, true);
+            }
+            $this->_cache[$type . '_new'] = true;
+            $this->_cache[$type] = true;
+        }
         if ($index !== null) {
-            return isset($this->template_dir[$index]) ? $this->template_dir[$index] : null;
+            return isset($this->{$type}[$index]) ? $this->{$type}[$index] : null;
         }
-
-        return (array)$this->template_dir;
+        return $this->{$type};
     }
 
     /**
      * Set config directory
      *
-     * @param string|array $template_dir directory(s) of configuration sources
-     * @return Smarty current Smarty instance for chaining
+     * @param $config_dir
+     *
+     * @return Smarty       current Smarty instance for chaining
      */
     public function setConfigDir($config_dir)
     {
-        $this->config_dir = array();
-        foreach ((array) $config_dir as $k => $v) {
-            $this->config_dir[$k] = rtrim($v, '/\\') . DS;
-        }
-
-        $this->joined_config_dir = join(DIRECTORY_SEPARATOR, $this->config_dir);
-        return $this;
+        return $this->setTemplateDir($config_dir, true);
     }
 
     /**
      * Add config directory(s)
      *
      * @param string|array $config_dir directory(s) of config sources
-     * @param string key of the array element to assign the config dir to
+     * @param mixed        $key        key of the array element to assign the config dir to
+     *
      * @return Smarty current Smarty instance for chaining
      */
-    public function addConfigDir($config_dir, $key=null)
+    public function addConfigDir($config_dir, $key = null)
     {
-        // make sure we're dealing with an array
-        $this->config_dir = (array) $this->config_dir;
-
-        if (is_array($config_dir)) {
-            foreach ($config_dir as $k => $v) {
-                if (is_int($k)) {
-                    // indexes are not merged but appended
-                    $this->config_dir[] = rtrim($v, '/\\') . DS;
-                } else {
-                    // string indexes are overridden
-                    $this->config_dir[$k] = rtrim($v, '/\\') . DS;
-                }
-            }
-        } elseif( $key !== null ) {
-            // override directory at specified index
-            $this->config_dir[$key] = rtrim($config_dir, '/\\') . DS;
-        } else {
-            // append new directory
-            $this->config_dir[] = rtrim($config_dir, '/\\') . DS;
-        }
-
-        $this->joined_config_dir = join(DIRECTORY_SEPARATOR, $this->config_dir);
-        return $this;
+        return $this->addTemplateDir($config_dir, $key, true);
     }
 
     /**
      * Get config directory
      *
-     * @param mixed index of directory to get, null to get all
-     * @return array|string configuration directory
+     * @param mixed $index index of directory to get, null to get all
+     *
+     * @return array configuration directory
      */
-    public function getConfigDir($index=null)
+    public function getConfigDir($index = null)
     {
-        if ($index !== null) {
-            return isset($this->config_dir[$index]) ? $this->config_dir[$index] : null;
-        }
-
-        return (array)$this->config_dir;
+        return $this->getTemplateDir($index, true);
     }
 
     /**
      * Set plugins directory
      *
-     * @param string|array $plugins_dir directory(s) of plugins
-     * @return Smarty current Smarty instance for chaining
+     * @param  string|array $plugins_dir directory(s) of plugins
+     *
+     * @return Smarty       current Smarty instance for chaining
      */
     public function setPluginsDir($plugins_dir)
     {
-        $this->plugins_dir = array();
-        foreach ((array)$plugins_dir as $k => $v) {
-            $this->plugins_dir[$k] = rtrim($v, '/\\') . DS;
+        $this->plugins_dir = (array) $plugins_dir;
+        if (isset($this->_cache['plugins_dir'])) {
+            unset($this->_cache['plugins_dir']);
         }
-
         return $this;
     }
 
     /**
      * Adds directory of plugin files
      *
-     * @param object $smarty
-     * @param string $ |array $ plugins folder
+     * @param $plugins_dir
+     *
      * @return Smarty current Smarty instance for chaining
      */
     public function addPluginsDir($plugins_dir)
     {
-        // make sure we're dealing with an array
-        $this->plugins_dir = (array) $this->plugins_dir;
-
-        if (is_array($plugins_dir)) {
-            foreach ($plugins_dir as $k => $v) {
-                if (is_int($k)) {
-                    // indexes are not merged but appended
-                    $this->plugins_dir[] = rtrim($v, '/\\') . DS;
-                } else {
-                    // string indexes are overridden
-                    $this->plugins_dir[$k] = rtrim($v, '/\\') . DS;
-                }
-            }
-        } else {
-            // append new directory
-            $this->plugins_dir[] = rtrim($plugins_dir, '/\\') . DS;
+        if (!isset($this->plugins_dir)) {
+            $this->plugins_dir = array(SMARTY_PLUGINS_DIR);
+        }
+        $this->plugins_dir = array_merge((array) $this->plugins_dir, (array) $plugins_dir);
+        if (isset($this->_cache['plugins_dir'])) {
+            unset($this->_cache['plugins_dir']);
         }
-
-        $this->plugins_dir = array_unique($this->plugins_dir);
         return $this;
     }
 
@@ -998,21 +930,37 @@ class Smarty extends Smarty_Internal_TemplateBase {
      */
     public function getPluginsDir()
     {
-        return (array)$this->plugins_dir;
+        if (!isset($this->_cache['plugins_dir'])) {
+            if (!isset($this->plugins_dir)) {
+                $this->plugins_dir = array(SMARTY_PLUGINS_DIR);
+            } else {
+                $plugins_dir = (array) $this->plugins_dir;
+                $this->plugins_dir = array();
+                foreach ($plugins_dir as $v) {
+                    $this->plugins_dir[] = $this->_realpath($v . DS, true);
+                }
+                $this->plugins_dir = array_unique($this->plugins_dir);
+            }
+            $this->_cache['plugin_files'] = array();
+            $this->_cache['plugins_dir'] = true;
+        }
+        return $this->plugins_dir;
     }
 
     /**
      * Set compile directory
      *
-     * @param string $compile_dir directory to store compiled templates in
+     * @param  string $compile_dir directory to store compiled templates in
+     *
      * @return Smarty current Smarty instance for chaining
      */
     public function setCompileDir($compile_dir)
     {
-        $this->compile_dir = rtrim($compile_dir, '/\\') . DS;
+        $this->compile_dir = $this->_realpath($compile_dir . DS, true);
         if (!isset(Smarty::$_muted_directories[$this->compile_dir])) {
             Smarty::$_muted_directories[$this->compile_dir] = null;
         }
+        $this->_cache['compile_dir'] = true;
         return $this;
     }
 
@@ -1023,21 +971,30 @@ class Smarty extends Smarty_Internal_TemplateBase {
      */
     public function getCompileDir()
     {
+        if (!isset($this->_cache['compile_dir'])) {
+            $this->compile_dir = $this->_realpath($this->compile_dir . DS, true);
+            if (!isset(Smarty::$_muted_directories[$this->compile_dir])) {
+                Smarty::$_muted_directories[$this->compile_dir] = null;
+            }
+            $this->_cache['compile_dir'] = true;
+        }
         return $this->compile_dir;
     }
 
     /**
      * Set cache directory
      *
-     * @param string $cache_dir directory to store cached templates in
+     * @param  string $cache_dir directory to store cached templates in
+     *
      * @return Smarty current Smarty instance for chaining
      */
     public function setCacheDir($cache_dir)
     {
-        $this->cache_dir = rtrim($cache_dir, '/\\') . DS;
+        $this->cache_dir = $this->_realpath($cache_dir . DS, true);
         if (!isset(Smarty::$_muted_directories[$this->cache_dir])) {
             Smarty::$_muted_directories[$this->cache_dir] = null;
         }
+        $this->_cache['cache_dir'] = true;
         return $this;
     }
 
@@ -1048,341 +1005,387 @@ class Smarty extends Smarty_Internal_TemplateBase {
      */
     public function getCacheDir()
     {
+        if (!isset($this->_cache['cache_dir'])) {
+            $this->cache_dir = $this->_realpath($this->cache_dir . DS, true);
+            if (!isset(Smarty::$_muted_directories[$this->cache_dir])) {
+                Smarty::$_muted_directories[$this->cache_dir] = null;
+            }
+            $this->_cache['cache_dir'] = true;
+        }
         return $this->cache_dir;
     }
 
     /**
-     * Set default modifiers
+     * add directories to given property name
      *
-     * @param array|string $modifiers modifier or list of modifiers to set
-     * @return Smarty current Smarty instance for chaining
+     * @param string       $dirName directory property name
+     * @param string|array $dir     directory string or array of strings
+     * @param mixed        $key     optional key
      */
-    public function setDefaultModifiers($modifiers)
+    private function _addDir($dirName, $dir, $key = null)
     {
-        $this->default_modifiers = (array) $modifiers;
-        return $this;
+        $rp = $this->_cache[$dirName];
+        if (is_array($dir)) {
+            foreach ($dir as $k => $v) {
+                $path = $rp ? $this->_realpath($v . DS, true) : $v;
+                if (is_int($k)) {
+                    // indexes are not merged but appended
+                    $this->{$dirName}[] = $path;
+                } else {
+                    // string indexes are overridden
+                    $this->{$dirName}[$k] = $path;
+                }
+            }
+        } else {
+            $path = $rp ? $this->_realpath($dir . DS, true) : $dir;
+            if ($key !== null) {
+                // override directory at specified index
+                $this->{$dirName}[$key] = $path;
+            } else {
+                // append new directory
+                $this->{$dirName}[] = $path;
+            }
+        }
     }
 
     /**
-     * Add default modifiers
+     * creates a template object
      *
-     * @param array|string $modifiers modifier or list of modifiers to add
-     * @return Smarty current Smarty instance for chaining
+     * @param  string  $template   the resource handle of the template file
+     * @param  mixed   $cache_id   cache id to be used with this template
+     * @param  mixed   $compile_id compile id to be used with this template
+     * @param  object  $parent     next higher level of Smarty variables
+     * @param  boolean $do_clone   flag is Smarty object shall be cloned
+     *
+     * @return object  template object
      */
-    public function addDefaultModifiers($modifiers)
+    public function createTemplate($template, $cache_id = null, $compile_id = null, $parent = null, $do_clone = true)
     {
-        if (is_array($modifiers)) {
-            $this->default_modifiers = array_merge($this->default_modifiers, $modifiers);
+        if ($cache_id !== null && (is_object($cache_id) || is_array($cache_id))) {
+            $parent = $cache_id;
+            $cache_id = null;
+        }
+        if ($parent !== null && is_array($parent)) {
+            $data = $parent;
+            $parent = null;
         } else {
-            $this->default_modifiers[] = $modifiers;
+            $data = null;
         }
-
-        return $this;
+        if ($this->caching &&
+            isset($this->_cache['isCached'][$_templateId = $this->_getTemplateId($template, $cache_id, $compile_id)])
+        ) {
+            $tpl = $do_clone ? clone $this->_cache['isCached'][$_templateId] : $this->_cache['isCached'][$_templateId];
+            $tpl->parent = $parent;
+            $tpl->tpl_vars = array();
+            $tpl->config_vars = array();
+        } else {
+            /* @var Smarty_Internal_Template $tpl */
+            $tpl = new $this->template_class($template, $this, $parent, $cache_id, $compile_id, null, null);
+        }
+        if ($do_clone) {
+            $tpl->smarty = clone $tpl->smarty;
+        } elseif ($parent === null) {
+            $tpl->parent = $this;
+        }
+        // fill data if present
+        if (!empty($data) && is_array($data)) {
+            // set up variable values
+            foreach ($data as $_key => $_val) {
+                $tpl->tpl_vars[$_key] = new Smarty_Variable($_val);
+            }
+        }
+        if ($this->debugging || $this->debugging_ctrl == 'URL') {
+            $tpl->smarty->_debug = new Smarty_Internal_Debug();
+            // check URL debugging control
+            if (!$this->debugging && $this->debugging_ctrl == 'URL') {
+                $tpl->smarty->_debug->debugUrl($tpl->smarty);
+            }
+        }
+        return $tpl;
     }
 
     /**
-     * Get default modifiers
+     * Takes unknown classes and loads plugin files for them
+     * class name format: Smarty_PluginType_PluginName
+     * plugin filename format: plugintype.pluginname.php
+     *
+     * @param  string $plugin_name class plugin name to load
+     * @param  bool   $check       check if already loaded
      *
-     * @return array list of default modifiers
+     * @throws SmartyException
+     * @return string |boolean filepath of loaded file or false
      */
-    public function getDefaultModifiers()
+    public function loadPlugin($plugin_name, $check = true)
     {
-        return $this->default_modifiers;
+        return $this->ext->loadPlugin->loadPlugin($this, $plugin_name, $check);
     }
 
-
     /**
-     * Set autoload filters
+     * Get unique template id
      *
-     * @param array $filters filters to load automatically
-     * @param string $type "pre", "output", … specify the filter type to set. Defaults to none treating $filters' keys as the appropriate types
-     * @return Smarty current Smarty instance for chaining
+     * @param string     $template_name
+     * @param null|mixed $cache_id
+     * @param null|mixed $compile_id
+     * @param null       $caching
+     *
+     * @return string
      */
-    public function setAutoloadFilters($filters, $type=null)
+    public function _getTemplateId($template_name, $cache_id = null, $compile_id = null, $caching = null)
     {
-        if ($type !== null) {
-            $this->autoload_filters[$type] = (array) $filters;
+        $cache_id = $cache_id === null ? $this->cache_id : $cache_id;
+        $compile_id = $compile_id === null ? $this->compile_id : $compile_id;
+        $caching = (int) ($caching === null ? $this->caching : $caching);
+
+        if ($this->allow_ambiguous_resources) {
+            $_templateId =
+                Smarty_Resource::getUniqueTemplateName($this, $template_name) . "#{$cache_id}#{$compile_id}#{$caching}";
         } else {
-            $this->autoload_filters = (array) $filters;
+            $_templateId = $this->_joined_template_dir . "#{$template_name}#{$cache_id}#{$compile_id}#{$caching}";
         }
-
-        return $this;
+        if (isset($_templateId[150])) {
+            $_templateId = sha1($_templateId);
+        }
+        return $_templateId;
     }
 
     /**
-     * Add autoload filters
+     * Normalize path
+     *  - remove /./ and /../
+     *  - make it absolute if required
      *
-     * @param array $filters filters to load automatically
-     * @param string $type "pre", "output", … specify the filter type to set. Defaults to none treating $filters' keys as the appropriate types
-     * @return Smarty current Smarty instance for chaining
+     * @param string $path     file path
+     * @param bool   $realpath leave $path relative
+     *
+     * @return string
      */
-    public function addAutoloadFilters($filters, $type=null)
+    public function _realpath($path, $realpath = null)
     {
-        if ($type !== null) {
-            if (!empty($this->autoload_filters[$type])) {
-                $this->autoload_filters[$type] = array_merge($this->autoload_filters[$type], (array) $filters);
-            } else {
-                $this->autoload_filters[$type] = (array) $filters;
-            }
-        } else {
-            foreach ((array) $filters as $key => $value) {
-                if (!empty($this->autoload_filters[$key])) {
-                    $this->autoload_filters[$key] = array_merge($this->autoload_filters[$key], (array) $value);
-                } else {
-                    $this->autoload_filters[$key] = (array) $value;
-                }
-            }
+        static $pattern = null;
+        static $nds = null;
+        if ($pattern == null) {
+            $nds = DS == '/' ? '\\' : '/';
+            $ds = '\\' . DS;
+            $pattern =
+                "#([{$ds}]+[^{$ds}]+[{$ds}]+[.]([{$ds}]+[.])*[.][{$ds}]+([.][{$ds}]+)*)|([{$ds}]+([.][{$ds}]+)+)|[{$ds}]{2,}#";
+        }
+        // normalize DS
+        if (strpos($path, $nds) !== false) {
+            $path = str_replace($nds, DS, $path);
         }
 
-        return $this;
+        if ($realpath === true && $path[0] !== '/' && $path[1] !== ':') {
+            $path = getcwd() . DS . $path;
+        }
+        while ((strpos($path, '.' . DS) !== false) || (strpos($path, DS . DS) !== false)) {
+            $path = preg_replace($pattern, DS, $path);
+        }
+        if ($realpath === false && ($path[0] == '/' || $path[1] == ':')) {
+            $path = str_ireplace(getcwd(), '.', $path);
+        }
+        return $path;
     }
 
     /**
-     * Get autoload filters
-     *
-     * @param string $type type of filter to get autoloads for. Defaults to all autoload filters
-     * @return array array( 'type1' => array( 'filter1', 'filter2', … ) ) or array( 'filter1', 'filter2', …) if $type was specified
+     * @param boolean $compile_check
      */
-    public function getAutoloadFilters($type=null)
+    public function setCompileCheck($compile_check)
     {
-        if ($type !== null) {
-            return isset($this->autoload_filters[$type]) ? $this->autoload_filters[$type] : array();
-        }
+        $this->compile_check = $compile_check;
+    }
 
-        return $this->autoload_filters;
+    /**
+     * @param boolean $use_sub_dirs
+     */
+    public function setUseSubDirs($use_sub_dirs)
+    {
+        $this->use_sub_dirs = $use_sub_dirs;
     }
 
     /**
-     * return name of debugging template
-     *
-     * @return string
+     * @param int $error_reporting
      */
-    public function getDebugTemplate()
+    public function setErrorReporting($error_reporting)
     {
-        return $this->debug_tpl;
+        $this->error_reporting = $error_reporting;
     }
 
     /**
-     * set the debug template
-     *
-     * @param string $tpl_name
-     * @return Smarty current Smarty instance for chaining
-     * @throws SmartyException if file is not readable
+     * @param boolean $escape_html
      */
-    public function setDebugTemplate($tpl_name)
+    public function setEscapeHtml($escape_html)
     {
-        if (!is_readable($tpl_name)) {
-            throw new SmartyException("Unknown file '{$tpl_name}'");
-        }
-        $this->debug_tpl = $tpl_name;
+        $this->escape_html = $escape_html;
+    }
 
-        return $this;
+    /**
+     * @param boolean $auto_literal
+     */
+    public function setAutoLiteral($auto_literal)
+    {
+        $this->auto_literal = $auto_literal;
     }
 
     /**
-     * creates a template object
-     *
-     * @param string $template the resource handle of the template file
-     * @param mixed $cache_id cache id to be used with this template
-     * @param mixed $compile_id compile id to be used with this template
-     * @param object $parent next higher level of Smarty variables
-     * @param boolean $do_clone flag is Smarty object shall be cloned
-     * @return object template object
+     * @param boolean $force_compile
      */
-    public function createTemplate($template, $cache_id = null, $compile_id = null, $parent = null, $do_clone = true)
+    public function setForceCompile($force_compile)
     {
-        if (!empty($cache_id) && (is_object($cache_id) || is_array($cache_id))) {
-            $parent = $cache_id;
-            $cache_id = null;
-        }
-        if (!empty($parent) && is_array($parent)) {
-            $data = $parent;
-            $parent = null;
-        } else {
-            $data = null;
-        }
-        // default to cache_id and compile_id of Smarty object
-        $cache_id = $cache_id === null ? $this->cache_id : $cache_id;
-        $compile_id = $compile_id === null ? $this->compile_id : $compile_id;
-        // already in template cache?
-        if ($this->allow_ambiguous_resources) {
-            $_templateId = Smarty_Resource::getUniqueTemplateName($this, $template) . $cache_id . $compile_id;
-        } else {
-            $_templateId = $this->joined_template_dir . '#' . $template . $cache_id . $compile_id;
-        }
-        if (isset($_templateId[150])) {
-            $_templateId = sha1($_templateId);
-        }
-        if ($do_clone) {
-            if (isset($this->template_objects[$_templateId])) {
-                // return cached template object
-                $tpl = clone $this->template_objects[$_templateId];
-                $tpl->smarty = clone $tpl->smarty;
-                $tpl->parent = $parent;
-                $tpl->tpl_vars = array();
-                $tpl->config_vars = array();
-            } else {
-                $tpl = new $this->template_class($template, clone $this, $parent, $cache_id, $compile_id);
-            }
-        } else {
-            if (isset($this->template_objects[$_templateId])) {
-                // return cached template object
-                $tpl = $this->template_objects[$_templateId];
-                $tpl->parent = $parent;
-                $tpl->tpl_vars = array();
-                $tpl->config_vars = array();
-            } else {
-                $tpl = new $this->template_class($template, $this, $parent, $cache_id, $compile_id);
-            }
-        }
-        // fill data if present
-        if (!empty($data) && is_array($data)) {
-            // set up variable values
-            foreach ($data as $_key => $_val) {
-                $tpl->tpl_vars[$_key] = new Smarty_variable($_val);
-            }
-        }
-        return $tpl;
+        $this->force_compile = $force_compile;
     }
 
+    /**
+     * @param boolean $merge_compiled_includes
+     */
+    public function setMergeCompiledIncludes($merge_compiled_includes)
+    {
+        $this->merge_compiled_includes = $merge_compiled_includes;
+    }
 
     /**
-     * Takes unknown classes and loads plugin files for them
-     * class name format: Smarty_PluginType_PluginName
-     * plugin filename format: plugintype.pluginname.php
-     *
-     * @param string $plugin_name    class plugin name to load
-     * @param bool   $check          check if already loaded
-     * @return string |boolean filepath of loaded file or false
+     * @param string $left_delimiter
      */
-    public function loadPlugin($plugin_name, $check = true)
+    public function setLeftDelimiter($left_delimiter)
     {
-        // if function or class exists, exit silently (already loaded)
-        if ($check && (is_callable($plugin_name) || class_exists($plugin_name, false))) {
-            return true;
-        }
-        // Plugin name is expected to be: Smarty_[Type]_[Name]
-        $_name_parts = explode('_', $plugin_name, 3);
-        // class name must have three parts to be valid plugin
-        // count($_name_parts) < 3 === !isset($_name_parts[2])
-        if (!isset($_name_parts[2]) || strtolower($_name_parts[0]) !== 'smarty') {
-            throw new SmartyException("plugin {$plugin_name} is not a valid name format");
-            return false;
-        }
-        // if type is "internal", get plugin from sysplugins
-        if (strtolower($_name_parts[1]) == 'internal') {
-            $file = SMARTY_SYSPLUGINS_DIR . strtolower($plugin_name) . '.php';
-            if (file_exists($file)) {
-                require_once($file);
-                return $file;
-            } else {
-                return false;
-            }
-        }
-        // plugin filename is expected to be: [type].[name].php
-        $_plugin_filename = "{$_name_parts[1]}.{$_name_parts[2]}.php";
-
-        $_stream_resolve_include_path = function_exists('stream_resolve_include_path');
-
-        // 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),
-            );
-            foreach ($names as $file) {
-                if (file_exists($file)) {
-                    require_once($file);
-                    return $file;
-                }
-                if ($this->use_include_path && !preg_match('/^([\/\\\\]|[a-zA-Z]:[\/\\\\])/', $_plugin_dir)) {
-                    // try PHP include_path
-                    if ($_stream_resolve_include_path) {
-                        $file = stream_resolve_include_path($file);
-                    } else {
-                        $file = Smarty_Internal_Get_Include_Path::getIncludePath($file);
-                    }
-
-                    if ($file !== false) {
-                        require_once($file);
-                        return $file;
-                    }
-                }
-            }
-        }
-        // no plugin loaded
-        return false;
+        $this->left_delimiter = $left_delimiter;
     }
 
     /**
-     * Compile all template files
-     *
-     * @param string $extension file extension
-     * @param bool $force_compile force all to recompile
-     * @param int $time_limit
-     * @param int $max_errors
-     * @return integer number of template files recompiled
+     * @param string $right_delimiter
      */
-    public function compileAllTemplates($extention = '.tpl', $force_compile = false, $time_limit = 0, $max_errors = null)
+    public function setRightDelimiter($right_delimiter)
     {
-        return Smarty_Internal_Utility::compileAllTemplates($extention, $force_compile, $time_limit, $max_errors, $this);
+        $this->right_delimiter = $right_delimiter;
     }
 
     /**
-     * Compile all config files
-     *
-     * @param string $extension file extension
-     * @param bool $force_compile force all to recompile
-     * @param int $time_limit
-     * @param int $max_errors
-     * @return integer number of template files recompiled
+     * @param boolean $debugging
+     */
+    public function setDebugging($debugging)
+    {
+        $this->debugging = $debugging;
+    }
+
+    /**
+     * @param boolean $config_overwrite
+     */
+    public function setConfigOverwrite($config_overwrite)
+    {
+        $this->config_overwrite = $config_overwrite;
+    }
+
+    /**
+     * @param boolean $config_booleanize
+     */
+    public function setConfigBooleanize($config_booleanize)
+    {
+        $this->config_booleanize = $config_booleanize;
+    }
+
+    /**
+     * @param boolean $config_read_hidden
+     */
+    public function setConfigReadHidden($config_read_hidden)
+    {
+        $this->config_read_hidden = $config_read_hidden;
+    }
+
+    /**
+     * @param boolean $compile_locking
+     */
+    public function setCompileLocking($compile_locking)
+    {
+        $this->compile_locking = $compile_locking;
+    }
+
+    /**
+     * @param string $default_resource_type
+     */
+    public function setDefaultResourceType($default_resource_type)
+    {
+        $this->default_resource_type = $default_resource_type;
+    }
+
+    /**
+     * @param string $caching_type
      */
-    public function compileAllConfig($extention = '.conf', $force_compile = false, $time_limit = 0, $max_errors = null)
+    public function setCachingType($caching_type)
     {
-        return Smarty_Internal_Utility::compileAllConfig($extention, $force_compile, $time_limit, $max_errors, $this);
+        $this->caching_type = $caching_type;
     }
 
     /**
-     * Delete compiled template file
+     * Test install
      *
-     * @param string $resource_name template name
-     * @param string $compile_id compile id
-     * @param integer $exp_time expiration time
-     * @return integer number of template files deleted
+     * @param null $errors
      */
-    public function clearCompiledTemplate($resource_name = null, $compile_id = null, $exp_time = null)
+    public function testInstall(&$errors = null)
     {
-        return Smarty_Internal_Utility::clearCompiledTemplate($resource_name, $compile_id, $exp_time, $this);
+        Smarty_Internal_TestInstall::testInstall($this, $errors);
     }
 
+    /**
+     * Class destructor
+     */
+    public function __destruct()
+    {
+        $i = 0;// intentionally left blank
+    }
 
     /**
-     * Return array of tag/attributes of all tags used by an template
+     * <<magic>> Generic getter.
+     * Calls the appropriate getter function.
+     * Issues an E_USER_NOTICE if no valid getter is found.
+     *
+     * @param  string $name property name
      *
-     * @param object $templae template object
-     * @return array of tag/attributes
+     * @return mixed
      */
-    public function getTags(Smarty_Internal_Template $template)
+    public function __get($name)
     {
-        return Smarty_Internal_Utility::getTags($template);
+
+        if (isset(self::$accessMap[$name])) {
+            return $this->{self::$accessMap[$name]}();
+        } elseif (in_array($name, self::$obsoleteProperties)) {
+            return null;
+        } else {
+            trigger_error('Undefined property: ' . get_class($this) . '::$' . $name, E_USER_NOTICE);
+        }
     }
 
     /**
-     * Run installation test
+     * <<magic>> Generic setter.
+     * Calls the appropriate setter function.
+     * Issues an E_USER_NOTICE if no valid setter is found.
      *
-     * @param array $errors Array to write errors into, rather than outputting them
-     * @return boolean true if setup is fine, false if something is wrong
+     * @param string $name  property name
+     * @param mixed  $value parameter passed to setter
      */
-    public function testInstall(&$errors=null)
+    public function __set($name, $value)
     {
-        return Smarty_Internal_Utility::testInstall($this, $errors);
+        if (isset(self::$accessMap[$name])) {
+            $this->{self::$accessMap[$name]}($value);
+        } elseif (in_array($name, self::$obsoleteProperties)) {
+            return;
+        } else {
+            if (is_object($value) && method_exists($value, $name)) {
+                $this->$name = $value;
+            } else {
+                trigger_error('Undefined property: ' . get_class($this) . '::$' . $name, E_USER_NOTICE);
+            }
+        }
     }
 
     /**
      * Error Handler to mute expected messages
      *
      * @link http://php.net/set_error_handler
-     * @param integer $errno Error level
+     *
+     * @param  integer $errno Error level
+     * @param          $errstr
+     * @param          $errfile
+     * @param          $errline
+     * @param          $errcontext
+     *
      * @return boolean
      */
     public static function mutingErrorHandler($errno, $errstr, $errfile, $errline, $errcontext)
@@ -1393,10 +1396,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),);
             }
         }
 
@@ -1410,10 +1411,7 @@ 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;
@@ -1425,7 +1423,8 @@ class Smarty extends Smarty_Internal_TemplateBase {
         // or the error was within smarty but masked to be ignored
         if (!$_is_muted_directory || ($errno && $errno & error_reporting())) {
             if (Smarty::$_previous_error_handler) {
-                return call_user_func(Smarty::$_previous_error_handler, $errno, $errstr, $errfile, $errline, $errcontext);
+                return call_user_func(Smarty::$_previous_error_handler, $errno, $errstr, $errfile, $errline,
+                                      $errcontext);
             } else {
                 return false;
             }
@@ -1474,55 +1473,3 @@ class Smarty extends Smarty_Internal_TemplateBase {
         restore_error_handler();
     }
 }
-
-// Check if we're running on windows
-Smarty::$_IS_WINDOWS = strtoupper(substr(PHP_OS, 0, 3)) === 'WIN';
-
-// let PCRE (preg_*) treat strings as ISO-8859-1 if we're not dealing with UTF-8
-if (Smarty::$_CHARSET !== 'UTF-8') {
-    Smarty::$_UTF8_MODIFIER = '';
-}
-
-/**
- * Smarty exception class
- * @package Smarty
- */
-class SmartyException extends Exception {
-    public static $escape = true;
-    public function __construct($message) {
-        $this->message = self::$escape ? htmlentities($message) : $message;
-    }
-}
-
-/**
- * Smarty compiler exception class
- * @package Smarty
- */
-class SmartyCompilerException extends SmartyException  {
-}
-
-/**
- * Autoloader
- */
-function smartyAutoload($class)
-{
-    $_class = strtolower($class);
-    $_classes = array(
-        'smarty_config_source' => true,
-        'smarty_config_compiled' => true,
-        'smarty_security' => true,
-        'smarty_cacheresource' => true,
-        'smarty_cacheresource_custom' => true,
-        'smarty_cacheresource_keyvaluestore' => true,
-        'smarty_resource' => true,
-        'smarty_resource_custom' => true,
-        'smarty_resource_uncompiled' => true,
-        'smarty_resource_recompiled' => true,
-    );
-
-    if (!strncmp($_class, 'smarty_internal_', 16) || isset($_classes[$_class])) {
-        include SMARTY_SYSPLUGINS_DIR . $_class . '.php';
-    }
-}
-
-?>
diff --git a/include/smarty/libs/SmartyBC.class.php b/include/smarty/libs/SmartyBC.class.php
index 589dcca27..1dd529c9c 100644
--- a/include/smarty/libs/SmartyBC.class.php
+++ b/include/smarty/libs/SmartyBC.class.php
@@ -3,60 +3,62 @@
  * Project:     Smarty: the PHP compiling template engine
  * File:        SmartyBC.class.php
  * SVN:         $Id: $
- *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2.1 of the License, or (at your option) any later version.
- *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
- *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
  * For questions, help, comments, discussion, etc., please join the
  * Smarty mailing list. Send a blank e-mail to
  * smarty-discussion-subscribe@googlegroups.com
  *
- * @link http://www.smarty.net/
+ * @link      http://www.smarty.net/
  * @copyright 2008 New Digital Group, Inc.
- * @author Monte Ohrt <monte at ohrt dot com>
- * @author Uwe Tews
- * @author Rodney Rehm
- * @package Smarty
+ * @author    Monte Ohrt <monte at ohrt dot com>
+ * @author    Uwe Tews
+ * @author    Rodney Rehm
+ * @package   Smarty
  */
 /**
  * @ignore
  */
-require(dirname(__FILE__) . '/Smarty.class.php');
+require_once(dirname(__FILE__) . '/Smarty.class.php');
 
 /**
  * Smarty Backward Compatability Wrapper Class
  *
  * @package Smarty
  */
-class SmartyBC extends Smarty {
-
+class SmartyBC extends Smarty
+{
     /**
      * Smarty 2 BC
+     *
      * @var string
      */
     public $_version = self::SMARTY_VERSION;
 
     /**
+     * This is an array of directories where trusted php scripts reside.
+     *
+     * @var array
+     */
+    public $trusted_dir = array();
+
+    /**
      * Initialize new SmartyBC object
      *
      * @param array $options options to set during initialization, e.g. array( 'forceCompile' => false )
      */
-    public function __construct(array $options=array())
+    public function __construct(array $options = array())
     {
         parent::__construct($options);
-        // register {php} tag
-        $this->registerPlugin('block', 'php', 'smarty_php_tag');
     }
 
     /**
@@ -100,7 +102,7 @@ class SmartyBC extends Smarty {
      * @param bool   $cacheable
      * @param mixed  $cache_attrs
      */
-    public function register_function($function, $function_impl, $cacheable=true, $cache_attrs=null)
+    public function register_function($function, $function_impl, $cacheable = true, $cache_attrs = null)
     {
         $this->registerPlugin('function', $function, $function_impl, $cacheable, $cache_attrs);
     }
@@ -118,11 +120,14 @@ 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 array   $block_functs list of methods that are block format
+     * @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
+     * @internal param array $block_functs list of methods that are block format
      */
     public function register_object($object, $object_impl, $allowed = array(), $smarty_args = true, $block_methods = array())
     {
@@ -149,7 +154,7 @@ class SmartyBC extends Smarty {
      * @param bool   $cacheable
      * @param mixed  $cache_attrs
      */
-    public function register_block($block, $block_impl, $cacheable=true, $cache_attrs=null)
+    public function register_block($block, $block_impl, $cacheable = true, $cache_attrs = null)
     {
         $this->registerPlugin('block', $block, $block_impl, $cacheable, $cache_attrs);
     }
@@ -171,7 +176,7 @@ class SmartyBC extends Smarty {
      * @param string $function_impl name of PHP function to register
      * @param bool   $cacheable
      */
-    public function register_compiler_function($function, $function_impl, $cacheable=true)
+    public function register_compiler_function($function, $function_impl, $cacheable = true)
     {
         $this->registerPlugin('compiler', $function, $function_impl, $cacheable);
     }
@@ -189,7 +194,7 @@ class SmartyBC extends Smarty {
     /**
      * Registers modifier to be used in templates
      *
-     * @param string $modifier name of template modifier
+     * @param string $modifier      name of template modifier
      * @param string $modifier_impl name of PHP function to register
      */
     public function register_modifier($modifier, $modifier_impl)
@@ -305,10 +310,11 @@ class SmartyBC extends Smarty {
     /**
      * clear cached content for the given template and cache id
      *
-     * @param string $tpl_file   name of template file
-     * @param string $cache_id   name of cache_id
-     * @param string $compile_id name of compile_id
-     * @param string $exp_time   expiration time
+     * @param  string $tpl_file   name of template file
+     * @param  string $cache_id   name of cache_id
+     * @param  string $compile_id name of compile_id
+     * @param  string $exp_time   expiration time
+     *
      * @return boolean
      */
     public function clear_cache($tpl_file = null, $cache_id = null, $compile_id = null, $exp_time = null)
@@ -319,7 +325,8 @@ class SmartyBC extends Smarty {
     /**
      * clear the entire contents of cache (all templates)
      *
-     * @param string $exp_time expire time
+     * @param  string $exp_time expire time
+     *
      * @return boolean
      */
     public function clear_all_cache($exp_time = null)
@@ -330,9 +337,10 @@ class SmartyBC extends Smarty {
     /**
      * test to see if valid cache exists for this template
      *
-     * @param string $tpl_file name of template file
-     * @param string $cache_id
-     * @param string $compile_id
+     * @param  string $tpl_file name of template file
+     * @param  string $cache_id
+     * @param  string $compile_id
+     *
      * @return boolean
      */
     public function is_cached($tpl_file, $cache_id = null, $compile_id = null)
@@ -353,9 +361,10 @@ class SmartyBC extends Smarty {
      * or all compiled template files if one is not specified.
      * This function is for advanced use only, not normally needed.
      *
-     * @param string $tpl_file
-     * @param string $compile_id
-     * @param string $exp_time
+     * @param  string $tpl_file
+     * @param  string $compile_id
+     * @param  string $exp_time
+     *
      * @return boolean results of {@link smarty_core_rm_auto()}
      */
     public function clear_compiled_tpl($tpl_file = null, $compile_id = null, $exp_time = null)
@@ -366,7 +375,8 @@ class SmartyBC extends Smarty {
     /**
      * Checks whether requested template exists.
      *
-     * @param string $tpl_file
+     * @param  string $tpl_file
+     *
      * @return boolean
      */
     public function template_exists($tpl_file)
@@ -377,10 +387,11 @@ class SmartyBC extends Smarty {
     /**
      * Returns an array containing template variables
      *
-     * @param string $name
+     * @param  string $name
+     *
      * @return array
      */
-    public function get_template_vars($name=null)
+    public function get_template_vars($name = null)
     {
         return $this->getTemplateVars($name);
     }
@@ -388,10 +399,11 @@ class SmartyBC extends Smarty {
     /**
      * Returns an array containing config variables
      *
-     * @param string $name
+     * @param  string $name
+     *
      * @return array
      */
-    public function get_config_vars($name=null)
+    public function get_config_vars($name = null)
     {
         return $this->getConfigVars($name);
     }
@@ -411,7 +423,8 @@ class SmartyBC extends Smarty {
     /**
      * return a reference to a registered object
      *
-     * @param string $name
+     * @param  string $name
+     *
      * @return object
      */
     public function get_registered_object($name)
@@ -432,29 +445,11 @@ class SmartyBC extends Smarty {
     /**
      * trigger Smarty error
      *
-     * @param string $error_msg
+     * @param string  $error_msg
      * @param integer $error_type
      */
     public function trigger_error($error_msg, $error_type = E_USER_WARNING)
     {
         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 '';
-}
-
-?>
\ No newline at end of file
diff --git a/include/smarty/libs/debug.tpl b/include/smarty/libs/debug.tpl
index 12eef0ffd..5526cbca8 100644
--- a/include/smarty/libs/debug.tpl
+++ b/include/smarty/libs/debug.tpl
@@ -1,133 +1,160 @@
 {capture name='_smarty_debug' assign=debug_output}
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
-<head>
-    <title>Smarty Debug Console</title>
-<style type="text/css">
-{literal}
-body, h1, h2, td, th, p {
-    font-family: sans-serif;
-    font-weight: normal;
-    font-size: 0.9em;
-    margin: 1px;
-    padding: 0;
-}
-
-h1 {
-    margin: 0;
-    text-align: left;
-    padding: 2px;
-    background-color: #f0c040;
-    color:  black;
-    font-weight: bold;
-    font-size: 1.2em;
- }
-
-h2 {
-    background-color: #9B410E;
-    color: white;
-    text-align: left;
-    font-weight: bold;
-    padding: 2px;
-    border-top: 1px solid black;
-}
-
-body {
-    background: black; 
-}
-
-p, table, div {
-    background: #f0ead8;
-} 
-
-p {
-    margin: 0;
-    font-style: italic;
-    text-align: center;
-}
-
-table {
-    width: 100%;
-}
-
-th, td {
-    font-family: monospace;
-    vertical-align: top;
-    text-align: left;
-    width: 50%;
-}
-
-td {
-    color: green;
-}
-
-.odd {
-    background-color: #eeeeee;
-}
-
-.even {
-    background-color: #fafafa;
-}
-
-.exectime {
-    font-size: 0.8em;
-    font-style: italic;
-}
-
-#table_assigned_vars th {
-    color: blue;
-}
-
-#table_config_vars th {
-    color: maroon;
-}
-{/literal}
-</style>
-</head>
-<body>
-
-<h1>Smarty Debug Console  -  {if isset($template_name)}{$template_name|debug_print_var nofilter}{else}Total Time {$execution_time|string_format:"%.5f"}{/if}</h1>
-
-{if !empty($template_data)}
-<h2>included templates &amp; config files (load time in seconds)</h2>
-
-<div>
-{foreach $template_data as $template}
-  <font color=brown>{$template.name}</font>
-  <span class="exectime">
-   (compile {$template['compile_time']|string_format:"%.5f"}) (render {$template['render_time']|string_format:"%.5f"}) (cache {$template['cache_time']|string_format:"%.5f"})
-  </span>
-  <br>
-{/foreach}
-</div>
-{/if}
-
-<h2>assigned template variables</h2>
-
-<table id="table_assigned_vars">
-    {foreach $assigned_vars as $vars}
-       <tr class="{if $vars@iteration % 2 eq 0}odd{else}even{/if}">   
-       <th>${$vars@key|escape:'html'}</th>
-       <td>{$vars|debug_print_var nofilter}</td></tr>
-    {/foreach}
-</table>
-
-<h2>assigned config file variables (outer template scope)</h2>
-
-<table id="table_config_vars">
-    {foreach $config_vars as $vars}
-       <tr class="{if $vars@iteration % 2 eq 0}odd{else}even{/if}">   
-       <th>{$vars@key|escape:'html'}</th>
-       <td>{$vars|debug_print_var nofilter}</td></tr>
-    {/foreach}
-
-</table>
-</body>
-</html>
+    <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+    <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+    <head>
+        <title>Smarty Debug Console</title>
+        <style type="text/css">
+            {literal}
+            body, h1, h2, h3, td, th, p {
+                font-family: sans-serif;
+                font-weight: normal;
+                font-size: 0.9em;
+                margin: 1px;
+                padding: 0;
+            }
+
+            h1 {
+                margin: 0;
+                text-align: left;
+                padding: 2px;
+                background-color: #f0c040;
+                color: black;
+                font-weight: bold;
+                font-size: 1.2em;
+            }
+
+            h2 {
+                background-color: #9B410E;
+                color: white;
+                text-align: left;
+                font-weight: bold;
+                padding: 2px;
+                border-top: 1px solid black;
+            }
+            h3 {
+                text-align: left;
+                font-weight: bold;
+                color: black;
+                font-size: 0.7em;
+                padding: 2px;
+            }
+
+            body {
+                background: black;
+            }
+
+            p, table, div {
+                background: #f0ead8;
+            }
+
+            p {
+                margin: 0;
+                font-style: italic;
+                text-align: center;
+            }
+
+            table {
+                width: 100%;
+            }
+
+            th, td {
+                font-family: monospace;
+                vertical-align: top;
+                text-align: left;
+            }
+
+            td {
+                color: green;
+            }
+
+            .odd {
+                background-color: #eeeeee;
+            }
+
+            .even {
+                background-color: #fafafa;
+            }
+
+            .exectime {
+                font-size: 0.8em;
+                font-style: italic;
+            }
+
+            #bold div {
+                color: black;
+                font-weight: bold;
+            }
+            #blue h3 {
+                color: blue;
+            }
+            #normal div {
+                color: black;
+                font-weight: normal;
+            }
+            #table_assigned_vars th {
+                color: blue;
+                font-weight: bold;
+            }
+
+            #table_config_vars th {
+                color: maroon;
+            }
+
+            {/literal}
+        </style>
+    </head>
+    <body>
+
+    <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)}
+        <h2>included templates &amp; config files (load time in seconds)</h2>
+        <div>
+            {foreach $template_data as $template}
+                <font color=brown>{$template.name}</font>
+                <br>&nbsp;&nbsp;<span class="exectime">
+                (compile {$template['compile_time']|string_format:"%.5f"}) (render {$template['render_time']|string_format:"%.5f"}) (cache {$template['cache_time']|string_format:"%.5f"})
+                 </span>
+                <br>
+            {/foreach}
+        </div>
+    {/if}
+
+    <h2>assigned template variables</h2>
+
+    <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}</font></h3>
+                    {if isset($vars['nocache'])}<b>Nocache</b></br>{/if}
+                    {if isset($vars['scope'])}<b>Origin:</b> {$vars['scope']|debug_print_var nofilter}{/if}
+                </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>
+
+    <h2>assigned config file variables</h2>
+
+    <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}#</font></h3>
+                    {if isset($vars['scope'])}<b>Origin:</b> {$vars['scope']|debug_print_var nofilter}{/if}
+                </td>
+                <td>{$vars['value']|debug_print_var:10:80 nofilter}</td>
+            </tr>
+        {/foreach}
+
+    </table>
+    </body>
+    </html>
 {/capture}
 <script type="text/javascript">
-{$id = $template_name|default:''|md5}
-    _smarty_console = window.open("","console{$id}","width=680,height=600,resizable,scrollbars=yes");
+    {$id = '__Smarty__'}
+    {if $display_mode}{$id = "$offset$template_name"|md5}{/if}
+    _smarty_console = window.open("", "console{$id}", "width=1024,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/include/smarty/libs/plugins/block.textformat.php b/include/smarty/libs/plugins/block.textformat.php
index b22b104a5..abf544939 100644
--- a/include/smarty/libs/plugins/block.textformat.php
+++ b/include/smarty/libs/plugins/block.textformat.php
@@ -2,13 +2,12 @@
 /**
  * Smarty plugin to format text blocks
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage PluginsBlock
  */
 
 /**
  * Smarty {textformat}{/textformat} block plugin
- *
  * Type:     block function<br>
  * Name:     textformat<br>
  * Purpose:  format text a certain way with preset styles
@@ -23,12 +22,14 @@
  * - wrap_boundary - boolean (true)
  * </pre>
  *
- * @link http://www.smarty.net/manual/en/language.function.textformat.php {textformat}
- *       (Smarty online manual)
+ * @link   http://www.smarty.net/manual/en/language.function.textformat.php {textformat}
+ *         (Smarty online manual)
+ *
  * @param array                    $params   parameters
  * @param string                   $content  contents of the block
  * @param Smarty_Internal_Template $template template object
  * @param boolean                  &$repeat  repeat flag
+ *
  * @return string content re-formatted
  * @author Monte Ohrt <monte at ohrt dot com>
  */
@@ -53,17 +54,17 @@ function smarty_block_textformat($params, $content, $template, &$repeat)
             case 'indent_char':
             case 'wrap_char':
             case 'assign':
-                $$_key = (string)$_val;
+                $$_key = (string) $_val;
                 break;
 
             case 'indent':
             case 'indent_first':
             case 'wrap':
-                $$_key = (int)$_val;
+                $$_key = (int) $_val;
                 break;
 
             case 'wrap_cut':
-                $$_key = (bool)$_val;
+                $$_key = (bool) $_val;
                 break;
 
             default:
@@ -76,8 +77,6 @@ function smarty_block_textformat($params, $content, $template, &$repeat)
     }
     // split into paragraphs
     $_paragraphs = preg_split('![\r\n]{2}!', $content);
-    $_output = '';
-
 
     foreach ($_paragraphs as &$_paragraph) {
         if (!$_paragraph) {
@@ -102,12 +101,10 @@ function smarty_block_textformat($params, $content, $template, &$repeat)
         }
     }
     $_output = implode($wrap_char . $wrap_char, $_paragraphs);
-    
+
     if ($assign) {
         $template->assign($assign, $_output);
     } else {
         return $_output;
     }
 }
-
-?>
\ No newline at end of file
diff --git a/include/smarty/libs/plugins/function.counter.php b/include/smarty/libs/plugins/function.counter.php
index 3906badf0..4da85a14e 100644
--- a/include/smarty/libs/plugins/function.counter.php
+++ b/include/smarty/libs/plugins/function.counter.php
@@ -1,22 +1,24 @@
 <?php
 /**
  * Smarty plugin
- * @package Smarty
+ *
+ * @package    Smarty
  * @subpackage PluginsFunction
  */
 
 /**
  * Smarty {counter} function plugin
- *
  * Type:     function<br>
  * Name:     counter<br>
  * Purpose:  print out a counter value
  *
  * @author Monte Ohrt <monte at ohrt dot com>
- * @link http://www.smarty.net/manual/en/language.function.counter.php {counter}
- *       (Smarty online manual)
+ * @link   http://www.smarty.net/manual/en/language.function.counter.php {counter}
+ *         (Smarty online manual)
+ *
  * @param array                    $params   parameters
  * @param Smarty_Internal_Template $template template object
+ *
  * @return string|null
  */
 function smarty_function_counter($params, $template)
@@ -26,16 +28,16 @@ function smarty_function_counter($params, $template)
     $name = (isset($params['name'])) ? $params['name'] : 'default';
     if (!isset($counters[$name])) {
         $counters[$name] = array(
-            'start'=>1,
-            'skip'=>1,
-            'direction'=>'up',
-            'count'=>1
-            );
+            'start'     => 1,
+            'skip'      => 1,
+            'direction' => 'up',
+            'count'     => 1
+        );
     }
     $counter =& $counters[$name];
 
     if (isset($params['start'])) {
-        $counter['start'] = $counter['count'] = (int)$params['start'];
+        $counter['start'] = $counter['count'] = (int) $params['start'];
     }
 
     if (!empty($params['assign'])) {
@@ -45,9 +47,9 @@ function smarty_function_counter($params, $template)
     if (isset($counter['assign'])) {
         $template->assign($counter['assign'], $counter['count']);
     }
-    
+
     if (isset($params['print'])) {
-        $print = (bool)$params['print'];
+        $print = (bool) $params['print'];
     } else {
         $print = empty($counter['assign']);
     }
@@ -61,18 +63,16 @@ function smarty_function_counter($params, $template)
     if (isset($params['skip'])) {
         $counter['skip'] = $params['skip'];
     }
-    
+
     if (isset($params['direction'])) {
         $counter['direction'] = $params['direction'];
     }
 
-    if ($counter['direction'] == "down")
+    if ($counter['direction'] == "down") {
         $counter['count'] -= $counter['skip'];
-    else
+    } else {
         $counter['count'] += $counter['skip'];
-    
+    }
+
     return $retval;
-    
 }
-
-?>
\ No newline at end of file
diff --git a/include/smarty/libs/plugins/function.cycle.php b/include/smarty/libs/plugins/function.cycle.php
index 1778ffb53..8dc5cd9d5 100644
--- a/include/smarty/libs/plugins/function.cycle.php
+++ b/include/smarty/libs/plugins/function.cycle.php
@@ -2,13 +2,12 @@
 /**
  * Smarty plugin
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage PluginsFunction
  */
 
 /**
  * Smarty {cycle} function plugin
- *
  * Type:     function<br>
  * Name:     cycle<br>
  * Date:     May 3, 2002<br>
@@ -31,15 +30,17 @@
  * {cycle name=row}
  * </pre>
  *
- * @link http://www.smarty.net/manual/en/language.function.cycle.php {cycle}
- *       (Smarty online manual)
- * @author Monte Ohrt <monte at ohrt dot com>
- * @author credit to Mark Priatel <mpriatel@rogers.com>
- * @author credit to Gerard <gerard@interfold.com>
- * @author credit to Jason Sweat <jsweat_php@yahoo.com>
+ * @link     http://www.smarty.net/manual/en/language.function.cycle.php {cycle}
+ *           (Smarty online manual)
+ * @author   Monte Ohrt <monte at ohrt dot com>
+ * @author   credit to Mark Priatel <mpriatel@rogers.com>
+ * @author   credit to Gerard <gerard@interfold.com>
+ * @author   credit to Jason Sweat <jsweat_php@yahoo.com>
  * @version  1.3
+ *
  * @param array                    $params   parameters
  * @param Smarty_Internal_Template $template template object
+ *
  * @return string|null
  */
 
@@ -48,18 +49,20 @@ function smarty_function_cycle($params, $template)
     static $cycle_vars;
 
     $name = (empty($params['name'])) ? 'default' : $params['name'];
-    $print = (isset($params['print'])) ? (bool)$params['print'] : true;
-    $advance = (isset($params['advance'])) ? (bool)$params['advance'] : true;
-    $reset = (isset($params['reset'])) ? (bool)$params['reset'] : false;
+    $print = (isset($params['print'])) ? (bool) $params['print'] : true;
+    $advance = (isset($params['advance'])) ? (bool) $params['advance'] : true;
+    $reset = (isset($params['reset'])) ? (bool) $params['reset'] : false;
 
     if (!isset($params['values'])) {
-        if(!isset($cycle_vars[$name]['values'])) {
+        if (!isset($cycle_vars[$name]['values'])) {
             trigger_error("cycle: missing 'values' parameter");
+
             return;
         }
     } else {
-        if(isset($cycle_vars[$name]['values'])
-            && $cycle_vars[$name]['values'] != $params['values'] ) {
+        if (isset($cycle_vars[$name]['values'])
+            && $cycle_vars[$name]['values'] != $params['values']
+        ) {
             $cycle_vars[$name]['index'] = 0;
         }
         $cycle_vars[$name]['values'] = $params['values'];
@@ -71,13 +74,13 @@ function smarty_function_cycle($params, $template)
         $cycle_vars[$name]['delimiter'] = ',';
     }
 
-    if(is_array($cycle_vars[$name]['values'])) {
+    if (is_array($cycle_vars[$name]['values'])) {
         $cycle_array = $cycle_vars[$name]['values'];
     } else {
-        $cycle_array = explode($cycle_vars[$name]['delimiter'],$cycle_vars[$name]['values']);
+        $cycle_array = explode($cycle_vars[$name]['delimiter'], $cycle_vars[$name]['values']);
     }
 
-    if(!isset($cycle_vars[$name]['index']) || $reset ) {
+    if (!isset($cycle_vars[$name]['index']) || $reset) {
         $cycle_vars[$name]['index'] = 0;
     }
 
@@ -86,21 +89,19 @@ function smarty_function_cycle($params, $template)
         $template->assign($params['assign'], $cycle_array[$cycle_vars[$name]['index']]);
     }
 
-    if($print) {
+    if ($print) {
         $retval = $cycle_array[$cycle_vars[$name]['index']];
     } else {
         $retval = null;
     }
 
-    if($advance) {
-        if ( $cycle_vars[$name]['index'] >= count($cycle_array) -1 ) {
+    if ($advance) {
+        if ($cycle_vars[$name]['index'] >= count($cycle_array) - 1) {
             $cycle_vars[$name]['index'] = 0;
         } else {
-            $cycle_vars[$name]['index']++;
+            $cycle_vars[$name]['index'] ++;
         }
     }
 
     return $retval;
 }
-
-?>
\ No newline at end of file
diff --git a/include/smarty/libs/plugins/function.fetch.php b/include/smarty/libs/plugins/function.fetch.php
index eca1182d5..3506d4a8d 100644
--- a/include/smarty/libs/plugins/function.fetch.php
+++ b/include/smarty/libs/plugins/function.fetch.php
@@ -2,50 +2,53 @@
 /**
  * Smarty plugin
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage PluginsFunction
  */
 
 /**
  * Smarty {fetch} plugin
- *
  * Type:     function<br>
  * Name:     fetch<br>
  * Purpose:  fetch file, web or ftp data and display results
  *
- * @link http://www.smarty.net/manual/en/language.function.fetch.php {fetch}
- *       (Smarty online manual)
+ * @link   http://www.smarty.net/manual/en/language.function.fetch.php {fetch}
+ *         (Smarty online manual)
  * @author Monte Ohrt <monte at ohrt dot com>
+ *
  * @param array                    $params   parameters
  * @param Smarty_Internal_Template $template template object
+ *
+ * @throws SmartyException
  * @return string|null if the assign parameter is passed, Smarty assigns the result to a template variable
  */
 function smarty_function_fetch($params, $template)
 {
     if (empty($params['file'])) {
-        trigger_error("[plugin] fetch parameter 'file' cannot be empty",E_USER_NOTICE);
+        trigger_error("[plugin] fetch parameter 'file' cannot be empty", E_USER_NOTICE);
+
         return;
     }
-    
+
     // strip file protocol
     if (stripos($params['file'], 'file://') === 0) {
         $params['file'] = substr($params['file'], 7);
     }
-    
+
     $protocol = strpos($params['file'], '://');
     if ($protocol !== false) {
         $protocol = strtolower(substr($params['file'], 0, $protocol));
     }
-    
+
     if (isset($template->smarty->security_policy)) {
         if ($protocol) {
             // remote resource (or php stream, …)
-            if(!$template->smarty->security_policy->isTrustedUri($params['file'])) {
+            if (!$template->smarty->security_policy->isTrustedUri($params['file'])) {
                 return;
             }
         } else {
             // local file
-            if(!$template->smarty->security_policy->isTrustedResourceDir($params['file'])) {
+            if (!$template->smarty->security_policy->isTrustedResourceDir($params['file'])) {
                 return;
             }
         }
@@ -54,53 +57,54 @@ function smarty_function_fetch($params, $template)
     $content = '';
     if ($protocol == 'http') {
         // http fetch
-        if($uri_parts = parse_url($params['file'])) {
+        if ($uri_parts = parse_url($params['file'])) {
             // set defaults
             $host = $server_name = $uri_parts['host'];
             $timeout = 30;
             $accept = "image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*";
-            $agent = "Smarty Template Engine ". Smarty::SMARTY_VERSION;
+            $agent = "Smarty Template Engine " . Smarty::SMARTY_VERSION;
             $referer = "";
             $uri = !empty($uri_parts['path']) ? $uri_parts['path'] : '/';
             $uri .= !empty($uri_parts['query']) ? '?' . $uri_parts['query'] : '';
             $_is_proxy = false;
-            if(empty($uri_parts['port'])) {
+            if (empty($uri_parts['port'])) {
                 $port = 80;
             } else {
                 $port = $uri_parts['port'];
             }
-            if(!empty($uri_parts['user'])) {
+            if (!empty($uri_parts['user'])) {
                 $user = $uri_parts['user'];
             }
-            if(!empty($uri_parts['pass'])) {
+            if (!empty($uri_parts['pass'])) {
                 $pass = $uri_parts['pass'];
             }
             // loop through parameters, setup headers
-            foreach($params as $param_key => $param_value) {
-                switch($param_key) {
+            foreach ($params as $param_key => $param_value) {
+                switch ($param_key) {
                     case "file":
                     case "assign":
                     case "assign_headers":
                         break;
                     case "user":
-                        if(!empty($param_value)) {
+                        if (!empty($param_value)) {
                             $user = $param_value;
                         }
                         break;
                     case "pass":
-                        if(!empty($param_value)) {
+                        if (!empty($param_value)) {
                             $pass = $param_value;
                         }
                         break;
                     case "accept":
-                        if(!empty($param_value)) {
+                        if (!empty($param_value)) {
                             $accept = $param_value;
                         }
                         break;
                     case "header":
-                        if(!empty($param_value)) {
-                            if(!preg_match('![\w\d-]+: .+!',$param_value)) {
-                                trigger_error("[plugin] invalid header format '".$param_value."'",E_USER_NOTICE);
+                        if (!empty($param_value)) {
+                            if (!preg_match('![\w\d-]+: .+!', $param_value)) {
+                                trigger_error("[plugin] invalid header format '" . $param_value . "'", E_USER_NOTICE);
+
                                 return;
                             } else {
                                 $extra_headers[] = $param_value;
@@ -108,99 +112,104 @@ function smarty_function_fetch($params, $template)
                         }
                         break;
                     case "proxy_host":
-                        if(!empty($param_value)) {
+                        if (!empty($param_value)) {
                             $proxy_host = $param_value;
                         }
                         break;
                     case "proxy_port":
-                        if(!preg_match('!\D!', $param_value)) {
+                        if (!preg_match('!\D!', $param_value)) {
                             $proxy_port = (int) $param_value;
                         } else {
-                            trigger_error("[plugin] invalid value for attribute '".$param_key."'",E_USER_NOTICE);
+                            trigger_error("[plugin] invalid value for attribute '" . $param_key . "'", E_USER_NOTICE);
+
                             return;
                         }
                         break;
                     case "agent":
-                        if(!empty($param_value)) {
+                        if (!empty($param_value)) {
                             $agent = $param_value;
                         }
                         break;
                     case "referer":
-                        if(!empty($param_value)) {
+                        if (!empty($param_value)) {
                             $referer = $param_value;
                         }
                         break;
                     case "timeout":
-                        if(!preg_match('!\D!', $param_value)) {
+                        if (!preg_match('!\D!', $param_value)) {
                             $timeout = (int) $param_value;
                         } else {
-                            trigger_error("[plugin] invalid value for attribute '".$param_key."'",E_USER_NOTICE);
+                            trigger_error("[plugin] invalid value for attribute '" . $param_key . "'", E_USER_NOTICE);
+
                             return;
                         }
                         break;
                     default:
-                        trigger_error("[plugin] unrecognized attribute '".$param_key."'",E_USER_NOTICE);
+                        trigger_error("[plugin] unrecognized attribute '" . $param_key . "'", E_USER_NOTICE);
+
                         return;
                 }
             }
-            if(!empty($proxy_host) && !empty($proxy_port)) {
+            if (!empty($proxy_host) && !empty($proxy_port)) {
                 $_is_proxy = true;
-                $fp = fsockopen($proxy_host,$proxy_port,$errno,$errstr,$timeout);
+                $fp = fsockopen($proxy_host, $proxy_port, $errno, $errstr, $timeout);
             } else {
-                $fp = fsockopen($server_name,$port,$errno,$errstr,$timeout);
+                $fp = fsockopen($server_name, $port, $errno, $errstr, $timeout);
             }
 
-            if(!$fp) {
-                trigger_error("[plugin] unable to fetch: $errstr ($errno)",E_USER_NOTICE);
+            if (!$fp) {
+                trigger_error("[plugin] unable to fetch: $errstr ($errno)", E_USER_NOTICE);
+
                 return;
             } else {
-                if($_is_proxy) {
+                if ($_is_proxy) {
                     fputs($fp, 'GET ' . $params['file'] . " HTTP/1.0\r\n");
                 } else {
                     fputs($fp, "GET $uri HTTP/1.0\r\n");
                 }
-                if(!empty($host)) {
+                if (!empty($host)) {
                     fputs($fp, "Host: $host\r\n");
                 }
-                if(!empty($accept)) {
+                if (!empty($accept)) {
                     fputs($fp, "Accept: $accept\r\n");
                 }
-                if(!empty($agent)) {
+                if (!empty($agent)) {
                     fputs($fp, "User-Agent: $agent\r\n");
                 }
-                if(!empty($referer)) {
+                if (!empty($referer)) {
                     fputs($fp, "Referer: $referer\r\n");
                 }
-                if(isset($extra_headers) && is_array($extra_headers)) {
-                    foreach($extra_headers as $curr_header) {
-                        fputs($fp, $curr_header."\r\n");
+                if (isset($extra_headers) && is_array($extra_headers)) {
+                    foreach ($extra_headers as $curr_header) {
+                        fputs($fp, $curr_header . "\r\n");
                     }
                 }
-                if(!empty($user) && !empty($pass)) {
-                    fputs($fp, "Authorization: BASIC ".base64_encode("$user:$pass")."\r\n");
+                if (!empty($user) && !empty($pass)) {
+                    fputs($fp, "Authorization: BASIC " . base64_encode("$user:$pass") . "\r\n");
                 }
 
                 fputs($fp, "\r\n");
-                while(!feof($fp)) {
-                    $content .= fgets($fp,4096);
+                while (!feof($fp)) {
+                    $content .= fgets($fp, 4096);
                 }
                 fclose($fp);
-                $csplit = preg_split("!\r\n\r\n!",$content,2);
+                $csplit = preg_split("!\r\n\r\n!", $content, 2);
 
                 $content = $csplit[1];
 
-                if(!empty($params['assign_headers'])) {
-                    $template->assign($params['assign_headers'],preg_split("!\r\n!",$csplit[0]));
+                if (!empty($params['assign_headers'])) {
+                    $template->assign($params['assign_headers'], preg_split("!\r\n!", $csplit[0]));
                 }
             }
         } else {
-            trigger_error("[plugin fetch] unable to parse URL, check syntax",E_USER_NOTICE);
+            trigger_error("[plugin fetch] unable to parse URL, check syntax", E_USER_NOTICE);
+
             return;
         }
     } else {
         $content = @file_get_contents($params['file']);
         if ($content === false) {
-            throw new SmartyException("{fetch} cannot read resource '" . $params['file'] ."'");
+            throw new SmartyException("{fetch} cannot read resource '" . $params['file'] . "'");
         }
     }
 
@@ -210,5 +219,3 @@ function smarty_function_fetch($params, $template)
         return $content;
     }
 }
-
-?>
\ No newline at end of file
diff --git a/include/smarty/libs/plugins/function.html_checkboxes.php b/include/smarty/libs/plugins/function.html_checkboxes.php
index 1866bc2f3..d78680368 100644
--- a/include/smarty/libs/plugins/function.html_checkboxes.php
+++ b/include/smarty/libs/plugins/function.html_checkboxes.php
@@ -2,13 +2,12 @@
 /**
  * Smarty plugin
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage PluginsFunction
  */
 
 /**
  * Smarty {html_checkboxes} function plugin
- *
  * File:       function.html_checkboxes.php<br>
  * Type:       function<br>
  * Name:       html_checkboxes<br>
@@ -32,15 +31,17 @@
  * - escape     (optional) - escape the content (not value), defaults to true
  * </pre>
  *
- * @link http://www.smarty.net/manual/en/language.function.html.checkboxes.php {html_checkboxes}
- *      (Smarty online manual)
+ * @link       http://www.smarty.net/manual/en/language.function.html.checkboxes.php {html_checkboxes}
+ *             (Smarty online manual)
  * @author     Christopher Kvarme <christopher.kvarme@flashjab.com>
- * @author credits to Monte Ohrt <monte at ohrt dot com>
+ * @author     credits to Monte Ohrt <monte at ohrt dot com>
  * @version    1.0
- * @param array $params parameters
+ *
+ * @param array  $params   parameters
  * @param object $template template object
+ *
  * @return string
- * @uses smarty_function_escape_special_chars()
+ * @uses       smarty_function_escape_special_chars()
  */
 function smarty_function_html_checkboxes($params, $template)
 {
@@ -58,8 +59,8 @@ function smarty_function_html_checkboxes($params, $template)
 
     $extra = '';
 
-    foreach($params as $_key => $_val) {
-        switch($_key) {
+    foreach ($params as $_key => $_val) {
+        switch ($_key) {
             case 'name':
             case 'separator':
                 $$_key = (string) $_val;
@@ -89,7 +90,7 @@ function smarty_function_html_checkboxes($params, $template)
                             if (method_exists($_sel, "__toString")) {
                                 $_sel = smarty_function_escape_special_chars((string) $_sel->__toString());
                             } else {
-                                trigger_error("html_checkboxes: selected attribute contains an object of class '". get_class($_sel) ."' without __toString() method", E_USER_NOTICE);
+                                trigger_error("html_checkboxes: selected attribute contains an object of class '" . get_class($_sel) . "' without __toString() method", E_USER_NOTICE);
                                 continue;
                             }
                         } else {
@@ -101,7 +102,7 @@ function smarty_function_html_checkboxes($params, $template)
                     if (method_exists($_val, "__toString")) {
                         $selected = smarty_function_escape_special_chars((string) $_val->__toString());
                     } else {
-                        trigger_error("html_checkboxes: selected attribute is an object of class '". get_class($_val) ."' without __toString() method", E_USER_NOTICE);
+                        trigger_error("html_checkboxes: selected attribute is an object of class '" . get_class($_val) . "' without __toString() method", E_USER_NOTICE);
                     }
                 } else {
                     $selected = smarty_function_escape_special_chars((string) $_val);
@@ -116,7 +117,8 @@ function smarty_function_html_checkboxes($params, $template)
             case 'assign':
                 break;
 
-            case 'strict': break;
+            case 'strict':
+                break;
 
             case 'disabled':
             case 'readonly':
@@ -131,11 +133,11 @@ function smarty_function_html_checkboxes($params, $template)
 
                     break;
                 }
-                // omit break; to fall through!
+            // omit break; to fall through!
 
             default:
-                if(!is_array($_val)) {
-                    $extra .= ' '.$_key.'="'.smarty_function_escape_special_chars($_val).'"';
+                if (!is_array($_val)) {
+                    $extra .= ' ' . $_key . '="' . smarty_function_escape_special_chars($_val) . '"';
                 } else {
                     trigger_error("html_checkboxes: extra attribute '$_key' cannot be an array", E_USER_NOTICE);
                 }
@@ -143,76 +145,79 @@ function smarty_function_html_checkboxes($params, $template)
         }
     }
 
-    if (!isset($options) && !isset($values))
-        return ''; /* raise error here? */
+    if (!isset($options) && !isset($values)) {
+        return '';
+    } /* raise error here? */
 
     $_html_result = array();
 
     if (isset($options)) {
-        foreach ($options as $_key=>$_val) {
+        foreach ($options as $_key => $_val) {
             $_html_result[] = smarty_function_html_checkboxes_output($name, $_key, $_val, $selected, $extra, $separator, $labels, $label_ids, $escape);
         }
     } else {
-        foreach ($values as $_i=>$_key) {
+        foreach ($values as $_i => $_key) {
             $_val = isset($output[$_i]) ? $output[$_i] : '';
             $_html_result[] = smarty_function_html_checkboxes_output($name, $_key, $_val, $selected, $extra, $separator, $labels, $label_ids, $escape);
         }
     }
 
-    if(!empty($params['assign'])) {
+    if (!empty($params['assign'])) {
         $template->assign($params['assign'], $_html_result);
     } else {
         return implode("\n", $_html_result);
     }
-
 }
 
-function smarty_function_html_checkboxes_output($name, $value, $output, $selected, $extra, $separator, $labels, $label_ids, $escape=true) {
+function smarty_function_html_checkboxes_output($name, $value, $output, $selected, $extra, $separator, $labels, $label_ids, $escape = true)
+{
     $_output = '';
-    
+
     if (is_object($value)) {
         if (method_exists($value, "__toString")) {
             $value = (string) $value->__toString();
         } else {
-            trigger_error("html_options: value is an object of class '". get_class($value) ."' without __toString() method", E_USER_NOTICE);
+            trigger_error("html_options: value is an object of class '" . get_class($value) . "' without __toString() method", E_USER_NOTICE);
+
             return '';
         }
     } else {
         $value = (string) $value;
     }
-    
+
     if (is_object($output)) {
         if (method_exists($output, "__toString")) {
             $output = (string) $output->__toString();
         } else {
-            trigger_error("html_options: output is an object of class '". get_class($output) ."' without __toString() method", E_USER_NOTICE);
+            trigger_error("html_options: output is an object of class '" . get_class($output) . "' without __toString() method", E_USER_NOTICE);
+
             return '';
         }
     } else {
         $output = (string) $output;
     }
-    
+
     if ($labels) {
         if ($label_ids) {
             $_id = smarty_function_escape_special_chars(preg_replace('![^\w\-\.]!' . Smarty::$_UTF8_MODIFIER, '_', $name . '_' . $value));
             $_output .= '<label for="' . $_id . '">';
         } else {
             $_output .= '<label>';
-        } 
+        }
     }
-    
+
     $name = smarty_function_escape_special_chars($name);
     $value = smarty_function_escape_special_chars($value);
     if ($escape) {
         $output = smarty_function_escape_special_chars($output);
     }
-    
+
     $_output .= '<input type="checkbox" name="' . $name . '[]" value="' . $value . '"';
-    
+
     if ($labels && $label_ids) {
         $_output .= ' id="' . $_id . '"';
     }
-    
+
     if (is_array($selected)) {
         if (isset($selected[$value])) {
             $_output .= ' checked="checked"';
@@ -220,14 +225,13 @@ function smarty_function_html_checkboxes_output($name, $value, $output, $selecte
     } elseif ($value === $selected) {
         $_output .= ' checked="checked"';
     }
-    
+
     $_output .= $extra . ' />' . $output;
     if ($labels) {
         $_output .= '</label>';
     }
-    
-    $_output .=  $separator;
+
+    $_output .= $separator;
+
     return $_output;
 }
-
-?>
\ No newline at end of file
diff --git a/include/smarty/libs/plugins/function.html_image.php b/include/smarty/libs/plugins/function.html_image.php
index 6521966bb..5037e8bd1 100644
--- a/include/smarty/libs/plugins/function.html_image.php
+++ b/include/smarty/libs/plugins/function.html_image.php
@@ -1,14 +1,13 @@
 <?php
 /**
  * Smarty plugin
- * 
- * @package Smarty
+ *
+ * @package    Smarty
  * @subpackage PluginsFunction
  */
 
 /**
  * Smarty {html_image} function plugin
- * 
  * Type:     function<br>
  * Name:     html_image<br>
  * Date:     Feb 24, 2003<br>
@@ -23,21 +22,24 @@
  * - basedir     - (optional) - base directory for absolute paths, default is environment variable DOCUMENT_ROOT
  * - path_prefix - prefix for path output (optional, default empty)
  * </pre>
- * 
- * @link http://www.smarty.net/manual/en/language.function.html.image.php {html_image}
- *      (Smarty online manual)
- * @author Monte Ohrt <monte at ohrt dot com> 
- * @author credits to Duda <duda@big.hu> 
+ *
+ * @link    http://www.smarty.net/manual/en/language.function.html.image.php {html_image}
+ *          (Smarty online manual)
+ * @author  Monte Ohrt <monte at ohrt dot com>
+ * @author  credits to Duda <duda@big.hu>
  * @version 1.0
+ *
  * @param array                    $params   parameters
  * @param Smarty_Internal_Template $template template object
- * @return string 
- * @uses smarty_function_escape_special_chars()
+ *
+ * @throws SmartyException
+ * @return string
+ * @uses    smarty_function_escape_special_chars()
  */
 function smarty_function_html_image($params, $template)
 {
     require_once(SMARTY_PLUGINS_DIR . 'shared.escape_special_chars.php');
- 
+
     $alt = '';
     $file = '';
     $height = '';
@@ -47,7 +49,7 @@ function smarty_function_html_image($params, $template)
     $suffix = '';
     $path_prefix = '';
     $basedir = isset($_SERVER['DOCUMENT_ROOT']) ? $_SERVER['DOCUMENT_ROOT'] : '';
-    foreach($params as $_key => $_val) {
+    foreach ($params as $_key => $_val) {
         switch ($_key) {
             case 'file':
             case 'height':
@@ -63,7 +65,7 @@ function smarty_function_html_image($params, $template)
                     $$_key = smarty_function_escape_special_chars($_val);
                 } else {
                     throw new SmartyException ("html_image: extra attribute '$_key' cannot be an array", E_USER_NOTICE);
-                } 
+                }
                 break;
 
             case 'link':
@@ -77,41 +79,42 @@ function smarty_function_html_image($params, $template)
                     $extra .= ' ' . $_key . '="' . smarty_function_escape_special_chars($_val) . '"';
                 } else {
                     throw new SmartyException ("html_image: extra attribute '$_key' cannot be an array", E_USER_NOTICE);
-                } 
+                }
                 break;
-        } 
-    } 
+        }
+    }
 
     if (empty($file)) {
         trigger_error("html_image: missing 'file' parameter", E_USER_NOTICE);
+
         return;
-    } 
+    }
 
     if ($file[0] == '/') {
         $_image_path = $basedir . $file;
     } else {
         $_image_path = $file;
     }
-    
+
     // strip file protocol
     if (stripos($params['file'], 'file://') === 0) {
         $params['file'] = substr($params['file'], 7);
     }
-    
+
     $protocol = strpos($params['file'], '://');
     if ($protocol !== false) {
         $protocol = strtolower(substr($params['file'], 0, $protocol));
     }
-    
+
     if (isset($template->smarty->security_policy)) {
         if ($protocol) {
             // remote resource (or php stream, …)
-            if(!$template->smarty->security_policy->isTrustedUri($params['file'])) {
+            if (!$template->smarty->security_policy->isTrustedUri($params['file'])) {
                 return;
             }
         } else {
             // local file
-            if(!$template->smarty->security_policy->isTrustedResourceDir($params['file'])) {
+            if (!$template->smarty->security_policy->isTrustedResourceDir($_image_path)) {
                 return;
             }
         }
@@ -122,23 +125,26 @@ function smarty_function_html_image($params, $template)
         if (!$_image_data = @getimagesize($_image_path)) {
             if (!file_exists($_image_path)) {
                 trigger_error("html_image: unable to find '$_image_path'", E_USER_NOTICE);
+
                 return;
-            } else if (!is_readable($_image_path)) {
+            } elseif (!is_readable($_image_path)) {
                 trigger_error("html_image: unable to read '$_image_path'", E_USER_NOTICE);
+
                 return;
             } else {
                 trigger_error("html_image: '$_image_path' is not a valid image file", E_USER_NOTICE);
+
                 return;
-            } 
+            }
         }
 
         if (!isset($params['width'])) {
             $width = $_image_data[0];
-        } 
+        }
         if (!isset($params['height'])) {
             $height = $_image_data[1];
-        } 
-    } 
+        }
+    }
 
     if (isset($params['dpi'])) {
         if (strstr($_SERVER['HTTP_USER_AGENT'], 'Mac')) {
@@ -147,13 +153,11 @@ function smarty_function_html_image($params, $template)
             $dpi_default = 72;
         } else {
             $dpi_default = 96;
-        } 
+        }
         $_resize = $dpi_default / $params['dpi'];
         $width = round($width * $_resize);
         $height = round($height * $_resize);
-    } 
+    }
 
     return $prefix . '<img src="' . $path_prefix . $file . '" alt="' . $alt . '" width="' . $width . '" height="' . $height . '"' . $extra . ' />' . $suffix;
-} 
-
-?>
\ No newline at end of file
+}
diff --git a/include/smarty/libs/plugins/function.html_options.php b/include/smarty/libs/plugins/function.html_options.php
index 68fa0524a..7ec3e065c 100644
--- a/include/smarty/libs/plugins/function.html_options.php
+++ b/include/smarty/libs/plugins/function.html_options.php
@@ -1,14 +1,13 @@
 <?php
 /**
  * Smarty plugin
- * 
- * @package Smarty
+ *
+ * @package    Smarty
  * @subpackage PluginsFunction
  */
 
 /**
  * Smarty {html_options} function plugin
- * 
  * Type:     function<br>
  * Name:     html_options<br>
  * Purpose:  Prints the list of <option> tags generated from
@@ -23,17 +22,18 @@
  * - id         (optional) - string default not set
  * - class      (optional) - string default not set
  * </pre>
- * 
- * @link http://www.smarty.net/manual/en/language.function.html.options.php {html_image}
- *      (Smarty online manual)
- * @author Monte Ohrt <monte at ohrt dot com> 
- * @author Ralf Strehle (minor optimization) <ralf dot strehle at yahoo dot de>
- * @param array                    $params   parameters
- * @param Smarty_Internal_Template $template template object
- * @return string 
- * @uses smarty_function_escape_special_chars()
+ *
+ * @link     http://www.smarty.net/manual/en/language.function.html.options.php {html_image}
+ *           (Smarty online manual)
+ * @author   Monte Ohrt <monte at ohrt dot com>
+ * @author   Ralf Strehle (minor optimization) <ralf dot strehle at yahoo dot de>
+ *
+ * @param array $params parameters
+ *
+ * @return string
+ * @uses     smarty_function_escape_special_chars()
  */
-function smarty_function_html_options($params, $template)
+function smarty_function_html_options($params)
 {
     require_once(SMARTY_PLUGINS_DIR . 'shared.escape_special_chars.php');
 
@@ -72,7 +72,7 @@ function smarty_function_html_options($params, $template)
                             if (method_exists($_sel, "__toString")) {
                                 $_sel = smarty_function_escape_special_chars((string) $_sel->__toString());
                             } else {
-                                trigger_error("html_options: selected attribute contains an object of class '". get_class($_sel) ."' without __toString() method", E_USER_NOTICE);
+                                trigger_error("html_options: selected attribute contains an object of class '" . get_class($_sel) . "' without __toString() method", E_USER_NOTICE);
                                 continue;
                             }
                         } else {
@@ -84,42 +84,44 @@ function smarty_function_html_options($params, $template)
                     if (method_exists($_val, "__toString")) {
                         $selected = smarty_function_escape_special_chars((string) $_val->__toString());
                     } else {
-                        trigger_error("html_options: selected attribute is an object of class '". get_class($_val) ."' without __toString() method", E_USER_NOTICE);
+                        trigger_error("html_options: selected attribute is an object of class '" . get_class($_val) . "' without __toString() method", E_USER_NOTICE);
                     }
                 } else {
                     $selected = smarty_function_escape_special_chars((string) $_val);
                 }
                 break;
-            
-            case 'strict': break;
-            
+
+            case 'strict':
+                break;
+
             case 'disabled':
             case 'readonly':
                 if (!empty($params['strict'])) {
                     if (!is_scalar($_val)) {
                         trigger_error("html_options: $_key attribute must be a scalar, only boolean true or string '$_key' will actually add the attribute", E_USER_NOTICE);
                     }
-                    
+
                     if ($_val === true || $_val === $_key) {
                         $extra .= ' ' . $_key . '="' . smarty_function_escape_special_chars($_key) . '"';
                     }
-                    
+
                     break;
                 }
-                // omit break; to fall through!
-            
+            // omit break; to fall through!
+
             default:
                 if (!is_array($_val)) {
                     $extra .= ' ' . $_key . '="' . smarty_function_escape_special_chars($_val) . '"';
                 } else {
                     trigger_error("html_options: extra attribute '$_key' cannot be an array", E_USER_NOTICE);
-                } 
+                }
                 break;
-        } 
+        }
     }
 
     if (!isset($options) && !isset($values)) {
         /* raise error here? */
+
         return '';
     }
 
@@ -134,14 +136,14 @@ function smarty_function_html_options($params, $template)
         foreach ($values as $_i => $_key) {
             $_val = isset($output[$_i]) ? $output[$_i] : '';
             $_html_result .= smarty_function_html_options_optoutput($_key, $_val, $selected, $id, $class, $_idx);
-        } 
+        }
     }
 
     if (!empty($name)) {
-        $_html_class = !empty($class) ? ' class="'.$class.'"' : '';
-        $_html_id = !empty($id) ? ' id="'.$id.'"' : '';
+        $_html_class = !empty($class) ? ' class="' . $class . '"' : '';
+        $_html_id = !empty($id) ? ' id="' . $id . '"' : '';
         $_html_result = '<select name="' . $name . '"' . $_html_class . $_html_id . $extra . '>' . "\n" . $_html_result . '</select>' . "\n";
-    } 
+    }
 
     return $_html_result;
 }
@@ -158,36 +160,37 @@ function smarty_function_html_options_optoutput($key, $value, $selected, $id, $c
         } elseif ($_key === $selected) {
             $_html_result .= ' selected="selected"';
         }
-        $_html_class = !empty($class) ? ' class="'.$class.' option"' : '';
-        $_html_id = !empty($id) ? ' id="'.$id.'-'.$idx.'"' : '';
+        $_html_class = !empty($class) ? ' class="' . $class . ' option"' : '';
+        $_html_id = !empty($id) ? ' id="' . $id . '-' . $idx . '"' : '';
         if (is_object($value)) {
             if (method_exists($value, "__toString")) {
                 $value = smarty_function_escape_special_chars((string) $value->__toString());
             } else {
-                trigger_error("html_options: value is an object of class '". get_class($value) ."' without __toString() method", E_USER_NOTICE);
+                trigger_error("html_options: value is an object of class '" . get_class($value) . "' without __toString() method", E_USER_NOTICE);
+
                 return '';
             }
         } else {
             $value = smarty_function_escape_special_chars((string) $value);
         }
         $_html_result .= $_html_class . $_html_id . '>' . $value . '</option>' . "\n";
-        $idx++;
+        $idx ++;
     } else {
         $_idx = 0;
-        $_html_result = smarty_function_html_options_optgroup($key, $value, $selected, !empty($id) ? ($id.'-'.$idx) : null, $class, $_idx);
-        $idx++;
+        $_html_result = smarty_function_html_options_optgroup($key, $value, $selected, !empty($id) ? ($id . '-' . $idx) : null, $class, $_idx);
+        $idx ++;
     }
+
     return $_html_result;
-} 
+}
 
 function smarty_function_html_options_optgroup($key, $values, $selected, $id, $class, &$idx)
 {
     $optgroup_html = '<optgroup label="' . smarty_function_escape_special_chars($key) . '">' . "\n";
     foreach ($values as $key => $value) {
         $optgroup_html .= smarty_function_html_options_optoutput($key, $value, $selected, $id, $class, $idx);
-    } 
+    }
     $optgroup_html .= "</optgroup>\n";
-    return $optgroup_html;
-} 
 
-?>
\ No newline at end of file
+    return $optgroup_html;
+}
diff --git a/include/smarty/libs/plugins/function.html_radios.php b/include/smarty/libs/plugins/function.html_radios.php
index a2741f68f..f121d5eae 100644
--- a/include/smarty/libs/plugins/function.html_radios.php
+++ b/include/smarty/libs/plugins/function.html_radios.php
@@ -1,14 +1,13 @@
 <?php
 /**
  * Smarty plugin
- * 
- * @package Smarty
+ *
+ * @package    Smarty
  * @subpackage PluginsFunction
  */
 
 /**
  * Smarty {html_radios} function plugin
- * 
  * File:       function.html_radios.php<br>
  * Type:       function<br>
  * Name:       html_radios<br>
@@ -31,16 +30,18 @@
  * {html_radios values=$ids name='box' separator='<br>' output=$names}
  * {html_radios values=$ids checked=$checked separator='<br>' output=$names}
  * </pre>
- * 
- * @link http://smarty.php.net/manual/en/language.function.html.radios.php {html_radios}
- *      (Smarty online manual)
- * @author Christopher Kvarme <christopher.kvarme@flashjab.com> 
- * @author credits to Monte Ohrt <monte at ohrt dot com> 
+ *
+ * @link    http://smarty.php.net/manual/en/language.function.html.radios.php {html_radios}
+ *          (Smarty online manual)
+ * @author  Christopher Kvarme <christopher.kvarme@flashjab.com>
+ * @author  credits to Monte Ohrt <monte at ohrt dot com>
  * @version 1.0
+ *
  * @param array                    $params   parameters
  * @param Smarty_Internal_Template $template template object
- * @return string 
- * @uses smarty_function_escape_special_chars()
+ *
+ * @return string
+ * @uses    smarty_function_escape_special_chars()
  */
 function smarty_function_html_radios($params, $template)
 {
@@ -57,7 +58,7 @@ function smarty_function_html_radios($params, $template)
     $output = null;
     $extra = '';
 
-    foreach($params as $_key => $_val) {
+    foreach ($params as $_key => $_val) {
         switch ($_key) {
             case 'name':
             case 'separator':
@@ -72,11 +73,11 @@ function smarty_function_html_radios($params, $template)
                     if (method_exists($_val, "__toString")) {
                         $selected = smarty_function_escape_special_chars((string) $_val->__toString());
                     } else {
-                        trigger_error("html_radios: selected attribute is an object of class '". get_class($_val) ."' without __toString() method", E_USER_NOTICE);
+                        trigger_error("html_radios: selected attribute is an object of class '" . get_class($_val) . "' without __toString() method", E_USER_NOTICE);
                     }
                 } else {
                     $selected = (string) $_val;
-                } 
+                }
                 break;
 
             case 'escape':
@@ -102,7 +103,8 @@ function smarty_function_html_radios($params, $template)
             case 'assign':
                 break;
 
-            case 'strict': break;
+            case 'strict':
+                break;
 
             case 'disabled':
             case 'readonly':
@@ -117,20 +119,21 @@ function smarty_function_html_radios($params, $template)
 
                     break;
                 }
-                // omit break; to fall through!
+            // omit break; to fall through!
 
             default:
                 if (!is_array($_val)) {
                     $extra .= ' ' . $_key . '="' . smarty_function_escape_special_chars($_val) . '"';
                 } else {
                     trigger_error("html_radios: extra attribute '$_key' cannot be an array", E_USER_NOTICE);
-                } 
+                }
                 break;
-        } 
-    } 
+        }
+    }
 
     if (!isset($options) && !isset($values)) {
         /* raise error here? */
+
         return '';
     }
 
@@ -144,57 +147,59 @@ function smarty_function_html_radios($params, $template)
         foreach ($values as $_i => $_key) {
             $_val = isset($output[$_i]) ? $output[$_i] : '';
             $_html_result[] = smarty_function_html_radios_output($name, $_key, $_val, $selected, $extra, $separator, $labels, $label_ids, $escape);
-        } 
-    } 
+        }
+    }
 
     if (!empty($params['assign'])) {
         $template->assign($params['assign'], $_html_result);
     } else {
         return implode("\n", $_html_result);
-    } 
-} 
+    }
+}
 
 function smarty_function_html_radios_output($name, $value, $output, $selected, $extra, $separator, $labels, $label_ids, $escape)
 {
     $_output = '';
-    
+
     if (is_object($value)) {
         if (method_exists($value, "__toString")) {
             $value = (string) $value->__toString();
         } else {
-            trigger_error("html_options: value is an object of class '". get_class($value) ."' without __toString() method", E_USER_NOTICE);
+            trigger_error("html_options: value is an object of class '" . get_class($value) . "' without __toString() method", E_USER_NOTICE);
+
             return '';
         }
     } else {
         $value = (string) $value;
     }
-    
+
     if (is_object($output)) {
         if (method_exists($output, "__toString")) {
             $output = (string) $output->__toString();
         } else {
-            trigger_error("html_options: output is an object of class '". get_class($output) ."' without __toString() method", E_USER_NOTICE);
+            trigger_error("html_options: output is an object of class '" . get_class($output) . "' without __toString() method", E_USER_NOTICE);
+
             return '';
         }
     } else {
         $output = (string) $output;
     }
-    
+
     if ($labels) {
         if ($label_ids) {
             $_id = smarty_function_escape_special_chars(preg_replace('![^\w\-\.]!' . Smarty::$_UTF8_MODIFIER, '_', $name . '_' . $value));
             $_output .= '<label for="' . $_id . '">';
         } else {
             $_output .= '<label>';
-        } 
+        }
     }
-    
+
     $name = smarty_function_escape_special_chars($name);
     $value = smarty_function_escape_special_chars($value);
     if ($escape) {
         $output = smarty_function_escape_special_chars($output);
     }
-    
+
     $_output .= '<input type="radio" name="' . $name . '" value="' . $value . '"';
 
     if ($labels && $label_ids) {
@@ -204,14 +209,13 @@ function smarty_function_html_radios_output($name, $value, $output, $selected, $
     if ($value === $selected) {
         $_output .= ' checked="checked"';
     }
-    
+
     $_output .= $extra . ' />' . $output;
     if ($labels) {
         $_output .= '</label>';
     }
-    
+
     $_output .= $separator;
-    return $_output;
-} 
 
-?>
\ No newline at end of file
+    return $_output;
+}
diff --git a/include/smarty/libs/plugins/function.html_select_date.php b/include/smarty/libs/plugins/function.html_select_date.php
index 13c500354..d66256651 100644
--- a/include/smarty/libs/plugins/function.html_select_date.php
+++ b/include/smarty/libs/plugins/function.html_select_date.php
@@ -1,8 +1,8 @@
 <?php
 /**
  * Smarty plugin
- * 
- * @package Smarty
+ *
+ * @package    Smarty
  * @subpackage PluginsFunction
  */
 
@@ -17,11 +17,9 @@ require_once(SMARTY_PLUGINS_DIR . 'shared.make_timestamp.php');
 
 /**
  * Smarty {html_select_date} plugin
- * 
  * Type:     function<br>
  * Name:     html_select_date<br>
  * Purpose:  Prints the dropdowns for date selection.
- * 
  * ChangeLog:
  * <pre>
  *            - 1.0 initial release
@@ -37,21 +35,22 @@ require_once(SMARTY_PLUGINS_DIR . 'shared.make_timestamp.php');
  *              dropdown to include given date unless explicitly set (Monte)
  *            - 1.3.4 fix behaviour of 0000-00-00 00:00:00 dates to match that
  *              of 0000-00-00 dates (cybot, boots)
- *            - 2.0 complete rewrite for performance,  
+ *            - 2.0 complete rewrite for performance,
  *              added attributes month_names, *_id
  * </pre>
- * 
- * @link http://www.smarty.net/manual/en/language.function.html.select.date.php {html_select_date}
- *      (Smarty online manual)
- * @version 2.0
- * @author Andrei Zmievski 
- * @author Monte Ohrt <monte at ohrt dot com> 
- * @author Rodney Rehm
- * @param array                    $params   parameters
- * @param Smarty_Internal_Template $template template object
- * @return string 
+ *
+ * @link     http://www.smarty.net/manual/en/language.function.html.select.date.php {html_select_date}
+ *           (Smarty online manual)
+ * @version  2.0
+ * @author   Andrei Zmievski
+ * @author   Monte Ohrt <monte at ohrt dot com>
+ * @author   Rodney Rehm
+ *
+ * @param array $params parameters
+ *
+ * @return string
  */
-function smarty_function_html_select_date($params, $template)
+function smarty_function_html_select_date($params)
 {
     // generate timestamps used for month names only
     static $_month_timestamps = null;
@@ -59,7 +58,7 @@ function smarty_function_html_select_date($params, $template)
     if ($_month_timestamps === null) {
         $_current_year = date('Y');
         $_month_timestamps = array();
-        for ($i = 1; $i <= 12; $i++) {
+        for ($i = 1; $i <= 12; $i ++) {
             $_month_timestamps[$i] = mktime(0, 0, 0, $i, 1, 2000);
         }
     }
@@ -120,7 +119,7 @@ function smarty_function_html_select_date($params, $template)
                     $time = smarty_make_timestamp($_value);
                 }
                 break;
-                
+
             case 'month_names':
                 if (is_array($_value) && count($_value) == 12) {
                     $$_key = $_value;
@@ -128,7 +127,7 @@ function smarty_function_html_select_date($params, $template)
                     trigger_error("html_select_date: month_names must be an array of 12 strings", E_USER_NOTICE);
                 }
                 break;
-                
+
             case 'prefix':
             case 'field_array':
             case 'start_year':
@@ -155,7 +154,7 @@ function smarty_function_html_select_date($params, $template)
             case 'month_id':
             case 'day_id':
             case 'year_id':
-                $$_key = (string)$_value;
+                $$_key = (string) $_value;
                 break;
 
             case 'display_days':
@@ -163,7 +162,7 @@ function smarty_function_html_select_date($params, $template)
             case 'display_years':
             case 'year_as_text':
             case 'reverse_years':
-                $$_key = (bool)$_value;
+                $$_key = (bool) $_value;
                 break;
 
             default:
@@ -171,32 +170,30 @@ function smarty_function_html_select_date($params, $template)
                     $extra_attrs .= ' ' . $_key . '="' . smarty_function_escape_special_chars($_value) . '"';
                 } else {
                     trigger_error("html_select_date: extra attribute '$_key' cannot be an array", E_USER_NOTICE);
-                } 
+                }
                 break;
-        } 
+        }
     }
-    
+
     // Note: date() is faster than strftime()
     // Note: explode(date()) is faster than date() date() date()
     if (isset($params['time']) && is_array($params['time'])) {
         if (isset($params['time'][$prefix . 'Year'])) {
             // $_REQUEST[$field_array] given
-            foreach (array('Y' => 'Year',  'm' => 'Month', 'd' => 'Day') as $_elementKey => $_elementName) {
+            foreach (array('Y' => 'Year', 'm' => 'Month', 'd' => 'Day') as $_elementKey => $_elementName) {
                 $_variableName = '_' . strtolower($_elementName);
                 $$_variableName = isset($params['time'][$prefix . $_elementName])
                     ? $params['time'][$prefix . $_elementName]
                     : date($_elementKey);
             }
-            $time = mktime(0, 0, 0, $_month, $_day, $_year);
         } elseif (isset($params['time'][$field_array][$prefix . 'Year'])) {
             // $_REQUEST given
-            foreach (array('Y' => 'Year',  'm' => 'Month', 'd' => 'Day') as $_elementKey => $_elementName) {
+            foreach (array('Y' => 'Year', 'm' => 'Month', 'd' => 'Day') as $_elementKey => $_elementName) {
                 $_variableName = '_' . strtolower($_elementName);
                 $$_variableName = isset($params['time'][$field_array][$prefix . $_elementName])
                     ? $params['time'][$field_array][$prefix . $_elementName]
                     : date($_elementKey);
             }
-            $time = mktime(0, 0, 0, $_month, $_day, $_year);
         } else {
             // no date found, use NOW
             list($_year, $_month, $_day) = $time = explode('-', date('Y-m-d'));
@@ -217,13 +214,13 @@ function smarty_function_html_select_date($params, $template)
         $key .= '_year';
         $t = $$key;
         if ($t === null) {
-            $$key = (int)$_current_year;
-        } else if ($t[0] == '+') {
-            $$key = (int)($_current_year + trim(substr($t, 1)));
-        } else if ($t[0] == '-') {
-            $$key = (int)($_current_year - trim(substr($t, 1)));
+            $$key = (int) $_current_year;
+        } elseif ($t[0] == '+') {
+            $$key = (int) ($_current_year + (int)trim(substr($t, 1)));
+        } elseif ($t[0] == '-') {
+            $$key = (int) ($_current_year - (int)trim(substr($t, 1)));
         } else {
-            $$key = (int)$$key;
+            $$key = (int) $$key;
         }
     }
 
@@ -236,73 +233,71 @@ function smarty_function_html_select_date($params, $template)
 
     // generate year <select> or <input>
     if ($display_years) {
-        $_html_years = '';
         $_extra = '';
         $_name = $field_array ? ($field_array . '[' . $prefix . 'Year]') : ($prefix . 'Year');
         if ($all_extra) {
             $_extra .= ' ' . $all_extra;
-        } 
+        }
         if ($year_extra) {
             $_extra .= ' ' . $year_extra;
         }
-        
+
         if ($year_as_text) {
             $_html_years = '<input type="text" name="' . $_name . '" value="' . $_year . '" size="4" maxlength="4"' . $_extra . $extra_attrs . ' />';
         } else {
             $_html_years = '<select name="' . $_name . '"';
             if ($year_id !== null || $all_id !== null) {
-                $_html_years .= ' id="' . smarty_function_escape_special_chars( 
-                    $year_id !== null ? ( $year_id ? $year_id : $_name ) : ( $all_id ? ($all_id . $_name) : $_name ) 
-                ) . '"';
+                $_html_years .= ' id="' . smarty_function_escape_special_chars(
+                        $year_id !== null ? ($year_id ? $year_id : $_name) : ($all_id ? ($all_id . $_name) : $_name)
+                    ) . '"';
             }
             if ($year_size) {
                 $_html_years .= ' size="' . $year_size . '"';
-            } 
+            }
             $_html_years .= $_extra . $extra_attrs . '>' . $option_separator;
-            
+
             if (isset($year_empty) || isset($all_empty)) {
-                $_html_years .= '<option value="">' . ( isset($year_empty) ? $year_empty : $all_empty ) . '</option>' . $option_separator;
+                $_html_years .= '<option value="">' . (isset($year_empty) ? $year_empty : $all_empty) . '</option>' . $option_separator;
             }
-            
-            $op = $start_year > $end_year ? -1 : 1;
-            for ($i=$start_year; $op > 0 ? $i <= $end_year : $i >= $end_year; $i += $op) {
+
+            $op = $start_year > $end_year ? - 1 : 1;
+            for ($i = $start_year; $op > 0 ? $i <= $end_year : $i >= $end_year; $i += $op) {
                 $_html_years .= '<option value="' . $i . '"'
                     . ($_year == $i ? ' selected="selected"' : '')
                     . '>' . $i . '</option>' . $option_separator;
             }
-            
+
             $_html_years .= '</select>';
         }
     }
-    
+
     // generate month <select> or <input>
     if ($display_months) {
-        $_html_month = '';
         $_extra = '';
         $_name = $field_array ? ($field_array . '[' . $prefix . 'Month]') : ($prefix . 'Month');
         if ($all_extra) {
             $_extra .= ' ' . $all_extra;
-        } 
+        }
         if ($month_extra) {
             $_extra .= ' ' . $month_extra;
         }
-        
+
         $_html_months = '<select name="' . $_name . '"';
         if ($month_id !== null || $all_id !== null) {
-            $_html_months .= ' id="' . smarty_function_escape_special_chars( 
-                $month_id !== null ? ( $month_id ? $month_id : $_name ) : ( $all_id ? ($all_id . $_name) : $_name ) 
-            ) . '"';
+            $_html_months .= ' id="' . smarty_function_escape_special_chars(
+                    $month_id !== null ? ($month_id ? $month_id : $_name) : ($all_id ? ($all_id . $_name) : $_name)
+                ) . '"';
         }
         if ($month_size) {
             $_html_months .= ' size="' . $month_size . '"';
-        } 
+        }
         $_html_months .= $_extra . $extra_attrs . '>' . $option_separator;
-        
+
         if (isset($month_empty) || isset($all_empty)) {
-            $_html_months .= '<option value="">' . ( isset($month_empty) ? $month_empty : $all_empty ) . '</option>' . $option_separator;
+            $_html_months .= '<option value="">' . (isset($month_empty) ? $month_empty : $all_empty) . '</option>' . $option_separator;
         }
-        
-        for ($i = 1; $i <= 12; $i++) {
+
+        for ($i = 1; $i <= 12; $i ++) {
             $_val = sprintf('%02d', $i);
             $_text = isset($month_names) ? smarty_function_escape_special_chars($month_names[$i]) : ($month_format == "%m" ? $_val : strftime($month_format, $_month_timestamps[$i]));
             $_value = $month_value_format == "%m" ? $_val : strftime($month_value_format, $_month_timestamps[$i]);
@@ -310,52 +305,51 @@ function smarty_function_html_select_date($params, $template)
                 . ($_val == $_month ? ' selected="selected"' : '')
                 . '>' . $_text . '</option>' . $option_separator;
         }
-        
+
         $_html_months .= '</select>';
     }
-    
+
     // generate day <select> or <input>
     if ($display_days) {
-        $_html_day = '';
         $_extra = '';
         $_name = $field_array ? ($field_array . '[' . $prefix . 'Day]') : ($prefix . 'Day');
         if ($all_extra) {
             $_extra .= ' ' . $all_extra;
-        } 
+        }
         if ($day_extra) {
             $_extra .= ' ' . $day_extra;
         }
-        
+
         $_html_days = '<select name="' . $_name . '"';
         if ($day_id !== null || $all_id !== null) {
-            $_html_days .= ' id="' . smarty_function_escape_special_chars( 
-                $day_id !== null ? ( $day_id ? $day_id : $_name ) : ( $all_id ? ($all_id . $_name) : $_name ) 
-            ) . '"';
+            $_html_days .= ' id="' . smarty_function_escape_special_chars(
+                    $day_id !== null ? ($day_id ? $day_id : $_name) : ($all_id ? ($all_id . $_name) : $_name)
+                ) . '"';
         }
         if ($day_size) {
             $_html_days .= ' size="' . $day_size . '"';
-        } 
+        }
         $_html_days .= $_extra . $extra_attrs . '>' . $option_separator;
-        
+
         if (isset($day_empty) || isset($all_empty)) {
-            $_html_days .= '<option value="">' . ( isset($day_empty) ? $day_empty : $all_empty ) . '</option>' . $option_separator;
+            $_html_days .= '<option value="">' . (isset($day_empty) ? $day_empty : $all_empty) . '</option>' . $option_separator;
         }
-        
-        for ($i = 1; $i <= 31; $i++) {
+
+        for ($i = 1; $i <= 31; $i ++) {
             $_val = sprintf('%02d', $i);
             $_text = $day_format == '%02d' ? $_val : sprintf($day_format, $i);
-            $_value = $day_value_format ==  '%02d' ? $_val : sprintf($day_value_format, $i);
+            $_value = $day_value_format == '%02d' ? $_val : sprintf($day_value_format, $i);
             $_html_days .= '<option value="' . $_value . '"'
                 . ($_val == $_day ? ' selected="selected"' : '')
                 . '>' . $_text . '</option>' . $option_separator;
         }
-        
+
         $_html_days .= '</select>';
     }
 
     // order the fields for output
     $_html = '';
-    for ($i=0; $i <= 2; $i++) {
+    for ($i = 0; $i <= 2; $i ++) {
         switch ($field_order[$i]) {
             case 'Y':
             case 'y':
@@ -365,8 +359,8 @@ function smarty_function_html_select_date($params, $template)
                     }
                     $_html .= $_html_years;
                 }
-            break;
-            
+                break;
+
             case 'm':
             case 'M':
                 if (isset($_html_months)) {
@@ -375,8 +369,8 @@ function smarty_function_html_select_date($params, $template)
                     }
                     $_html .= $_html_months;
                 }
-            break;
-            
+                break;
+
             case 'd':
             case 'D':
                 if (isset($_html_days)) {
@@ -385,10 +379,9 @@ function smarty_function_html_select_date($params, $template)
                     }
                     $_html .= $_html_days;
                 }
-            break;
+                break;
         }
     }
+
     return $_html;
 }
-
-?>
\ No newline at end of file
diff --git a/include/smarty/libs/plugins/function.html_select_time.php b/include/smarty/libs/plugins/function.html_select_time.php
index 9fb8038e4..9af6aad5b 100644
--- a/include/smarty/libs/plugins/function.html_select_time.php
+++ b/include/smarty/libs/plugins/function.html_select_time.php
@@ -2,7 +2,7 @@
 /**
  * Smarty plugin
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage PluginsFunction
  */
 
@@ -17,21 +17,21 @@ require_once(SMARTY_PLUGINS_DIR . 'shared.make_timestamp.php');
 
 /**
  * Smarty {html_select_time} function plugin
- *
  * Type:     function<br>
  * Name:     html_select_time<br>
  * Purpose:  Prints the dropdowns for time selection
  *
- * @link http://www.smarty.net/manual/en/language.function.html.select.time.php {html_select_time}
- *          (Smarty online manual)
- * @author Roberto Berto <roberto@berto.net>
- * @author Monte Ohrt <monte AT ohrt DOT com>
- * @param array                    $params   parameters
- * @param Smarty_Internal_Template $template template object
+ * @link     http://www.smarty.net/manual/en/language.function.html.select.time.php {html_select_time}
+ *           (Smarty online manual)
+ * @author   Roberto Berto <roberto@berto.net>
+ * @author   Monte Ohrt <monte AT ohrt DOT com>
+ *
+ * @param array $params parameters
+ *
  * @return string
- * @uses smarty_make_timestamp()
+ * @uses     smarty_make_timestamp()
  */
-function smarty_function_html_select_time($params, $template)
+function smarty_function_html_select_time($params)
 {
     $prefix = "Time_";
     $field_array = null;
@@ -117,7 +117,7 @@ function smarty_function_html_select_time($params, $template)
             case 'minute_value_format':
             case 'second_format':
             case 'second_value_format':
-                $$_key = (string)$_value;
+                $$_key = (string) $_value;
                 break;
 
             case 'display_hours':
@@ -125,7 +125,7 @@ function smarty_function_html_select_time($params, $template)
             case 'display_seconds':
             case 'display_meridian':
             case 'use_24_hours':
-                $$_key = (bool)$_value;
+                $$_key = (bool) $_value;
                 break;
 
             case 'minute_interval':
@@ -135,7 +135,7 @@ function smarty_function_html_select_time($params, $template)
             case 'minute_size':
             case 'second_size':
             case 'meridian_size':
-                $$_key = (int)$_value;
+                $$_key = (int) $_value;
                 break;
 
             default:
@@ -151,7 +151,7 @@ function smarty_function_html_select_time($params, $template)
     if (isset($params['time']) && is_array($params['time'])) {
         if (isset($params['time'][$prefix . 'Hour'])) {
             // $_REQUEST[$field_array] given
-            foreach (array('H' => 'Hour',  'i' => 'Minute', 's' => 'Second') as $_elementKey => $_elementName) {
+            foreach (array('H' => 'Hour', 'i' => 'Minute', 's' => 'Second') as $_elementKey => $_elementName) {
                 $_variableName = '_' . strtolower($_elementName);
                 $$_variableName = isset($params['time'][$prefix . $_elementName])
                     ? $params['time'][$prefix . $_elementName]
@@ -160,11 +160,11 @@ function smarty_function_html_select_time($params, $template)
             $_meridian = isset($params['time'][$prefix . 'Meridian'])
                 ? (' ' . $params['time'][$prefix . 'Meridian'])
                 : '';
-            $time = strtotime( $_hour . ':' . $_minute . ':' . $_second . $_meridian );
+            $time = strtotime($_hour . ':' . $_minute . ':' . $_second . $_meridian);
             list($_hour, $_minute, $_second) = $time = explode('-', date('H-i-s', $time));
         } elseif (isset($params['time'][$field_array][$prefix . 'Hour'])) {
             // $_REQUEST given
-            foreach (array('H' => 'Hour',  'i' => 'Minute', 's' => 'Second') as $_elementKey => $_elementName) {
+            foreach (array('H' => 'Hour', 'i' => 'Minute', 's' => 'Second') as $_elementKey => $_elementName) {
                 $_variableName = '_' . strtolower($_elementName);
                 $$_variableName = isset($params['time'][$field_array][$prefix . $_elementName])
                     ? $params['time'][$field_array][$prefix . $_elementName]
@@ -173,7 +173,7 @@ function smarty_function_html_select_time($params, $template)
             $_meridian = isset($params['time'][$field_array][$prefix . 'Meridian'])
                 ? (' ' . $params['time'][$field_array][$prefix . 'Meridian'])
                 : '';
-            $time = strtotime( $_hour . ':' . $_minute . ':' . $_second . $_meridian );
+            $time = strtotime($_hour . ':' . $_minute . ':' . $_second . $_meridian);
             list($_hour, $_minute, $_second) = $time = explode('-', date('H-i-s', $time));
         } else {
             // no date found, use NOW
@@ -204,8 +204,8 @@ function smarty_function_html_select_time($params, $template)
         $_html_hours = '<select name="' . $_name . '"';
         if ($hour_id !== null || $all_id !== null) {
             $_html_hours .= ' id="' . smarty_function_escape_special_chars(
-                $hour_id !== null ? ( $hour_id ? $hour_id : $_name ) : ( $all_id ? ($all_id . $_name) : $_name )
-            ) . '"';
+                    $hour_id !== null ? ($hour_id ? $hour_id : $_name) : ($all_id ? ($all_id . $_name) : $_name)
+                ) . '"';
         }
         if ($hour_size) {
             $_html_hours .= ' size="' . $hour_size . '"';
@@ -213,12 +213,12 @@ function smarty_function_html_select_time($params, $template)
         $_html_hours .= $_extra . $extra_attrs . '>' . $option_separator;
 
         if (isset($hour_empty) || isset($all_empty)) {
-            $_html_hours .= '<option value="">' . ( isset($hour_empty) ? $hour_empty : $all_empty ) . '</option>' . $option_separator;
+            $_html_hours .= '<option value="">' . (isset($hour_empty) ? $hour_empty : $all_empty) . '</option>' . $option_separator;
         }
 
         $start = $use_24_hours ? 0 : 1;
         $end = $use_24_hours ? 23 : 12;
-        for ($i=$start; $i <= $end; $i++) {
+        for ($i = $start; $i <= $end; $i ++) {
             $_val = sprintf('%02d', $i);
             $_text = $hour_format == '%02d' ? $_val : sprintf($hour_format, $i);
             $_value = $hour_value_format == '%02d' ? $_val : sprintf($hour_value_format, $i);
@@ -226,7 +226,7 @@ function smarty_function_html_select_time($params, $template)
             if (!$use_24_hours) {
                 $_hour12 = $_hour == 0
                     ? 12
-                    : ($_hour <= 12 ? $_hour : $_hour -12);
+                    : ($_hour <= 12 ? $_hour : $_hour - 12);
             }
 
             $selected = $_hour !== null ? ($use_24_hours ? $_hour == $_val : $_hour12 == $_val) : null;
@@ -253,8 +253,8 @@ function smarty_function_html_select_time($params, $template)
         $_html_minutes = '<select name="' . $_name . '"';
         if ($minute_id !== null || $all_id !== null) {
             $_html_minutes .= ' id="' . smarty_function_escape_special_chars(
-                $minute_id !== null ? ( $minute_id ? $minute_id : $_name ) : ( $all_id ? ($all_id . $_name) : $_name )
-            ) . '"';
+                    $minute_id !== null ? ($minute_id ? $minute_id : $_name) : ($all_id ? ($all_id . $_name) : $_name)
+                ) . '"';
         }
         if ($minute_size) {
             $_html_minutes .= ' size="' . $minute_size . '"';
@@ -262,11 +262,11 @@ function smarty_function_html_select_time($params, $template)
         $_html_minutes .= $_extra . $extra_attrs . '>' . $option_separator;
 
         if (isset($minute_empty) || isset($all_empty)) {
-            $_html_minutes .= '<option value="">' . ( isset($minute_empty) ? $minute_empty : $all_empty ) . '</option>' . $option_separator;
+            $_html_minutes .= '<option value="">' . (isset($minute_empty) ? $minute_empty : $all_empty) . '</option>' . $option_separator;
         }
 
         $selected = $_minute !== null ? ($_minute - $_minute % $minute_interval) : null;
-        for ($i=0; $i <= 59; $i += $minute_interval) {
+        for ($i = 0; $i <= 59; $i += $minute_interval) {
             $_val = sprintf('%02d', $i);
             $_text = $minute_format == '%02d' ? $_val : sprintf($minute_format, $i);
             $_value = $minute_value_format == '%02d' ? $_val : sprintf($minute_value_format, $i);
@@ -293,8 +293,8 @@ function smarty_function_html_select_time($params, $template)
         $_html_seconds = '<select name="' . $_name . '"';
         if ($second_id !== null || $all_id !== null) {
             $_html_seconds .= ' id="' . smarty_function_escape_special_chars(
-                $second_id !== null ? ( $second_id ? $second_id : $_name ) : ( $all_id ? ($all_id . $_name) : $_name )
-            ) . '"';
+                    $second_id !== null ? ($second_id ? $second_id : $_name) : ($all_id ? ($all_id . $_name) : $_name)
+                ) . '"';
         }
         if ($second_size) {
             $_html_seconds .= ' size="' . $second_size . '"';
@@ -302,11 +302,11 @@ function smarty_function_html_select_time($params, $template)
         $_html_seconds .= $_extra . $extra_attrs . '>' . $option_separator;
 
         if (isset($second_empty) || isset($all_empty)) {
-            $_html_seconds .= '<option value="">' . ( isset($second_empty) ? $second_empty : $all_empty ) . '</option>' . $option_separator;
+            $_html_seconds .= '<option value="">' . (isset($second_empty) ? $second_empty : $all_empty) . '</option>' . $option_separator;
         }
 
         $selected = $_second !== null ? ($_second - $_second % $second_interval) : null;
-        for ($i=0; $i <= 59; $i += $second_interval) {
+        for ($i = 0; $i <= 59; $i += $second_interval) {
             $_val = sprintf('%02d', $i);
             $_text = $second_format == '%02d' ? $_val : sprintf($second_format, $i);
             $_value = $second_value_format == '%02d' ? $_val : sprintf($second_value_format, $i);
@@ -333,8 +333,8 @@ function smarty_function_html_select_time($params, $template)
         $_html_meridian = '<select name="' . $_name . '"';
         if ($meridian_id !== null || $all_id !== null) {
             $_html_meridian .= ' id="' . smarty_function_escape_special_chars(
-                $meridian_id !== null ? ( $meridian_id ? $meridian_id : $_name ) : ( $all_id ? ($all_id . $_name) : $_name )
-            ) . '"';
+                    $meridian_id !== null ? ($meridian_id ? $meridian_id : $_name) : ($all_id ? ($all_id . $_name) : $_name)
+                ) . '"';
         }
         if ($meridian_size) {
             $_html_meridian .= ' size="' . $meridian_size . '"';
@@ -342,11 +342,11 @@ function smarty_function_html_select_time($params, $template)
         $_html_meridian .= $_extra . $extra_attrs . '>' . $option_separator;
 
         if (isset($meridian_empty) || isset($all_empty)) {
-            $_html_meridian .= '<option value="">' . ( isset($meridian_empty) ? $meridian_empty : $all_empty ) . '</option>' . $option_separator;
+            $_html_meridian .= '<option value="">' . (isset($meridian_empty) ? $meridian_empty : $all_empty) . '</option>' . $option_separator;
         }
 
-        $_html_meridian .= '<option value="am"'. ($_hour < 12 ? ' selected="selected"' : '') .'>AM</option>' . $option_separator
-            . '<option value="pm"'. ($_hour < 12 ? '' : ' selected="selected"') .'>PM</option>' . $option_separator
+        $_html_meridian .= '<option value="am"' . ($_hour > 0 && $_hour < 12 ? ' selected="selected"' : '') . '>AM</option>' . $option_separator
+            . '<option value="pm"' . ($_hour < 12 ? '' : ' selected="selected"') . '>PM</option>' . $option_separator
             . '</select>';
     }
 
@@ -362,5 +362,3 @@ function smarty_function_html_select_time($params, $template)
 
     return $_html;
 }
-
-?>
\ No newline at end of file
diff --git a/include/smarty/libs/plugins/function.html_table.php b/include/smarty/libs/plugins/function.html_table.php
index 6b9cb9d12..ec7ba48a4 100644
--- a/include/smarty/libs/plugins/function.html_table.php
+++ b/include/smarty/libs/plugins/function.html_table.php
@@ -2,13 +2,12 @@
 /**
  * Smarty plugin
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage PluginsFunction
  */
 
 /**
  * Smarty {html_table} function plugin
- *
  * Type:     function<br>
  * Name:     html_table<br>
  * Date:     Feb 17, 2003<br>
@@ -37,17 +36,18 @@
  * {table loop=$data cols="first,second,third" tr_attr=$colors}
  * </pre>
  *
- * @author Monte Ohrt <monte at ohrt dot com>
- * @author credit to Messju Mohr <messju at lammfellpuschen dot de>
- * @author credit to boots <boots dot smarty at yahoo dot com>
- * @version 1.1
- * @link http://www.smarty.net/manual/en/language.function.html.table.php {html_table}
- *          (Smarty online manual)
- * @param array                    $params   parameters
- * @param Smarty_Internal_Template $template template object
+ * @author   Monte Ohrt <monte at ohrt dot com>
+ * @author   credit to Messju Mohr <messju at lammfellpuschen dot de>
+ * @author   credit to boots <boots dot smarty at yahoo dot com>
+ * @version  1.1
+ * @link     http://www.smarty.net/manual/en/language.function.html.table.php {html_table}
+ *           (Smarty online manual)
+ *
+ * @param array $params parameters
+ *
  * @return string
  */
-function smarty_function_html_table($params, $template)
+function smarty_function_html_table($params)
 {
     $table_attr = 'border="1"';
     $tr_attr = '';
@@ -63,14 +63,15 @@ function smarty_function_html_table($params, $template)
     $loop = null;
 
     if (!isset($params['loop'])) {
-        trigger_error("html_table: missing 'loop' parameter",E_USER_WARNING);
+        trigger_error("html_table: missing 'loop' parameter", E_USER_WARNING);
+
         return;
     }
 
     foreach ($params as $_key => $_value) {
         switch ($_key) {
             case 'loop':
-                $$_key = (array)$_value;
+                $$_key = (array) $_value;
                 break;
 
             case 'cols':
@@ -81,14 +82,14 @@ function smarty_function_html_table($params, $template)
                     $cols = explode(',', $_value);
                     $cols_count = count($cols);
                 } elseif (!empty($_value)) {
-                    $cols_count = (int)$_value;
+                    $cols_count = (int) $_value;
                 } else {
                     $cols_count = $cols;
                 }
                 break;
 
             case 'rows':
-                $$_key = (int)$_value;
+                $$_key = (int) $_value;
                 break;
 
             case 'table_attr':
@@ -97,7 +98,7 @@ function smarty_function_html_table($params, $template)
             case 'vdir':
             case 'inner':
             case 'caption':
-                $$_key = (string)$_value;
+                $$_key = (string) $_value;
                 break;
 
             case 'tr_attr':
@@ -129,7 +130,7 @@ function smarty_function_html_table($params, $template)
         $cols = ($hdir == 'right') ? $cols : array_reverse($cols);
         $output .= "<thead><tr>\n";
 
-        for ($r = 0; $r < $cols_count; $r++) {
+        for ($r = 0; $r < $cols_count; $r ++) {
             $output .= '<th' . smarty_function_html_table_cycle('th', $th_attr, $r) . '>';
             $output .= $cols[$r];
             $output .= "</th>\n";
@@ -138,12 +139,12 @@ function smarty_function_html_table($params, $template)
     }
 
     $output .= "<tbody>\n";
-    for ($r = 0; $r < $rows; $r++) {
+    for ($r = 0; $r < $rows; $r ++) {
         $output .= "<tr" . smarty_function_html_table_cycle('tr', $tr_attr, $r) . ">\n";
-        $rx = ($vdir == 'down') ? $r * $cols_count : ($rows-1 - $r) * $cols_count;
+        $rx = ($vdir == 'down') ? $r * $cols_count : ($rows - 1 - $r) * $cols_count;
 
-        for ($c = 0; $c < $cols_count; $c++) {
-            $x = ($hdir == 'right') ? $rx + $c : $rx + $cols_count-1 - $c;
+        for ($c = 0; $c < $cols_count; $c ++) {
+            $x = ($hdir == 'right') ? $rx + $c : $rx + $cols_count - 1 - $c;
             if ($inner != 'cols') {
                 /* shuffle x to loop over rows*/
                 $x = floor($x / $cols_count) + ($x % $cols_count) * $rows;
@@ -173,5 +174,3 @@ function smarty_function_html_table_cycle($name, $var, $no)
 
     return ($ret) ? ' ' . $ret : '';
 }
-
-?>
\ No newline at end of file
diff --git a/include/smarty/libs/plugins/function.mailto.php b/include/smarty/libs/plugins/function.mailto.php
index 55d5c0602..520fb7aa6 100644
--- a/include/smarty/libs/plugins/function.mailto.php
+++ b/include/smarty/libs/plugins/function.mailto.php
@@ -2,13 +2,12 @@
 /**
  * Smarty plugin
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage PluginsFunction
  */
 
 /**
  * Smarty {mailto} function plugin
- *
  * Type:     function<br>
  * Name:     mailto<br>
  * Date:     May 21, 2002
@@ -39,22 +38,24 @@
  * {mailto address="me@domain.com" extra='class="mailto"'}
  * </pre>
  *
- * @link http://www.smarty.net/manual/en/language.function.mailto.php {mailto}
- *          (Smarty online manual)
- * @version 1.2
- * @author Monte Ohrt <monte at ohrt dot com>
- * @author credits to Jason Sweat (added cc, bcc and subject functionality)
- * @param array                    $params   parameters
- * @param Smarty_Internal_Template $template template object
+ * @link     http://www.smarty.net/manual/en/language.function.mailto.php {mailto}
+ *           (Smarty online manual)
+ * @version  1.2
+ * @author   Monte Ohrt <monte at ohrt dot com>
+ * @author   credits to Jason Sweat (added cc, bcc and subject functionality)
+ *
+ * @param array $params parameters
+ *
  * @return string
  */
-function smarty_function_mailto($params, $template)
+function smarty_function_mailto($params)
 {
     static $_allowed_encoding = array('javascript' => true, 'javascript_charcode' => true, 'hex' => true, 'none' => true);
     $extra = '';
 
     if (empty($params['address'])) {
-        trigger_error("mailto: missing 'address' parameter",E_USER_WARNING);
+        trigger_error("mailto: missing 'address' parameter", E_USER_WARNING);
+
         return;
     } else {
         $address = $params['address'];
@@ -71,8 +72,9 @@ function smarty_function_mailto($params, $template)
             case 'cc':
             case 'bcc':
             case 'followupto':
-                if (!empty($value))
-                    $mail_parms[] = $var . '=' . str_replace($search, $replace, rawurlencode($value));
+            if (!empty($value)) {
+                $mail_parms[] = $var . '=' . str_replace($search, $replace, rawurlencode($value));
+            }
                 break;
 
             case 'subject':
@@ -91,10 +93,11 @@ function smarty_function_mailto($params, $template)
     if ($mail_parms) {
         $address .= '?' . join('&', $mail_parms);
     }
-    
+
     $encode = (empty($params['encode'])) ? 'none' : $params['encode'];
     if (!isset($_allowed_encoding[$encode])) {
         trigger_error("mailto: 'encode' parameter must be none, javascript, javascript_charcode or hex", E_USER_WARNING);
+
         return;
     }
     // FIXME: (rodneyrehm) document.write() excues me what? 1998 has passed!
@@ -102,7 +105,7 @@ function smarty_function_mailto($params, $template)
         $string = 'document.write(\'<a href="mailto:' . $address . '" ' . $extra . '>' . $text . '</a>\');';
 
         $js_encode = '';
-        for ($x = 0, $_length = strlen($string); $x < $_length; $x++) {
+        for ($x = 0, $_length = strlen($string); $x < $_length; $x ++) {
             $js_encode .= '%' . bin2hex($string[$x]);
         }
 
@@ -110,7 +113,7 @@ function smarty_function_mailto($params, $template)
     } elseif ($encode == 'javascript_charcode') {
         $string = '<a href="mailto:' . $address . '" ' . $extra . '>' . $text . '</a>';
 
-        for($x = 0, $y = strlen($string); $x < $y; $x++) {
+        for ($x = 0, $y = strlen($string); $x < $y; $x ++) {
             $ord[] = ord($string[$x]);
         }
 
@@ -125,11 +128,12 @@ function smarty_function_mailto($params, $template)
     } elseif ($encode == 'hex') {
         preg_match('!^(.*)(\?.*)$!', $address, $match);
         if (!empty($match[2])) {
-            trigger_error("mailto: hex encoding does not work with extra attributes. Try javascript.",E_USER_WARNING);
+            trigger_error("mailto: hex encoding does not work with extra attributes. Try javascript.", E_USER_WARNING);
+
             return;
         }
         $address_encode = '';
-        for ($x = 0, $_length = strlen($address); $x < $_length; $x++) {
+        for ($x = 0, $_length = strlen($address); $x < $_length; $x ++) {
             if (preg_match('!\w!' . Smarty::$_UTF8_MODIFIER, $address[$x])) {
                 $address_encode .= '%' . bin2hex($address[$x]);
             } else {
@@ -137,16 +141,15 @@ function smarty_function_mailto($params, $template)
             }
         }
         $text_encode = '';
-        for ($x = 0, $_length = strlen($text); $x < $_length; $x++) {
+        for ($x = 0, $_length = strlen($text); $x < $_length; $x ++) {
             $text_encode .= '&#x' . bin2hex($text[$x]) . ';';
         }
 
         $mailto = "&#109;&#97;&#105;&#108;&#116;&#111;&#58;";
+
         return '<a href="' . $mailto . $address_encode . '" ' . $extra . '>' . $text_encode . '</a>';
     } else {
         // no encoding
         return '<a href="mailto:' . $address . '" ' . $extra . '>' . $text . '</a>';
     }
 }
-
-?>
\ No newline at end of file
diff --git a/include/smarty/libs/plugins/function.math.php b/include/smarty/libs/plugins/function.math.php
index f4d3f05ee..aba76e825 100644
--- a/include/smarty/libs/plugins/function.math.php
+++ b/include/smarty/libs/plugins/function.math.php
@@ -1,87 +1,91 @@
 <?php
 /**
  * Smarty plugin
- *
  * This plugin is only for Smarty2 BC
- * @package Smarty
+ *
+ * @package    Smarty
  * @subpackage PluginsFunction
  */
 
 /**
  * Smarty {math} function plugin
- *
  * Type:     function<br>
  * Name:     math<br>
  * Purpose:  handle math computations in template
  *
- * @link http://www.smarty.net/manual/en/language.function.math.php {math}
- *          (Smarty online manual)
+ * @link     http://www.smarty.net/manual/en/language.function.math.php {math}
+ *           (Smarty online manual)
  * @author   Monte Ohrt <monte at ohrt dot com>
+ *
  * @param array                    $params   parameters
  * @param Smarty_Internal_Template $template template object
+ *
  * @return string|null
  */
 function smarty_function_math($params, $template)
 {
     static $_allowed_funcs = array(
-        'int' => true, 'abs' => true, 'ceil' => true, 'cos' => true, 'exp' => true, 'floor' => true,
-        'log' => true, 'log10' => true, 'max' => true, 'min' => true, 'pi' => true, 'pow' => true,
-        'rand' => true, 'round' => true, 'sin' => true, 'sqrt' => true, 'srand' => true ,'tan' => true
+        'int'  => true, 'abs' => true, 'ceil' => true, 'cos' => true, 'exp' => true, 'floor' => true,
+        'log'  => true, 'log10' => true, 'max' => true, 'min' => true, 'pi' => true, 'pow' => true,
+        'rand' => true, 'round' => true, 'sin' => true, 'sqrt' => true, 'srand' => true, 'tan' => true
     );
     // be sure equation parameter is present
     if (empty($params['equation'])) {
-        trigger_error("math: missing equation parameter",E_USER_WARNING);
+        trigger_error("math: missing equation parameter", E_USER_WARNING);
+
         return;
     }
 
     $equation = $params['equation'];
 
     // make sure parenthesis are balanced
-    if (substr_count($equation,"(") != substr_count($equation,")")) {
-        trigger_error("math: unbalanced parenthesis",E_USER_WARNING);
+    if (substr_count($equation, "(") != substr_count($equation, ")")) {
+        trigger_error("math: unbalanced parenthesis", E_USER_WARNING);
+
         return;
     }
 
     // match all vars in equation, make sure all are passed
-    preg_match_all("!(?:0x[a-fA-F0-9]+)|([a-zA-Z][a-zA-Z0-9_]*)!",$equation, $match);
+    preg_match_all("!(?:0x[a-fA-F0-9]+)|([a-zA-Z][a-zA-Z0-9_]*)!", $equation, $match);
 
-    foreach($match[1] as $curr_var) {
+    foreach ($match[1] as $curr_var) {
         if ($curr_var && !isset($params[$curr_var]) && !isset($_allowed_funcs[$curr_var])) {
-            trigger_error("math: function call $curr_var not allowed",E_USER_WARNING);
+            trigger_error("math: function call $curr_var not allowed", E_USER_WARNING);
+
             return;
         }
     }
 
-    foreach($params as $key => $val) {
+    foreach ($params as $key => $val) {
         if ($key != "equation" && $key != "format" && $key != "assign") {
             // make sure value is not empty
-            if (strlen($val)==0) {
-                trigger_error("math: parameter $key is empty",E_USER_WARNING);
+            if (strlen($val) == 0) {
+                trigger_error("math: parameter $key is empty", E_USER_WARNING);
+
                 return;
             }
             if (!is_numeric($val)) {
-                trigger_error("math: parameter $key: is not numeric",E_USER_WARNING);
+                trigger_error("math: parameter $key: is not numeric", E_USER_WARNING);
+
                 return;
             }
             $equation = preg_replace("/\b$key\b/", " \$params['$key'] ", $equation);
         }
     }
     $smarty_math_result = null;
-    eval("\$smarty_math_result = ".$equation.";");
+    eval("\$smarty_math_result = " . $equation . ";");
 
     if (empty($params['format'])) {
         if (empty($params['assign'])) {
             return $smarty_math_result;
         } else {
-            $template->assign($params['assign'],$smarty_math_result);
+            $template->assign($params['assign'], $smarty_math_result);
         }
     } else {
-        if (empty($params['assign'])){
-            printf($params['format'],$smarty_math_result);
+        if (empty($params['assign'])) {
+            printf($params['format'], $smarty_math_result);
         } else {
-            $template->assign($params['assign'],sprintf($params['format'],$smarty_math_result));
+            $template->assign($params['assign'], sprintf($params['format'], $smarty_math_result));
         }
     }
 }
-
-?>
\ No newline at end of file
diff --git a/include/smarty/libs/plugins/modifier.capitalize.php b/include/smarty/libs/plugins/modifier.capitalize.php
index a78e3632a..a8ad76370 100644
--- a/include/smarty/libs/plugins/modifier.capitalize.php
+++ b/include/smarty/libs/plugins/modifier.capitalize.php
@@ -1,25 +1,24 @@
 <?php
 /**
  * Smarty plugin
- * 
- * @package Smarty
+ *
+ * @package    Smarty
  * @subpackage PluginsModifier
  */
 
 /**
  * Smarty capitalize modifier plugin
- * 
  * Type:     modifier<br>
  * Name:     capitalize<br>
  * Purpose:  capitalize words in the string
- *
  * {@internal {$string|capitalize:true:true} is the fastest option for MBString enabled systems }}
  *
  * @param string  $string    string to capitalize
  * @param boolean $uc_digits also capitalize "x123" to "X123"
  * @param boolean $lc_rest   capitalize first letters, lowercase all following letters "aAa" to "Aaa"
+ *
  * @return string capitalized string
- * @author Monte Ohrt <monte at ohrt dot com> 
+ * @author Monte Ohrt <monte at ohrt dot com>
  * @author Rodney Rehm
  */
 function smarty_modifier_capitalize($string, $uc_digits = false, $lc_rest = false)
@@ -27,39 +26,65 @@ function smarty_modifier_capitalize($string, $uc_digits = false, $lc_rest = fals
     if (Smarty::$_MBSTRING) {
         if ($lc_rest) {
             // uppercase (including hyphenated words)
-            $upper_string = mb_convert_case( $string, MB_CASE_TITLE, Smarty::$_CHARSET );
+            $upper_string = mb_convert_case($string, MB_CASE_TITLE, Smarty::$_CHARSET);
         } else {
             // uppercase word breaks
-            $upper_string = preg_replace("!(^|[^\p{L}'])([\p{Ll}])!eS" . Smarty::$_UTF8_MODIFIER, "stripslashes('\\1').mb_convert_case(stripslashes('\\2'),MB_CASE_UPPER, '" . addslashes(Smarty::$_CHARSET) . "')", $string);
+            $upper_string = preg_replace_callback("!(^|[^\p{L}'])([\p{Ll}])!S" . Smarty::$_UTF8_MODIFIER, 'smarty_mod_cap_mbconvert_cb', $string);
         }
         // check uc_digits case
         if (!$uc_digits) {
             if (preg_match_all("!\b([\p{L}]*[\p{N}]+[\p{L}]*)\b!" . Smarty::$_UTF8_MODIFIER, $string, $matches, PREG_OFFSET_CAPTURE)) {
-                foreach($matches[1] as $match) {
+                foreach ($matches[1] as $match) {
                     $upper_string = substr_replace($upper_string, mb_strtolower($match[0], Smarty::$_CHARSET), $match[1], strlen($match[0]));
                 }
-            } 
+            }
         }
-        $upper_string = preg_replace("!((^|\s)['\"])(\w)!e" . Smarty::$_UTF8_MODIFIER, "stripslashes('\\1').mb_convert_case(stripslashes('\\3'),MB_CASE_UPPER, '" . addslashes(Smarty::$_CHARSET) . "')", $upper_string);
+        $upper_string = preg_replace_callback("!((^|\s)['\"])(\w)!" . Smarty::$_UTF8_MODIFIER, 'smarty_mod_cap_mbconvert2_cb', $upper_string);
         return $upper_string;
     }
-    
+
     // lowercase first
     if ($lc_rest) {
         $string = strtolower($string);
     }
     // uppercase (including hyphenated words)
-    $upper_string = preg_replace("!(^|[^\p{L}'])([\p{Ll}])!eS" . Smarty::$_UTF8_MODIFIER, "stripslashes('\\1').ucfirst(stripslashes('\\2'))", $string); 
+    $upper_string = preg_replace_callback("!(^|[^\p{L}'])([\p{Ll}])!S" . Smarty::$_UTF8_MODIFIER, 'smarty_mod_cap_ucfirst_cb', $string);
     // check uc_digits case
     if (!$uc_digits) {
         if (preg_match_all("!\b([\p{L}]*[\p{N}]+[\p{L}]*)\b!" . Smarty::$_UTF8_MODIFIER, $string, $matches, PREG_OFFSET_CAPTURE)) {
-            foreach($matches[1] as $match) {
+            foreach ($matches[1] as $match) {
                 $upper_string = substr_replace($upper_string, strtolower($match[0]), $match[1], strlen($match[0]));
             }
-        } 
+        }
     }
-    $upper_string = preg_replace("!((^|\s)['\"])(\w)!e" . Smarty::$_UTF8_MODIFIER, "stripslashes('\\1').strtoupper(stripslashes('\\3'))", $upper_string);
+    $upper_string = preg_replace_callback("!((^|\s)['\"])(\w)!" . Smarty::$_UTF8_MODIFIER, 'smarty_mod_cap_ucfirst2_cb', $upper_string);
     return $upper_string;
-} 
+}
+
+/* 
+ *
+ * Bug: create_function() use exhausts memory when used in long loops
+ * Fix: use declared functions for callbacks instead of using create_function()
+ * Note: This can be fixed using anonymous functions instead, but that requires PHP >= 5.3
+ *
+ * @author Kyle Renfrow
+ */
+function smarty_mod_cap_mbconvert_cb($matches)
+{
+    return stripslashes($matches[1]) . mb_convert_case(stripslashes($matches[2]), MB_CASE_UPPER, Smarty::$_CHARSET);
+}
+
+function smarty_mod_cap_mbconvert2_cb($matches)
+{
+    return stripslashes($matches[1]) . mb_convert_case(stripslashes($matches[3]), MB_CASE_UPPER, Smarty::$_CHARSET);
+}
+
+function smarty_mod_cap_ucfirst_cb($matches)
+{
+    return stripslashes($matches[1]) . ucfirst(stripslashes($matches[2]));
+}
 
-?>
\ No newline at end of file
+function smarty_mod_cap_ucfirst2_cb($matches)
+{
+    return stripslashes($matches[1]) . ucfirst(stripslashes($matches[3]));
+}
diff --git a/include/smarty/libs/plugins/modifier.date_format.php b/include/smarty/libs/plugins/modifier.date_format.php
index f3eaba057..28d6ff021 100644
--- a/include/smarty/libs/plugins/modifier.date_format.php
+++ b/include/smarty/libs/plugins/modifier.date_format.php
@@ -1,14 +1,13 @@
 <?php
 /**
  * Smarty plugin
- * 
- * @package Smarty
+ *
+ * @package    Smarty
  * @subpackage PluginsModifier
  */
 
 /**
  * Smarty date_format modifier plugin
- * 
  * Type:     modifier<br>
  * Name:     date_format<br>
  * Purpose:  format datestamps via strftime<br>
@@ -16,24 +15,26 @@
  *          - string: input date string
  *          - format: strftime format for output
  *          - default_date: default date if $string is empty
- * 
- * @link http://www.smarty.net/manual/en/language.modifier.date.format.php date_format (Smarty online manual)
- * @author Monte Ohrt <monte at ohrt dot com> 
+ *
+ * @link   http://www.smarty.net/manual/en/language.modifier.date.format.php date_format (Smarty online manual)
+ * @author Monte Ohrt <monte at ohrt dot com>
+ *
  * @param string $string       input date string
  * @param string $format       strftime format for output
  * @param string $default_date default date if $string is empty
  * @param string $formatter    either 'strftime' or 'auto'
+ *
  * @return string |void
- * @uses smarty_make_timestamp()
+ * @uses   smarty_make_timestamp()
  */
-function smarty_modifier_date_format($string, $format=null, $default_date='', $formatter='auto')
+function smarty_modifier_date_format($string, $format = null, $default_date = '', $formatter = 'auto')
 {
     if ($format === null) {
         $format = Smarty::$_DATE_FORMAT;
     }
     /**
-    * Include the {@link shared.make_timestamp.php} plugin
-    */
+     * require_once the {@link shared.make_timestamp.php} plugin
+     */
     require_once(SMARTY_PLUGINS_DIR . 'shared.make_timestamp.php');
     if ($string != '' && $string != '0000-00-00' && $string != '0000-00-00 00:00:00') {
         $timestamp = smarty_make_timestamp($string);
@@ -41,25 +42,24 @@ function smarty_modifier_date_format($string, $format=null, $default_date='', $f
         $timestamp = smarty_make_timestamp($default_date);
     } else {
         return;
-    } 
-    if($formatter=='strftime'||($formatter=='auto'&&strpos($format,'%')!==false)) {
+    }
+    if ($formatter == 'strftime' || ($formatter == 'auto' && strpos($format, '%') !== false)) {
         if (DS == '\\') {
             $_win_from = array('%D', '%h', '%n', '%r', '%R', '%t', '%T');
             $_win_to = array('%m/%d/%y', '%b', "\n", '%I:%M:%S %p', '%H:%M', "\t", '%H:%M:%S');
             if (strpos($format, '%e') !== false) {
                 $_win_from[] = '%e';
                 $_win_to[] = sprintf('%\' 2d', date('j', $timestamp));
-            } 
+            }
             if (strpos($format, '%l') !== false) {
                 $_win_from[] = '%l';
                 $_win_to[] = sprintf('%\' 2d', date('h', $timestamp));
-            } 
+            }
             $format = str_replace($_win_from, $_win_to, $format);
-        } 
+        }
+
         return strftime($format, $timestamp);
     } else {
         return date($format, $timestamp);
     }
-} 
-
-?>
\ No newline at end of file
+}
diff --git a/include/smarty/libs/plugins/modifier.debug_print_var.php b/include/smarty/libs/plugins/modifier.debug_print_var.php
index fa44100e8..4ff8213ce 100644
--- a/include/smarty/libs/plugins/modifier.debug_print_var.php
+++ b/include/smarty/libs/plugins/modifier.debug_print_var.php
@@ -1,53 +1,66 @@
 <?php
 /**
  * Smarty plugin
- * 
- * @package Smarty
+ *
+ * @package    Smarty
  * @subpackage Debug
  */
 
 /**
  * Smarty debug_print_var modifier plugin
- * 
  * Type:     modifier<br>
  * Name:     debug_print_var<br>
  * Purpose:  formats variable contents for display in the console
  *
- * @author Monte Ohrt <monte at ohrt dot com> 
+ * @author Monte Ohrt <monte at ohrt dot com>
+ *
  * @param array|object $var     variable to be formatted
- * @param integer      $depth   maximum recursion depth if $var is an array
- * @param integer      $length  maximum string length if $var is a string
- * @return string 
+ * @param int          $max     maximum recursion depth if $var is an array or object
+ * @param int          $length  maximum string length if $var is a string
+ * @param int          $depth   actual recursion depth
+ * @param array        $objects processed objects in actual depth to prevent recursive object processing
+ *
+ * @return string
  */
-function smarty_modifier_debug_print_var ($var, $depth = 0, $length = 40)
+function smarty_modifier_debug_print_var($var, $max = 10, $length = 40, $depth = 0, $objects = array())
 {
-    $_replace = array("\n" => '<i>\n</i>',
-        "\r" => '<i>\r</i>',
-        "\t" => '<i>\t</i>'
-        );
-
+    $_replace = array("\n" => '\n',
+                      "\r" => '\r',
+                      "\t" => '\t'
+    );
     switch (gettype($var)) {
         case 'array' :
             $results = '<b>Array (' . count($var) . ')</b>';
+            if ($depth == $max) {
+                break;
+            }
             foreach ($var as $curr_key => $curr_val) {
                 $results .= '<br>' . str_repeat('&nbsp;', $depth * 2)
-                 . '<b>' . strtr($curr_key, $_replace) . '</b> =&gt; '
-                 . smarty_modifier_debug_print_var($curr_val, ++$depth, $length);
-                $depth--;
-            } 
+                    . '<b>' . strtr($curr_key, $_replace) . '</b> =&gt; '
+                    . smarty_modifier_debug_print_var($curr_val, $max, $length, ++ $depth, $objects);
+                $depth --;
+            }
             break;
-            
+
         case 'object' :
             $object_vars = get_object_vars($var);
             $results = '<b>' . get_class($var) . ' Object (' . count($object_vars) . ')</b>';
+            if (in_array($var, $objects)) {
+                $results .= ' called recursive';
+                break;
+            }
+            if ($depth == $max) {
+                break;
+            }
+            $objects[] = $var;
             foreach ($object_vars as $curr_key => $curr_val) {
                 $results .= '<br>' . str_repeat('&nbsp;', $depth * 2)
-                 . '<b> -&gt;' . strtr($curr_key, $_replace) . '</b> = '
-                 . smarty_modifier_debug_print_var($curr_val, ++$depth, $length);
-                $depth--;
-            } 
+                    . '<b> -&gt;' . strtr($curr_key, $_replace) . '</b> = '
+                    . smarty_modifier_debug_print_var($curr_val, $max, $length, ++ $depth, $objects);
+                $depth --;
+            }
             break;
-            
+
         case 'boolean' :
         case 'NULL' :
         case 'resource' :
@@ -59,15 +72,15 @@ function smarty_modifier_debug_print_var ($var, $depth = 0, $length = 40)
                 $results = 'null';
             } else {
                 $results = htmlspecialchars((string) $var);
-            } 
+            }
             $results = '<i>' . $results . '</i>';
             break;
-            
+
         case 'integer' :
         case 'float' :
             $results = htmlspecialchars((string) $var);
             break;
-            
+
         case 'string' :
             $results = strtr($var, $_replace);
             if (Smarty::$_MBSTRING) {
@@ -82,7 +95,7 @@ function smarty_modifier_debug_print_var ($var, $depth = 0, $length = 40)
 
             $results = htmlspecialchars('"' . $results . '"');
             break;
-            
+
         case 'unknown type' :
         default :
             $results = strtr((string) $var, $_replace);
@@ -95,11 +108,9 @@ function smarty_modifier_debug_print_var ($var, $depth = 0, $length = 40)
                     $results = substr($results, 0, $length - 3) . '...';
                 }
             }
-             
+
             $results = htmlspecialchars($results);
-    } 
+    }
 
     return $results;
-} 
-
-?>
\ No newline at end of file
+}
diff --git a/include/smarty/libs/plugins/modifier.escape.php b/include/smarty/libs/plugins/modifier.escape.php
index 5ca8e7796..9fdb0702f 100644
--- a/include/smarty/libs/plugins/modifier.escape.php
+++ b/include/smarty/libs/plugins/modifier.escape.php
@@ -2,23 +2,24 @@
 /**
  * Smarty plugin
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage PluginsModifier
  */
 
 /**
  * Smarty escape modifier plugin
- *
  * Type:     modifier<br>
  * Name:     escape<br>
  * Purpose:  escape string for output
  *
- * @link http://www.smarty.net/manual/en/language.modifier.count.characters.php count_characters (Smarty online manual)
+ * @link   http://www.smarty.net/docs/en/language.modifier.escape
  * @author Monte Ohrt <monte at ohrt dot com>
+ *
  * @param string  $string        input string
  * @param string  $esc_type      escape type
  * @param string  $char_set      character set, used for htmlspecialchars() or htmlentities()
  * @param boolean $double_encode encode already encoded entitites again, used for htmlspecialchars() or htmlentities()
+ *
  * @return string escaped input string
  */
 function smarty_modifier_escape($string, $esc_type = 'html', $char_set = null, $double_encode = true)
@@ -27,7 +28,7 @@ function smarty_modifier_escape($string, $esc_type = 'html', $char_set = null, $
     if ($_double_encode === null) {
         $_double_encode = version_compare(PHP_VERSION, '5.2.3', '>=');
     }
-    
+
     if (!$char_set) {
         $char_set = Smarty::$_CHARSET;
     }
@@ -46,6 +47,7 @@ function smarty_modifier_escape($string, $esc_type = 'html', $char_set = null, $
                     $string = preg_replace('!&(#?\w+);!', '%%%SMARTY_START%%%\\1%%%SMARTY_END%%%', $string);
                     $string = htmlspecialchars($string, ENT_QUOTES, $char_set);
                     $string = str_replace(array('%%%SMARTY_START%%%', '%%%SMARTY_END%%%'), array('&', ';'), $string);
+
                     return $string;
                 }
             }
@@ -65,10 +67,11 @@ function smarty_modifier_escape($string, $esc_type = 'html', $char_set = null, $
                         $string = preg_replace('!&(#?\w+);!', '%%%SMARTY_START%%%\\1%%%SMARTY_END%%%', $string);
                         $string = htmlspecialchars($string, ENT_QUOTES, $char_set);
                         $string = str_replace(array('%%%SMARTY_START%%%', '%%%SMARTY_END%%%'), array('&', ';'), $string);
+
                         return $string;
                     }
                 }
-                
+
                 // htmlentities() won't convert everything, so use mb_convert_encoding
                 return mb_convert_encoding($string, 'HTML-ENTITIES', $char_set);
             }
@@ -83,6 +86,7 @@ function smarty_modifier_escape($string, $esc_type = 'html', $char_set = null, $
                     $string = preg_replace('!&(#?\w+);!', '%%%SMARTY_START%%%\\1%%%SMARTY_END%%%', $string);
                     $string = htmlentities($string, ENT_QUOTES, $char_set);
                     $string = str_replace(array('%%%SMARTY_START%%%', '%%%SMARTY_END%%%'), array('&', ';'), $string);
+
                     return $string;
                 }
             }
@@ -102,9 +106,10 @@ function smarty_modifier_escape($string, $esc_type = 'html', $char_set = null, $
             // Note that the UTF-8 encoded character ä will be represented as %c3%a4
             $return = '';
             $_length = strlen($string);
-            for ($x = 0; $x < $_length; $x++) {
+            for ($x = 0; $x < $_length; $x ++) {
                 $return .= '%' . bin2hex($string[$x]);
             }
+
             return $return;
 
         case 'hexentity':
@@ -115,13 +120,15 @@ function smarty_modifier_escape($string, $esc_type = 'html', $char_set = null, $
                 foreach (smarty_mb_to_unicode($string, Smarty::$_CHARSET) as $unicode) {
                     $return .= '&#x' . strtoupper(dechex($unicode)) . ';';
                 }
+
                 return $return;
             }
             // no MBString fallback
             $_length = strlen($string);
-            for ($x = 0; $x < $_length; $x++) {
+            for ($x = 0; $x < $_length; $x ++) {
                 $return .= '&#x' . bin2hex($string[$x]) . ';';
             }
+
             return $return;
 
         case 'decentity':
@@ -132,13 +139,15 @@ function smarty_modifier_escape($string, $esc_type = 'html', $char_set = null, $
                 foreach (smarty_mb_to_unicode($string, Smarty::$_CHARSET) as $unicode) {
                     $return .= '&#' . $unicode . ';';
                 }
+
                 return $return;
             }
             // no MBString fallback
             $_length = strlen($string);
-            for ($x = 0; $x < $_length; $x++) {
+            for ($x = 0; $x < $_length; $x ++) {
                 $return .= '&#' . ord($string[$x]) . ';';
             }
+
             return $return;
 
         case 'javascript':
@@ -148,6 +157,7 @@ function smarty_modifier_escape($string, $esc_type = 'html', $char_set = null, $
         case 'mail':
             if (Smarty::$_MBSTRING) {
                 require_once(SMARTY_PLUGINS_DIR . 'shared.mb_str_replace.php');
+
                 return smarty_mb_str_replace(array('@', '.'), array(' [AT] ', ' [DOT] '), $string);
             }
             // no MBString fallback
@@ -165,11 +175,12 @@ function smarty_modifier_escape($string, $esc_type = 'html', $char_set = null, $
                         $return .= chr($unicode);
                     }
                 }
+
                 return $return;
             }
 
             $_length = strlen($string);
-            for ($_i = 0; $_i < $_length; $_i++) {
+            for ($_i = 0; $_i < $_length; $_i ++) {
                 $_ord = ord(substr($string, $_i, 1));
                 // non-standard char, escape it
                 if ($_ord >= 126) {
@@ -178,11 +189,10 @@ function smarty_modifier_escape($string, $esc_type = 'html', $char_set = null, $
                     $return .= substr($string, $_i, 1);
                 }
             }
+
             return $return;
 
         default:
             return $string;
     }
 }
-
-?>
\ No newline at end of file
diff --git a/include/smarty/libs/plugins/modifier.regex_replace.php b/include/smarty/libs/plugins/modifier.regex_replace.php
index f9fd5fa53..ffea16755 100644
--- a/include/smarty/libs/plugins/modifier.regex_replace.php
+++ b/include/smarty/libs/plugins/modifier.regex_replace.php
@@ -2,39 +2,43 @@
 /**
  * Smarty plugin
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage PluginsModifier
  */
 
 /**
  * Smarty regex_replace modifier plugin
- *
  * Type:     modifier<br>
  * Name:     regex_replace<br>
  * Purpose:  regular expression search/replace
  *
- * @link http://smarty.php.net/manual/en/language.modifier.regex.replace.php
+ * @link    http://smarty.php.net/manual/en/language.modifier.regex.replace.php
  *          regex_replace (Smarty online manual)
- * @author Monte Ohrt <monte at ohrt dot com>
- * @param string       $string   input string
- * @param string|array $search   regular expression(s) to search for
- * @param string|array $replace  string(s) that should be replaced
+ * @author  Monte Ohrt <monte at ohrt dot com>
+ *
+ * @param string       $string  input string
+ * @param string|array $search  regular expression(s) to search for
+ * @param string|array $replace string(s) that should be replaced
+ * @param int          $limit   the maximum number of replacements
+ *
  * @return string
  */
-function smarty_modifier_regex_replace($string, $search, $replace)
+function smarty_modifier_regex_replace($string, $search, $replace, $limit = -1)
 {
-    if(is_array($search)) {
-        foreach($search as $idx => $s) {
+    if (is_array($search)) {
+        foreach ($search as $idx => $s) {
             $search[$idx] = _smarty_regex_replace_check($s);
         }
     } else {
         $search = _smarty_regex_replace_check($search);
     }
-    return preg_replace($search, $replace, $string);
+
+    return preg_replace($search, $replace, $string, $limit);
 }
 
 /**
  * @param  string $search string(s) that should be replaced
+ *
  * @return string
  * @ignore
  */
@@ -42,14 +46,13 @@ function _smarty_regex_replace_check($search)
 {
     // null-byte injection detection
     // anything behind the first null-byte is ignored
-    if (($pos = strpos($search,"\0")) !== false) {
-        $search = substr($search,0,$pos);
+    if (($pos = strpos($search, "\0")) !== false) {
+        $search = substr($search, 0, $pos);
     }
     // remove eval-modifier from $search
     if (preg_match('!([a-zA-Z\s]+)$!s', $search, $match) && (strpos($match[1], 'e') !== false)) {
-        $search = substr($search, 0, -strlen($match[1])) . preg_replace('![e\s]+!', '', $match[1]);
+        $search = substr($search, 0, - strlen($match[1])) . preg_replace('![e\s]+!', '', $match[1]);
     }
+
     return $search;
 }
-
-?>
\ No newline at end of file
diff --git a/include/smarty/libs/plugins/modifier.replace.php b/include/smarty/libs/plugins/modifier.replace.php
index 4d71a6e9b..aa5e8570b 100644
--- a/include/smarty/libs/plugins/modifier.replace.php
+++ b/include/smarty/libs/plugins/modifier.replace.php
@@ -1,33 +1,34 @@
 <?php
 /**
  * Smarty plugin
- * @package Smarty
+ *
+ * @package    Smarty
  * @subpackage PluginsModifier
  */
 
 /**
  * Smarty replace modifier plugin
- * 
  * Type:     modifier<br>
  * Name:     replace<br>
  * Purpose:  simple search/replace
- * 
- * @link http://smarty.php.net/manual/en/language.modifier.replace.php replace (Smarty online manual)
- * @author Monte Ohrt <monte at ohrt dot com> 
- * @author Uwe Tews 
+ *
+ * @link   http://smarty.php.net/manual/en/language.modifier.replace.php replace (Smarty online manual)
+ * @author Monte Ohrt <monte at ohrt dot com>
+ * @author Uwe Tews
+ *
  * @param string $string  input string
  * @param string $search  text to search for
  * @param string $replace replacement text
- * @return string 
+ *
+ * @return string
  */
 function smarty_modifier_replace($string, $search, $replace)
 {
     if (Smarty::$_MBSTRING) {
         require_once(SMARTY_PLUGINS_DIR . 'shared.mb_str_replace.php');
+
         return smarty_mb_str_replace($search, $replace, $string);
     }
-    
-    return str_replace($search, $replace, $string);
-} 
 
-?>
\ No newline at end of file
+    return str_replace($search, $replace, $string);
+}
diff --git a/include/smarty/libs/plugins/modifier.spacify.php b/include/smarty/libs/plugins/modifier.spacify.php
index a907232ff..e5c41ad8b 100644
--- a/include/smarty/libs/plugins/modifier.spacify.php
+++ b/include/smarty/libs/plugins/modifier.spacify.php
@@ -1,27 +1,27 @@
 <?php
 /**
  * Smarty plugin
- * @package Smarty
+ *
+ * @package    Smarty
  * @subpackage PluginsModifier
  */
 
 /**
  * Smarty spacify modifier plugin
- * 
  * Type:     modifier<br>
  * Name:     spacify<br>
  * Purpose:  add spaces between characters in a string
- * 
- * @link http://smarty.php.net/manual/en/language.modifier.spacify.php spacify (Smarty online manual)
- * @author Monte Ohrt <monte at ohrt dot com> 
+ *
+ * @link   http://smarty.php.net/manual/en/language.modifier.spacify.php spacify (Smarty online manual)
+ * @author Monte Ohrt <monte at ohrt dot com>
+ *
  * @param string $string       input string
  * @param string $spacify_char string to insert between characters.
+ *
  * @return string
  */
 function smarty_modifier_spacify($string, $spacify_char = ' ')
 {
     // well… what about charsets besides latin and UTF-8?
-    return implode($spacify_char, preg_split('//' . Smarty::$_UTF8_MODIFIER, $string, -1, PREG_SPLIT_NO_EMPTY));
-} 
-
-?>
\ No newline at end of file
+    return implode($spacify_char, preg_split('//' . Smarty::$_UTF8_MODIFIER, $string, - 1, PREG_SPLIT_NO_EMPTY));
+}
diff --git a/include/smarty/libs/plugins/modifier.truncate.php b/include/smarty/libs/plugins/modifier.truncate.php
index 9a803ec99..fbe62e823 100644
--- a/include/smarty/libs/plugins/modifier.truncate.php
+++ b/include/smarty/libs/plugins/modifier.truncate.php
@@ -2,58 +2,63 @@
 /**
  * Smarty plugin
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage PluginsModifier
  */
- 
+
 /**
  * Smarty truncate modifier plugin
- * 
  * Type:     modifier<br>
  * Name:     truncate<br>
  * Purpose:  Truncate a string to a certain length if necessary,
  *               optionally splitting in the middle of a word, and
  *               appending the $etc string or inserting $etc into the middle.
- * 
- * @link http://smarty.php.net/manual/en/language.modifier.truncate.php truncate (Smarty online manual)
- * @author Monte Ohrt <monte at ohrt dot com> 
+ *
+ * @link   http://smarty.php.net/manual/en/language.modifier.truncate.php truncate (Smarty online manual)
+ * @author Monte Ohrt <monte at ohrt dot com>
+ *
  * @param string  $string      input string
  * @param integer $length      length of truncated text
  * @param string  $etc         end string
  * @param boolean $break_words truncate at word boundary
  * @param boolean $middle      truncate in the middle of text
+ *
  * @return string truncated string
  */
-function smarty_modifier_truncate($string, $length = 80, $etc = '...', $break_words = false, $middle = false) {
-    if ($length == 0)
+function smarty_modifier_truncate($string, $length = 80, $etc = '...', $break_words = false, $middle = false)
+{
+    if ($length == 0) {
         return '';
+    }
 
     if (Smarty::$_MBSTRING) {
         if (mb_strlen($string, Smarty::$_CHARSET) > $length) {
             $length -= min($length, mb_strlen($etc, Smarty::$_CHARSET));
             if (!$break_words && !$middle) {
                 $string = preg_replace('/\s+?(\S+)?$/' . Smarty::$_UTF8_MODIFIER, '', mb_substr($string, 0, $length + 1, Smarty::$_CHARSET));
-            } 
+            }
             if (!$middle) {
                 return mb_substr($string, 0, $length, Smarty::$_CHARSET) . $etc;
             }
+
             return mb_substr($string, 0, $length / 2, Smarty::$_CHARSET) . $etc . mb_substr($string, - $length / 2, $length, Smarty::$_CHARSET);
         }
+
         return $string;
     }
-    
+
     // no MBString fallback
     if (isset($string[$length])) {
         $length -= min($length, strlen($etc));
         if (!$break_words && !$middle) {
             $string = preg_replace('/\s+?(\S+)?$/', '', substr($string, 0, $length + 1));
-        } 
+        }
         if (!$middle) {
             return substr($string, 0, $length) . $etc;
         }
+
         return substr($string, 0, $length / 2) . $etc . substr($string, - $length / 2);
     }
-    return $string;
-} 
 
-?>
\ No newline at end of file
+    return $string;
+}
diff --git a/include/smarty/libs/plugins/modifiercompiler.cat.php b/include/smarty/libs/plugins/modifiercompiler.cat.php
index 5049c63e5..db9d81fbf 100644
--- a/include/smarty/libs/plugins/modifiercompiler.cat.php
+++ b/include/smarty/libs/plugins/modifiercompiler.cat.php
@@ -2,13 +2,12 @@
 /**
  * Smarty plugin
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage PluginsModifierCompiler
  */
 
 /**
  * Smarty cat modifier plugin
- *
  * Type:     modifier<br>
  * Name:     cat<br>
  * Date:     Feb 24, 2003<br>
@@ -16,15 +15,15 @@
  * Input:    string to catenate<br>
  * Example:  {$var|cat:"foo"}
  *
- * @link http://smarty.php.net/manual/en/language.modifier.cat.php cat
- *          (Smarty online manual)
+ * @link     http://smarty.php.net/manual/en/language.modifier.cat.php cat
+ *           (Smarty online manual)
  * @author   Uwe Tews
+ *
  * @param array $params parameters
+ *
  * @return string with compiled code
  */
-function smarty_modifiercompiler_cat($params, $compiler)
+function smarty_modifiercompiler_cat($params)
 {
-    return '('.implode(').(', $params).')';
+    return '(' . implode(').(', $params) . ')';
 }
-
-?>
\ No newline at end of file
diff --git a/include/smarty/libs/plugins/modifiercompiler.count_characters.php b/include/smarty/libs/plugins/modifiercompiler.count_characters.php
index 0f269c9fa..f8463d80a 100644
--- a/include/smarty/libs/plugins/modifiercompiler.count_characters.php
+++ b/include/smarty/libs/plugins/modifiercompiler.count_characters.php
@@ -2,23 +2,24 @@
 /**
  * Smarty plugin
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage PluginsModifierCompiler
  */
 
 /**
  * Smarty count_characters modifier plugin
- *
  * Type:     modifier<br>
  * Name:     count_characteres<br>
  * Purpose:  count the number of characters in a text
  *
- * @link http://www.smarty.net/manual/en/language.modifier.count.characters.php count_characters (Smarty online manual)
+ * @link   http://www.smarty.net/manual/en/language.modifier.count.characters.php count_characters (Smarty online manual)
  * @author Uwe Tews
+ *
  * @param array $params parameters
+ *
  * @return string with compiled code
  */
-function smarty_modifiercompiler_count_characters($params, $compiler)
+function smarty_modifiercompiler_count_characters($params)
 {
     if (!isset($params[1]) || $params[1] != 'true') {
         return 'preg_match_all(\'/[^\s]/' . Smarty::$_UTF8_MODIFIER . '\',' . $params[0] . ', $tmp)';
@@ -29,5 +30,3 @@ function smarty_modifiercompiler_count_characters($params, $compiler)
     // no MBString fallback
     return 'strlen(' . $params[0] . ')';
 }
-
-?>
\ No newline at end of file
diff --git a/include/smarty/libs/plugins/modifiercompiler.count_paragraphs.php b/include/smarty/libs/plugins/modifiercompiler.count_paragraphs.php
index 853f98f46..34f0bbb8a 100644
--- a/include/smarty/libs/plugins/modifiercompiler.count_paragraphs.php
+++ b/include/smarty/libs/plugins/modifiercompiler.count_paragraphs.php
@@ -2,27 +2,26 @@
 /**
  * Smarty plugin
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage PluginsModifierCompiler
  */
 
 /**
  * Smarty count_paragraphs modifier plugin
- *
  * Type:     modifier<br>
  * Name:     count_paragraphs<br>
  * Purpose:  count the number of paragraphs in a text
  *
- * @link http://www.smarty.net/manual/en/language.modifier.count.paragraphs.php
+ * @link    http://www.smarty.net/manual/en/language.modifier.count.paragraphs.php
  *          count_paragraphs (Smarty online manual)
- * @author Uwe Tews
+ * @author  Uwe Tews
+ *
  * @param array $params parameters
+ *
  * @return string with compiled code
  */
-function smarty_modifiercompiler_count_paragraphs($params, $compiler)
+function smarty_modifiercompiler_count_paragraphs($params)
 {
     // count \r or \n characters
     return '(preg_match_all(\'#[\r\n]+#\', ' . $params[0] . ', $tmp)+1)';
 }
-
-?>
\ No newline at end of file
diff --git a/include/smarty/libs/plugins/modifiercompiler.count_sentences.php b/include/smarty/libs/plugins/modifiercompiler.count_sentences.php
index f8d79b3f2..f1ec56007 100644
--- a/include/smarty/libs/plugins/modifiercompiler.count_sentences.php
+++ b/include/smarty/libs/plugins/modifiercompiler.count_sentences.php
@@ -2,27 +2,26 @@
 /**
  * Smarty plugin
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage PluginsModifierCompiler
  */
 
 /**
  * Smarty count_sentences modifier plugin
- *
  * Type:     modifier<br>
  * Name:     count_sentences
  * Purpose:  count the number of sentences in a text
  *
- * @link http://www.smarty.net/manual/en/language.modifier.count.paragraphs.php
+ * @link    http://www.smarty.net/manual/en/language.modifier.count.paragraphs.php
  *          count_sentences (Smarty online manual)
- * @author Uwe Tews
+ * @author  Uwe Tews
+ *
  * @param array $params parameters
+ *
  * @return string with compiled code
  */
-function smarty_modifiercompiler_count_sentences($params, $compiler)
+function smarty_modifiercompiler_count_sentences($params)
 {
     // find periods, question marks, exclamation marks with a word before but not after.
     return 'preg_match_all("#\w[\.\?\!](\W|$)#S' . Smarty::$_UTF8_MODIFIER . '", ' . $params[0] . ', $tmp)';
 }
-
-?>
\ No newline at end of file
diff --git a/include/smarty/libs/plugins/modifiercompiler.count_words.php b/include/smarty/libs/plugins/modifiercompiler.count_words.php
index f53443e24..8b4330f1e 100644
--- a/include/smarty/libs/plugins/modifiercompiler.count_words.php
+++ b/include/smarty/libs/plugins/modifiercompiler.count_words.php
@@ -2,23 +2,24 @@
 /**
  * Smarty plugin
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage PluginsModifierCompiler
  */
 
 /**
  * Smarty count_words modifier plugin
- *
  * Type:     modifier<br>
  * Name:     count_words<br>
  * Purpose:  count the number of words in a text
  *
- * @link http://www.smarty.net/manual/en/language.modifier.count.words.php count_words (Smarty online manual)
+ * @link   http://www.smarty.net/manual/en/language.modifier.count.words.php count_words (Smarty online manual)
  * @author Uwe Tews
+ *
  * @param array $params parameters
+ *
  * @return string with compiled code
-*/
-function smarty_modifiercompiler_count_words($params, $compiler)
+ */
+function smarty_modifiercompiler_count_words($params)
 {
     if (Smarty::$_MBSTRING) {
         // return 'preg_match_all(\'#[\w\pL]+#' . Smarty::$_UTF8_MODIFIER . '\', ' . $params[0] . ', $tmp)';
@@ -28,5 +29,3 @@ function smarty_modifiercompiler_count_words($params, $compiler)
     // no MBString fallback
     return 'str_word_count(' . $params[0] . ')';
 }
-
-?>
\ No newline at end of file
diff --git a/include/smarty/libs/plugins/modifiercompiler.default.php b/include/smarty/libs/plugins/modifiercompiler.default.php
index 3554964e4..fe777623e 100644
--- a/include/smarty/libs/plugins/modifiercompiler.default.php
+++ b/include/smarty/libs/plugins/modifiercompiler.default.php
@@ -2,34 +2,34 @@
 /**
  * Smarty plugin
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage PluginsModifierCompiler
  */
 
 /**
  * Smarty default modifier plugin
- *
  * Type:     modifier<br>
  * Name:     default<br>
  * Purpose:  designate default value for empty variables
  *
- * @link http://www.smarty.net/manual/en/language.modifier.default.php default (Smarty online manual)
+ * @link   http://www.smarty.net/manual/en/language.modifier.default.php default (Smarty online manual)
  * @author Uwe Tews
+ *
  * @param array $params parameters
+ *
  * @return string with compiled code
  */
-function smarty_modifiercompiler_default ($params, $compiler)
+function smarty_modifiercompiler_default($params)
 {
     $output = $params[0];
     if (!isset($params[1])) {
         $params[1] = "''";
     }
-    
+
     array_shift($params);
     foreach ($params as $param) {
         $output = '(($tmp = @' . $output . ')===null||$tmp===\'\' ? ' . $param . ' : $tmp)';
     }
+
     return $output;
 }
-
-?>
\ No newline at end of file
diff --git a/include/smarty/libs/plugins/modifiercompiler.escape.php b/include/smarty/libs/plugins/modifiercompiler.escape.php
index d38d12975..0b29220ef 100644
--- a/include/smarty/libs/plugins/modifiercompiler.escape.php
+++ b/include/smarty/libs/plugins/modifiercompiler.escape.php
@@ -2,25 +2,27 @@
 /**
  * Smarty plugin
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage PluginsModifierCompiler
  */
 
 /**
  * @ignore
  */
-require_once( SMARTY_PLUGINS_DIR .'shared.literal_compiler_param.php' );
+require_once(SMARTY_PLUGINS_DIR . 'shared.literal_compiler_param.php');
 
 /**
  * Smarty escape modifier plugin
- *
  * Type:     modifier<br>
  * Name:     escape<br>
  * Purpose:  escape string for output
  *
- * @link http://www.smarty.net/docsv2/en/language.modifier.escape count_characters (Smarty online manual)
+ * @link   http://www.smarty.net/docsv2/en/language.modifier.escape count_characters (Smarty online manual)
  * @author Rodney Rehm
+ *
  * @param array $params parameters
+ * @param       $compiler
+ *
  * @return string with compiled code
  */
 function smarty_modifiercompiler_escape($params, $compiler)
@@ -29,7 +31,7 @@ function smarty_modifiercompiler_escape($params, $compiler)
     if ($_double_encode === null) {
         $_double_encode = version_compare(PHP_VERSION, '5.2.3', '>=');
     }
-    
+
     try {
         $esc_type = smarty_literal_compiler_param($params, 1, 'html');
         $char_set = smarty_literal_compiler_param($params, 2, Smarty::$_CHARSET);
@@ -43,13 +45,13 @@ function smarty_modifiercompiler_escape($params, $compiler)
             case 'html':
                 if ($_double_encode) {
                     return 'htmlspecialchars('
-                        . $params[0] .', ENT_QUOTES, '
-                        . var_export($char_set, true) . ', '
-                        . var_export($double_encode, true) . ')';
-                } else if ($double_encode) {
+                    . $params[0] . ', ENT_QUOTES, '
+                    . var_export($char_set, true) . ', '
+                    . var_export($double_encode, true) . ')';
+                } elseif ($double_encode) {
                     return 'htmlspecialchars('
-                        . $params[0] .', ENT_QUOTES, '
-                        . var_export($char_set, true) . ')';
+                    . $params[0] . ', ENT_QUOTES, '
+                    . var_export($char_set, true) . ')';
                 } else {
                     // fall back to modifier.escape.php
                 }
@@ -59,18 +61,18 @@ function smarty_modifiercompiler_escape($params, $compiler)
                     if ($_double_encode) {
                         // php >=5.2.3 - go native
                         return 'mb_convert_encoding(htmlspecialchars('
-                            . $params[0] .', ENT_QUOTES, '
-                            . var_export($char_set, true) . ', '
-                            . var_export($double_encode, true)
-                            . '), "HTML-ENTITIES", '
-                            . var_export($char_set, true) . ')';
-                    } else if ($double_encode) {
+                        . $params[0] . ', ENT_QUOTES, '
+                        . var_export($char_set, true) . ', '
+                        . var_export($double_encode, true)
+                        . '), "HTML-ENTITIES", '
+                        . var_export($char_set, true) . ')';
+                    } elseif ($double_encode) {
                         // php <5.2.3 - only handle double encoding
                         return 'mb_convert_encoding(htmlspecialchars('
-                            . $params[0] .', ENT_QUOTES, '
-                            . var_export($char_set, true)
-                            . '), "HTML-ENTITIES", '
-                            . var_export($char_set, true) . ')';
+                        . $params[0] . ', ENT_QUOTES, '
+                        . var_export($char_set, true)
+                        . '), "HTML-ENTITIES", '
+                        . var_export($char_set, true) . ')';
                     } else {
                         // fall back to modifier.escape.php
                     }
@@ -80,14 +82,14 @@ function smarty_modifiercompiler_escape($params, $compiler)
                 if ($_double_encode) {
                     // php >=5.2.3 - go native
                     return 'htmlentities('
-                        . $params[0] .', ENT_QUOTES, '
-                        . var_export($char_set, true) . ', '
-                        . var_export($double_encode, true) . ')';
-                } else if ($double_encode) {
+                    . $params[0] . ', ENT_QUOTES, '
+                    . var_export($char_set, true) . ', '
+                    . var_export($double_encode, true) . ')';
+                } elseif ($double_encode) {
                     // php <5.2.3 - only handle double encoding
                     return 'htmlentities('
-                        . $params[0] .', ENT_QUOTES, '
-                        . var_export($char_set, true) . ')';
+                    . $params[0] . ', ENT_QUOTES, '
+                    . var_export($char_set, true) . ')';
                 } else {
                     // fall back to modifier.escape.php
                 }
@@ -105,21 +107,20 @@ function smarty_modifiercompiler_escape($params, $compiler)
             case 'javascript':
                 // escape quotes and backslashes, newlines, etc.
                 return 'strtr(' . $params[0] . ', array("\\\\" => "\\\\\\\\", "\'" => "\\\\\'", "\"" => "\\\\\"", "\\r" => "\\\\r", "\\n" => "\\\n", "</" => "<\/" ))';
-
         }
-    } catch(SmartyException $e) {
+    }
+    catch (SmartyException $e) {
         // pass through to regular plugin fallback
     }
 
     // could not optimize |escape call, so fallback to regular plugin
-    if ($compiler->tag_nocache | $compiler->nocache) {
-        $compiler->template->required_plugins['nocache']['escape']['modifier']['file'] = SMARTY_PLUGINS_DIR .'modifier.escape.php';
-        $compiler->template->required_plugins['nocache']['escape']['modifier']['function'] = 'smarty_modifier_escape';
+    if ($compiler->template->caching && ($compiler->tag_nocache | $compiler->nocache)) {
+        $compiler->parent_compiler->template->compiled->required_plugins['nocache']['escape']['modifier']['file'] = SMARTY_PLUGINS_DIR . 'modifier.escape.php';
+        $compiler->parent_compiler->template->compiled->required_plugins['nocache']['escape']['modifier']['function'] = 'smarty_modifier_escape';
     } else {
-        $compiler->template->required_plugins['compiled']['escape']['modifier']['file'] = SMARTY_PLUGINS_DIR .'modifier.escape.php';
-        $compiler->template->required_plugins['compiled']['escape']['modifier']['function'] = 'smarty_modifier_escape';
+        $compiler->parent_compiler->template->compiled->required_plugins['compiled']['escape']['modifier']['file'] = SMARTY_PLUGINS_DIR . 'modifier.escape.php';
+        $compiler->parent_compiler->template->compiled->required_plugins['compiled']['escape']['modifier']['function'] = 'smarty_modifier_escape';
     }
-    return 'smarty_modifier_escape(' . join( ', ', $params ) . ')';
-}
 
-?>
\ No newline at end of file
+    return 'smarty_modifier_escape(' . join(', ', $params) . ')';
+}
diff --git a/include/smarty/libs/plugins/modifiercompiler.from_charset.php b/include/smarty/libs/plugins/modifiercompiler.from_charset.php
index 5d6b7889a..dab43e9c3 100644
--- a/include/smarty/libs/plugins/modifiercompiler.from_charset.php
+++ b/include/smarty/libs/plugins/modifiercompiler.from_charset.php
@@ -2,22 +2,23 @@
 /**
  * Smarty plugin
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage PluginsModifierCompiler
  */
 
 /**
  * Smarty from_charset modifier plugin
- *
  * Type:     modifier<br>
  * Name:     from_charset<br>
  * Purpose:  convert character encoding from $charset to internal encoding
  *
  * @author Rodney Rehm
+ *
  * @param array $params parameters
+ *
  * @return string with compiled code
  */
-function smarty_modifiercompiler_from_charset($params, $compiler)
+function smarty_modifiercompiler_from_charset($params)
 {
     if (!Smarty::$_MBSTRING) {
         // FIXME: (rodneyrehm) shouldn't this throw an error?
@@ -30,5 +31,3 @@ function smarty_modifiercompiler_from_charset($params, $compiler)
 
     return 'mb_convert_encoding(' . $params[0] . ', "' . addslashes(Smarty::$_CHARSET) . '", ' . $params[1] . ')';
 }
-
-?>
\ No newline at end of file
diff --git a/include/smarty/libs/plugins/modifiercompiler.indent.php b/include/smarty/libs/plugins/modifiercompiler.indent.php
index 26094b7ca..e3ca20821 100644
--- a/include/smarty/libs/plugins/modifiercompiler.indent.php
+++ b/include/smarty/libs/plugins/modifiercompiler.indent.php
@@ -1,24 +1,26 @@
 <?php
 /**
  * Smarty plugin
- * @package Smarty
+ *
+ * @package    Smarty
  * @subpackage PluginsModifierCompiler
  */
 
 /**
  * Smarty indent modifier plugin
- *
  * Type:     modifier<br>
  * Name:     indent<br>
  * Purpose:  indent lines of text
  *
- * @link http://www.smarty.net/manual/en/language.modifier.indent.php indent (Smarty online manual)
+ * @link   http://www.smarty.net/manual/en/language.modifier.indent.php indent (Smarty online manual)
  * @author Uwe Tews
+ *
  * @param array $params parameters
+ *
  * @return string with compiled code
  */
 
-function smarty_modifiercompiler_indent($params, $compiler)
+function smarty_modifiercompiler_indent($params)
 {
     if (!isset($params[1])) {
         $params[1] = 4;
@@ -26,7 +28,6 @@ function smarty_modifiercompiler_indent($params, $compiler)
     if (!isset($params[2])) {
         $params[2] = "' '";
     }
+
     return 'preg_replace(\'!^!m\',str_repeat(' . $params[2] . ',' . $params[1] . '),' . $params[0] . ')';
 }
-
-?>
\ No newline at end of file
diff --git a/include/smarty/libs/plugins/modifiercompiler.lower.php b/include/smarty/libs/plugins/modifiercompiler.lower.php
index bc3abd727..1d255f371 100644
--- a/include/smarty/libs/plugins/modifiercompiler.lower.php
+++ b/include/smarty/libs/plugins/modifiercompiler.lower.php
@@ -1,31 +1,31 @@
 <?php
 /**
  * Smarty plugin
- * @package Smarty
+ *
+ * @package    Smarty
  * @subpackage PluginsModifierCompiler
  */
 
 /**
  * Smarty lower modifier plugin
- *
  * Type:     modifier<br>
  * Name:     lower<br>
  * Purpose:  convert string to lowercase
  *
- * @link http://www.smarty.net/manual/en/language.modifier.lower.php lower (Smarty online manual)
+ * @link   http://www.smarty.net/manual/en/language.modifier.lower.php lower (Smarty online manual)
  * @author Monte Ohrt <monte at ohrt dot com>
  * @author Uwe Tews
+ *
  * @param array $params parameters
+ *
  * @return string with compiled code
  */
 
-function smarty_modifiercompiler_lower($params, $compiler)
+function smarty_modifiercompiler_lower($params)
 {
     if (Smarty::$_MBSTRING) {
-        return 'mb_strtolower(' . $params[0] . ', \'' . addslashes(Smarty::$_CHARSET) . '\')' ;
+        return 'mb_strtolower(' . $params[0] . ', \'' . addslashes(Smarty::$_CHARSET) . '\')';
     }
     // no MBString fallback
     return 'strtolower(' . $params[0] . ')';
 }
-
-?>
\ No newline at end of file
diff --git a/include/smarty/libs/plugins/modifiercompiler.noprint.php b/include/smarty/libs/plugins/modifiercompiler.noprint.php
index d7433e985..4906908b4 100644
--- a/include/smarty/libs/plugins/modifiercompiler.noprint.php
+++ b/include/smarty/libs/plugins/modifiercompiler.noprint.php
@@ -2,24 +2,20 @@
 /**
  * Smarty plugin
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage PluginsModifierCompiler
  */
 
 /**
  * Smarty noprint modifier plugin
- *
  * Type:     modifier<br>
  * Name:     noprint<br>
  * Purpose:  return an empty string
  *
  * @author   Uwe Tews
- * @param array $params parameters
  * @return string with compiled code
  */
-function smarty_modifiercompiler_noprint($params, $compiler)
+function smarty_modifiercompiler_noprint()
 {
     return "''";
 }
-
-?>
\ No newline at end of file
diff --git a/include/smarty/libs/plugins/modifiercompiler.string_format.php b/include/smarty/libs/plugins/modifiercompiler.string_format.php
index 5a8d43578..71cdf2819 100644
--- a/include/smarty/libs/plugins/modifiercompiler.string_format.php
+++ b/include/smarty/libs/plugins/modifiercompiler.string_format.php
@@ -2,25 +2,24 @@
 /**
  * Smarty plugin
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage PluginsModifierCompiler
  */
 
 /**
  * Smarty string_format modifier plugin
- *
  * Type:     modifier<br>
  * Name:     string_format<br>
  * Purpose:  format strings via sprintf
  *
- * @link http://www.smarty.net/manual/en/language.modifier.string.format.php string_format (Smarty online manual)
+ * @link   http://www.smarty.net/manual/en/language.modifier.string.format.php string_format (Smarty online manual)
  * @author Uwe Tews
+ *
  * @param array $params parameters
+ *
  * @return string with compiled code
  */
-function smarty_modifiercompiler_string_format($params, $compiler)
+function smarty_modifiercompiler_string_format($params)
 {
     return 'sprintf(' . $params[1] . ',' . $params[0] . ')';
 }
-
-?>
\ No newline at end of file
diff --git a/include/smarty/libs/plugins/modifiercompiler.strip.php b/include/smarty/libs/plugins/modifiercompiler.strip.php
index 8d15ca434..fcd6cbaea 100644
--- a/include/smarty/libs/plugins/modifiercompiler.strip.php
+++ b/include/smarty/libs/plugins/modifiercompiler.strip.php
@@ -2,13 +2,12 @@
 /**
  * Smarty plugin
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage PluginsModifierCompiler
  */
 
 /**
  * Smarty strip modifier plugin
- *
  * Type:     modifier<br>
  * Name:     strip<br>
  * Purpose:  Replace all repeated spaces, newlines, tabs
@@ -16,18 +15,19 @@
  * Example:  {$var|strip} {$var|strip:"&nbsp;"}<br>
  * Date:     September 25th, 2002
  *
- * @link http://www.smarty.net/manual/en/language.modifier.strip.php strip (Smarty online manual)
+ * @link   http://www.smarty.net/manual/en/language.modifier.strip.php strip (Smarty online manual)
  * @author Uwe Tews
+ *
  * @param array $params parameters
+ *
  * @return string with compiled code
  */
 
-function smarty_modifiercompiler_strip($params, $compiler)
+function smarty_modifiercompiler_strip($params)
 {
     if (!isset($params[1])) {
         $params[1] = "' '";
     }
+
     return "preg_replace('!\s+!" . Smarty::$_UTF8_MODIFIER . "', {$params[1]},{$params[0]})";
 }
-
-?>
\ No newline at end of file
diff --git a/include/smarty/libs/plugins/modifiercompiler.strip_tags.php b/include/smarty/libs/plugins/modifiercompiler.strip_tags.php
index 9ba71e3d9..da5d364cb 100644
--- a/include/smarty/libs/plugins/modifiercompiler.strip_tags.php
+++ b/include/smarty/libs/plugins/modifiercompiler.strip_tags.php
@@ -2,32 +2,28 @@
 /**
  * Smarty plugin
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage PluginsModifierCompiler
  */
 
 /**
  * Smarty strip_tags modifier plugin
- *
  * Type:     modifier<br>
  * Name:     strip_tags<br>
  * Purpose:  strip html tags from text
  *
- * @link http://www.smarty.net/manual/en/language.modifier.strip.tags.php strip_tags (Smarty online manual)
+ * @link   http://www.smarty.net/docs/en/language.modifier.strip.tags.tpl strip_tags (Smarty online manual)
  * @author Uwe Tews
+ *
  * @param array $params parameters
+ *
  * @return string with compiled code
  */
-function smarty_modifiercompiler_strip_tags($params, $compiler)
+function smarty_modifiercompiler_strip_tags($params)
 {
-   if (!isset($params[1])) {
-        $params[1] = true;
-    }
-    if ($params[1] === true) {
+    if (!isset($params[1]) || $params[1] === true || trim($params[1], '"') == 'true') {
         return "preg_replace('!<[^>]*?>!', ' ', {$params[0]})";
     } else {
         return 'strip_tags(' . $params[0] . ')';
     }
 }
-
-?>
\ No newline at end of file
diff --git a/include/smarty/libs/plugins/modifiercompiler.to_charset.php b/include/smarty/libs/plugins/modifiercompiler.to_charset.php
index d6c0f296b..9122d8bbb 100644
--- a/include/smarty/libs/plugins/modifiercompiler.to_charset.php
+++ b/include/smarty/libs/plugins/modifiercompiler.to_charset.php
@@ -2,22 +2,23 @@
 /**
  * Smarty plugin
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage PluginsModifierCompiler
  */
 
 /**
  * Smarty to_charset modifier plugin
- *
  * Type:     modifier<br>
  * Name:     to_charset<br>
  * Purpose:  convert character encoding from internal encoding to $charset
  *
  * @author Rodney Rehm
+ *
  * @param array $params parameters
+ *
  * @return string with compiled code
  */
-function smarty_modifiercompiler_to_charset($params, $compiler)
+function smarty_modifiercompiler_to_charset($params)
 {
     if (!Smarty::$_MBSTRING) {
         // FIXME: (rodneyrehm) shouldn't this throw an error?
@@ -30,5 +31,3 @@ function smarty_modifiercompiler_to_charset($params, $compiler)
 
     return 'mb_convert_encoding(' . $params[0] . ', ' . $params[1] . ', "' . addslashes(Smarty::$_CHARSET) . '")';
 }
-
-?>
\ No newline at end of file
diff --git a/include/smarty/libs/plugins/modifiercompiler.unescape.php b/include/smarty/libs/plugins/modifiercompiler.unescape.php
index 61354926f..3b17ea2e1 100644
--- a/include/smarty/libs/plugins/modifiercompiler.unescape.php
+++ b/include/smarty/libs/plugins/modifiercompiler.unescape.php
@@ -2,22 +2,23 @@
 /**
  * Smarty plugin
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage PluginsModifierCompiler
  */
 
 /**
  * Smarty unescape modifier plugin
- *
  * Type:     modifier<br>
  * Name:     unescape<br>
  * Purpose:  unescape html entities
  *
  * @author Rodney Rehm
+ *
  * @param array $params parameters
+ *
  * @return string with compiled code
  */
-function smarty_modifiercompiler_unescape($params, $compiler)
+function smarty_modifiercompiler_unescape($params)
 {
     if (!isset($params[1])) {
         $params[1] = 'html';
@@ -47,5 +48,3 @@ function smarty_modifiercompiler_unescape($params, $compiler)
             return $params[0];
     }
 }
-
-?>
\ No newline at end of file
diff --git a/include/smarty/libs/plugins/modifiercompiler.upper.php b/include/smarty/libs/plugins/modifiercompiler.upper.php
index 8611fa870..52ca4e8ff 100644
--- a/include/smarty/libs/plugins/modifiercompiler.upper.php
+++ b/include/smarty/libs/plugins/modifiercompiler.upper.php
@@ -2,29 +2,28 @@
 /**
  * Smarty plugin
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage PluginsModifierCompiler
  */
 
 /**
  * Smarty upper modifier plugin
- * 
  * Type:     modifier<br>
  * Name:     lower<br>
  * Purpose:  convert string to uppercase
- * 
- * @link http://smarty.php.net/manual/en/language.modifier.upper.php lower (Smarty online manual)
- * @author Uwe Tews 
+ *
+ * @link   http://smarty.php.net/manual/en/language.modifier.upper.php lower (Smarty online manual)
+ * @author Uwe Tews
+ *
  * @param array $params parameters
+ *
  * @return string with compiled code
  */
-function smarty_modifiercompiler_upper($params, $compiler)
+function smarty_modifiercompiler_upper($params)
 {
     if (Smarty::$_MBSTRING) {
-        return 'mb_strtoupper(' . $params[0] . ', \'' . addslashes(Smarty::$_CHARSET) . '\')' ;
+        return 'mb_strtoupper(' . $params[0] . ', \'' . addslashes(Smarty::$_CHARSET) . '\')';
     }
     // no MBString fallback
     return 'strtoupper(' . $params[0] . ')';
-} 
-
-?>
\ No newline at end of file
+}
diff --git a/include/smarty/libs/plugins/modifiercompiler.wordwrap.php b/include/smarty/libs/plugins/modifiercompiler.wordwrap.php
index 8b524f32c..6bb63247d 100644
--- a/include/smarty/libs/plugins/modifiercompiler.wordwrap.php
+++ b/include/smarty/libs/plugins/modifiercompiler.wordwrap.php
@@ -2,45 +2,46 @@
 /**
  * Smarty plugin
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage PluginsModifierCompiler
  */
 
 /**
  * Smarty wordwrap modifier plugin
- * 
  * Type:     modifier<br>
  * Name:     wordwrap<br>
  * Purpose:  wrap a string of text at a given length
- * 
- * @link http://smarty.php.net/manual/en/language.modifier.wordwrap.php wordwrap (Smarty online manual)
- * @author Uwe Tews 
+ *
+ * @link   http://smarty.php.net/manual/en/language.modifier.wordwrap.php wordwrap (Smarty online manual)
+ * @author Uwe Tews
+ *
  * @param array $params parameters
+ * @param       $compiler
+ *
  * @return string with compiled code
  */
 function smarty_modifiercompiler_wordwrap($params, $compiler)
 {
     if (!isset($params[1])) {
         $params[1] = 80;
-    } 
+    }
     if (!isset($params[2])) {
         $params[2] = '"\n"';
-    } 
+    }
     if (!isset($params[3])) {
         $params[3] = 'false';
-    } 
+    }
     $function = 'wordwrap';
     if (Smarty::$_MBSTRING) {
-        if ($compiler->tag_nocache | $compiler->nocache) {
-            $compiler->template->required_plugins['nocache']['wordwrap']['modifier']['file'] = SMARTY_PLUGINS_DIR .'shared.mb_wordwrap.php';
+        if ($compiler->template->caching && ($compiler->tag_nocache | $compiler->nocache)) {
+            $compiler->parent_compiler->template->compiled->required_plugins['nocache']['wordwrap']['modifier']['file'] = SMARTY_PLUGINS_DIR . 'shared.mb_wordwrap.php';
             $compiler->template->required_plugins['nocache']['wordwrap']['modifier']['function'] = 'smarty_mb_wordwrap';
         } else {
-            $compiler->template->required_plugins['compiled']['wordwrap']['modifier']['file'] = SMARTY_PLUGINS_DIR .'shared.mb_wordwrap.php';
-            $compiler->template->required_plugins['compiled']['wordwrap']['modifier']['function'] = 'smarty_mb_wordwrap';
+            $compiler->parent_compiler->template->compiled->required_plugins['compiled']['wordwrap']['modifier']['file'] = SMARTY_PLUGINS_DIR . 'shared.mb_wordwrap.php';
+            $compiler->parent_compiler->template->compiled->required_plugins['compiled']['wordwrap']['modifier']['function'] = 'smarty_mb_wordwrap';
         }
         $function = 'smarty_mb_wordwrap';
     }
-    return $function . '(' . $params[0] . ',' . $params[1] . ',' . $params[2] . ',' . $params[3] . ')';
-} 
 
-?>
\ No newline at end of file
+    return $function . '(' . $params[0] . ',' . $params[1] . ',' . $params[2] . ',' . $params[3] . ')';
+}
diff --git a/include/smarty/libs/plugins/outputfilter.trimwhitespace.php b/include/smarty/libs/plugins/outputfilter.trimwhitespace.php
index 87cf8c781..ad35d11a2 100644
--- a/include/smarty/libs/plugins/outputfilter.trimwhitespace.php
+++ b/include/smarty/libs/plugins/outputfilter.trimwhitespace.php
@@ -2,22 +2,22 @@
 /**
  * Smarty plugin
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage PluginsFilter
  */
 
 /**
  * Smarty trimwhitespace outputfilter plugin
- *
  * Trim unnecessary whitespace from HTML markup.
  *
  * @author   Rodney Rehm
- * @param string                   $source input string
- * @param Smarty_Internal_Template $smarty Smarty object
+ *
+ * @param string $source input string
+ *
  * @return string filtered output
- * @todo substr_replace() is not overloaded by mbstring.func_overload - so this function might fail!
+ * @todo     substr_replace() is not overloaded by mbstring.func_overload - so this function might fail!
  */
-function smarty_outputfilter_trimwhitespace($source, Smarty_Internal_Template $smarty)
+function smarty_outputfilter_trimwhitespace($source)
 {
     $store = array();
     $_store = 0;
@@ -35,17 +35,17 @@ function smarty_outputfilter_trimwhitespace($source, Smarty_Internal_Template $s
             $source = substr_replace($source, $replace, $match[0][1] - $_offset, $_length);
 
             $_offset += $_length - strlen($replace);
-            $_store++;
+            $_store ++;
         }
     }
 
     // Strip all HTML-Comments
     // yes, even the ones in <script> - see http://stackoverflow.com/a/808850/515124
-    $source = preg_replace( '#<!--.*?-->#ms', '', $source );
+    $source = preg_replace('#<!--.*?-->#ms', '', $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]);
@@ -53,42 +53,38 @@ function smarty_outputfilter_trimwhitespace($source, Smarty_Internal_Template $s
             $source = substr_replace($source, $replace, $match[0][1] - $_offset, $_length);
 
             $_offset += $_length - strlen($replace);
-            $_store++;
+            $_store ++;
         }
     }
 
     $expressions = array(
         // replace multiple spaces between tags by a single space
         // can't remove them entirely, becaue that might break poorly implemented CSS display:inline-block elements
-        '#(:SMARTY@!@|>)\s+(?=@!@SMARTY:|<)#s' => '\1 \2',
+        '#(: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' => '<',
-        '#>\s+$#Ss' => '>',
+        '#^\s+<#Ss'                                                       => '<',
+        '#>\s+$#Ss'                                                       => '>',
     );
 
-    $source = preg_replace( array_keys($expressions), array_values($expressions), $source );
+    $source = preg_replace(array_keys($expressions), array_values($expressions), $source);
     // note: for some very weird reason trim() seems to remove spaces inside attributes.
     // maybe a \0 byte or something is interfering?
     // $source = trim( $source );
 
-    // capture html elements not to be messed with
     $_offset = 0;
     if (preg_match_all('#@!@SMARTY:([0-9]+):SMARTY@!@#is', $source, $matches, PREG_OFFSET_CAPTURE | PREG_SET_ORDER)) {
         foreach ($matches as $match) {
-            $store[] = $match[0][0];
             $_length = strlen($match[0][0]);
-            $replace = array_shift($store);
+            $replace = $store[$match[1][0]];
             $source = substr_replace($source, $replace, $match[0][1] + $_offset, $_length);
 
             $_offset += strlen($replace) - $_length;
-            $_store++;
+            $_store ++;
         }
     }
 
     return $source;
 }
-
-?>
\ No newline at end of file
diff --git a/include/smarty/libs/plugins/shared.escape_special_chars.php b/include/smarty/libs/plugins/shared.escape_special_chars.php
index d2609b674..d3bd756b1 100644
--- a/include/smarty/libs/plugins/shared.escape_special_chars.php
+++ b/include/smarty/libs/plugins/shared.escape_special_chars.php
@@ -2,20 +2,21 @@
 /**
  * Smarty shared plugin
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage PluginsShared
  */
 
 if (version_compare(PHP_VERSION, '5.2.3', '>=')) {
     /**
      * escape_special_chars common function
-     *
      * Function: smarty_function_escape_special_chars<br>
      * Purpose:  used by other smarty functions to escape
      *           special chars except for already escaped ones
      *
      * @author   Monte Ohrt <monte at ohrt dot com>
-     * @param string $string text that should by escaped
+     *
+     * @param  string $string text that should by escaped
+     *
      * @return string
      */
     function smarty_function_escape_special_chars($string)
@@ -23,18 +24,20 @@ if (version_compare(PHP_VERSION, '5.2.3', '>=')) {
         if (!is_array($string)) {
             $string = htmlspecialchars($string, ENT_COMPAT, Smarty::$_CHARSET, false);
         }
+
         return $string;
-    }  
-} else {         
+    }
+} else {
     /**
      * escape_special_chars common function
-     *
      * Function: smarty_function_escape_special_chars<br>
      * Purpose:  used by other smarty functions to escape
      *           special chars except for already escaped ones
      *
      * @author   Monte Ohrt <monte at ohrt dot com>
-     * @param string $string text that should by escaped
+     *
+     * @param  string $string text that should by escaped
+     *
      * @return string
      */
     function smarty_function_escape_special_chars($string)
@@ -42,10 +45,9 @@ if (version_compare(PHP_VERSION, '5.2.3', '>=')) {
         if (!is_array($string)) {
             $string = preg_replace('!&(#?\w+);!', '%%%SMARTY_START%%%\\1%%%SMARTY_END%%%', $string);
             $string = htmlspecialchars($string);
-            $string = str_replace(array('%%%SMARTY_START%%%', '%%%SMARTY_END%%%'), array('&', ';'), $string); 
+            $string = str_replace(array('%%%SMARTY_START%%%', '%%%SMARTY_END%%%'), array('&', ';'), $string);
         }
-        return $string;
-    }                                                                                                             
-} 
 
-?>
\ No newline at end of file
+        return $string;
+    }
+}
diff --git a/include/smarty/libs/plugins/shared.literal_compiler_param.php b/include/smarty/libs/plugins/shared.literal_compiler_param.php
index dbcd9374c..47d728a76 100644
--- a/include/smarty/libs/plugins/shared.literal_compiler_param.php
+++ b/include/smarty/libs/plugins/shared.literal_compiler_param.php
@@ -2,7 +2,7 @@
 /**
  * Smarty plugin
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage PluginsShared
  */
 
@@ -12,22 +12,24 @@
  * @param array   $params  parameter array as given to the compiler function
  * @param integer $index   array index of the parameter to convert
  * @param mixed   $default value to be returned if the parameter is not present
+ *
  * @return mixed evaluated value of parameter or $default
  * @throws SmartyException if parameter is not a literal (but an expression, variable, …)
  * @author Rodney Rehm
  */
-function smarty_literal_compiler_param($params, $index, $default=null)
+function smarty_literal_compiler_param($params, $index, $default = null)
 {
     // not set, go default
     if (!isset($params[$index])) {
         return $default;
     }
     // test if param is a literal
-    if (!preg_match('/^([\'"]?)[a-zA-Z0-9]+(\\1)$/', $params[$index])) {
+    if (!preg_match('/^([\'"]?)[a-zA-Z0-9-]+(\\1)$/', $params[$index])) {
         throw new SmartyException('$param[' . $index . '] is not a literal and is thus not evaluatable at compile time');
     }
 
     $t = null;
     eval("\$t = " . $params[$index] . ";");
+
     return $t;
 }
diff --git a/include/smarty/libs/plugins/shared.make_timestamp.php b/include/smarty/libs/plugins/shared.make_timestamp.php
index 5d7c97e91..f87d40c7e 100644
--- a/include/smarty/libs/plugins/shared.make_timestamp.php
+++ b/include/smarty/libs/plugins/shared.make_timestamp.php
@@ -2,7 +2,7 @@
 /**
  * Smarty shared plugin
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage PluginsShared
  */
 
@@ -11,7 +11,9 @@
  * Purpose:  used by other smarty functions to make a timestamp from a string.
  *
  * @author   Monte Ohrt <monte at ohrt dot com>
- * @param DateTime|int|string $string  date object, timestamp or string that can be converted using strtotime()
+ *
+ * @param DateTime|int|string $string date object, timestamp or string that can be converted using strtotime()
+ *
  * @return int
  */
 function smarty_make_timestamp($string)
@@ -19,24 +21,23 @@ function smarty_make_timestamp($string)
     if (empty($string)) {
         // use "now":
         return time();
-    } elseif ($string instanceof DateTime) {
-        return $string->getTimestamp();
+    } elseif ($string instanceof DateTime || (interface_exists('DateTimeInterface', false) && $string instanceof DateTimeInterface)) {
+        return (int) $string->format('U'); // PHP 5.2 BC
     } elseif (strlen($string) == 14 && ctype_digit($string)) {
         // it is mysql timestamp format of YYYYMMDDHHMMSS?
-        return mktime(substr($string, 8, 2),substr($string, 10, 2),substr($string, 12, 2),
-                       substr($string, 4, 2),substr($string, 6, 2),substr($string, 0, 4));
+        return mktime(substr($string, 8, 2), substr($string, 10, 2), substr($string, 12, 2),
+                      substr($string, 4, 2), substr($string, 6, 2), substr($string, 0, 4));
     } elseif (is_numeric($string)) {
         // it is a numeric string, we handle it as timestamp
         return (int) $string;
     } else {
         // strtotime should handle it
         $time = strtotime($string);
-        if ($time == -1 || $time === false) {
+        if ($time == - 1 || $time === false) {
             // strtotime() was not able to parse $string, use "now":
             return time();
         }
+
         return $time;
     }
 }
-
-?>
diff --git a/include/smarty/libs/plugins/shared.mb_str_replace.php b/include/smarty/libs/plugins/shared.mb_str_replace.php
index ecafeb74a..a5682ed30 100644
--- a/include/smarty/libs/plugins/shared.mb_str_replace.php
+++ b/include/smarty/libs/plugins/shared.mb_str_replace.php
@@ -2,7 +2,7 @@
 /**
  * Smarty shared plugin
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage PluginsShared
  */
 if (!function_exists('smarty_mb_str_replace')) {
@@ -10,14 +10,15 @@ if (!function_exists('smarty_mb_str_replace')) {
     /**
      * Multibyte string replace
      *
-     * @param string $search  the string to be searched
-     * @param string $replace the replacement string
-     * @param string $subject the source string
-     * @param int    &$count  number of matches found
+     * @param  string $search  the string to be searched
+     * @param  string $replace the replacement string
+     * @param  string $subject the source string
+     * @param  int    &$count  number of matches found
+     *
      * @return string replaced string
      * @author Rodney Rehm
      */
-    function smarty_mb_str_replace($search, $replace, $subject, &$count=0)
+    function smarty_mb_str_replace($search, $replace, $subject, &$count = 0)
     {
         if (!is_array($search) && is_array($replace)) {
             return false;
@@ -25,7 +26,7 @@ if (!function_exists('smarty_mb_str_replace')) {
         if (is_array($subject)) {
             // call mb_replace for each single string in $subject
             foreach ($subject as &$string) {
-                $string = &smarty_mb_str_replace($search, $replace, $string, $c);
+                $string = & smarty_mb_str_replace($search, $replace, $string, $c);
                 $count += $c;
             }
         } elseif (is_array($search)) {
@@ -36,7 +37,7 @@ if (!function_exists('smarty_mb_str_replace')) {
                 }
             } else {
                 $n = max(count($search), count($replace));
-                while ($n--) {
+                while ($n --) {
                     $subject = smarty_mb_str_replace(current($search), current($replace), $subject, $c);
                     $count += $c;
                     next($search);
@@ -48,8 +49,7 @@ if (!function_exists('smarty_mb_str_replace')) {
             $count = count($parts) - 1;
             $subject = implode($replace, $parts);
         }
+
         return $subject;
     }
-
 }
-?>
\ No newline at end of file
diff --git a/include/smarty/libs/plugins/shared.mb_unicode.php b/include/smarty/libs/plugins/shared.mb_unicode.php
index e7f839ec8..0f790b56a 100644
--- a/include/smarty/libs/plugins/shared.mb_unicode.php
+++ b/include/smarty/libs/plugins/shared.mb_unicode.php
@@ -2,47 +2,53 @@
 /**
  * Smarty shared plugin
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage PluginsShared
  */
 
 /**
  * convert characters to their decimal unicode equivalents
  *
- * @link http://www.ibm.com/developerworks/library/os-php-unicode/index.html#listing3 for inspiration
+ * @link   http://www.ibm.com/developerworks/library/os-php-unicode/index.html#listing3 for inspiration
+ *
  * @param string $string   characters to calculate unicode of
  * @param string $encoding encoding of $string, if null mb_internal_encoding() is used
+ *
  * @return array sequence of unicodes
  * @author Rodney Rehm
  */
-function smarty_mb_to_unicode($string, $encoding=null) {
+function smarty_mb_to_unicode($string, $encoding = null)
+{
     if ($encoding) {
         $expanded = mb_convert_encoding($string, "UTF-32BE", $encoding);
     } else {
         $expanded = mb_convert_encoding($string, "UTF-32BE");
     }
+
     return unpack("N*", $expanded);
 }
 
 /**
  * convert unicodes to the character of given encoding
  *
- * @link http://www.ibm.com/developerworks/library/os-php-unicode/index.html#listing3 for inspiration
+ * @link   http://www.ibm.com/developerworks/library/os-php-unicode/index.html#listing3 for inspiration
+ *
  * @param integer|array $unicode  single unicode or list of unicodes to convert
  * @param string        $encoding encoding of returned string, if null mb_internal_encoding() is used
+ *
  * @return string unicode as character sequence in given $encoding
  * @author Rodney Rehm
  */
-function smarty_mb_from_unicode($unicode, $encoding=null) {
+function smarty_mb_from_unicode($unicode, $encoding = null)
+{
     $t = '';
     if (!$encoding) {
         $encoding = mb_internal_encoding();
     }
-    foreach((array) $unicode as $utf32be) {
+    foreach ((array) $unicode as $utf32be) {
         $character = pack("N*", $utf32be);
         $t .= mb_convert_encoding($character, $encoding, "UTF-32BE");
     }
+
     return $t;
 }
-
-?>
\ No newline at end of file
diff --git a/include/smarty/libs/plugins/shared.mb_wordwrap.php b/include/smarty/libs/plugins/shared.mb_wordwrap.php
index ba3498c70..31f4acf01 100644
--- a/include/smarty/libs/plugins/shared.mb_wordwrap.php
+++ b/include/smarty/libs/plugins/shared.mb_wordwrap.php
@@ -2,44 +2,40 @@
 /**
  * Smarty shared plugin
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage PluginsShared
  */
 
-if(!function_exists('smarty_mb_wordwrap')) {
+if (!function_exists('smarty_mb_wordwrap')) {
 
     /**
      * Wrap a string to a given number of characters
      *
-     * @link http://php.net/manual/en/function.wordwrap.php for similarity
-     * @param string  $str   the string to wrap
-     * @param int     $width the width of the output
-     * @param string  $break the character used to break the line
-     * @param boolean $cut   ignored parameter, just for the sake of
-     * @return string wrapped string
+     * @link   http://php.net/manual/en/function.wordwrap.php for similarity
+     *
+     * @param  string  $str   the string to wrap
+     * @param  int     $width the width of the output
+     * @param  string  $break the character used to break the line
+     * @param  boolean $cut   ignored parameter, just for the sake of
+     *
+     * @return string  wrapped string
      * @author Rodney Rehm
      */
-    function smarty_mb_wordwrap($str, $width=75, $break="\n", $cut=false)
+    function smarty_mb_wordwrap($str, $width = 75, $break = "\n", $cut = false)
     {
         // break words into tokens using white space as a delimiter
-        $tokens = preg_split('!(\s)!S' . Smarty::$_UTF8_MODIFIER, $str, -1, PREG_SPLIT_NO_EMPTY + PREG_SPLIT_DELIM_CAPTURE);
+        $tokens = preg_split('!(\s)!S' . Smarty::$_UTF8_MODIFIER, $str, - 1, PREG_SPLIT_NO_EMPTY + PREG_SPLIT_DELIM_CAPTURE);
         $length = 0;
         $t = '';
         $_previous = false;
+        $_space = false;
 
         foreach ($tokens as $_token) {
             $token_length = mb_strlen($_token, Smarty::$_CHARSET);
             $_tokens = array($_token);
             if ($token_length > $width) {
-                // remove last space
-                $t = mb_substr($t, 0, -1, Smarty::$_CHARSET);
-                $_previous = false;
-                $length = 0;
-
-                if ($cut) {
-                    $_tokens = preg_split('!(.{' . $width . '})!S' . Smarty::$_UTF8_MODIFIER, $_token, -1, PREG_SPLIT_NO_EMPTY + PREG_SPLIT_DELIM_CAPTURE);
-                    // broken words go on a new line
-                    $t .= $break;
+                 if ($cut) {
+                    $_tokens = preg_split('!(.{' . $width . '})!S' . Smarty::$_UTF8_MODIFIER, $_token, - 1, PREG_SPLIT_NO_EMPTY + PREG_SPLIT_DELIM_CAPTURE);
                 }
             }
 
@@ -50,27 +46,23 @@ if(!function_exists('smarty_mb_wordwrap')) {
 
                 if ($length > $width) {
                     // remove space before inserted break
-                    if ($_previous && $token_length < $width) {
-                        $t = mb_substr($t, 0, -1, Smarty::$_CHARSET);
+                    if ($_previous) {
+                        $t = mb_substr($t, 0, - 1, Smarty::$_CHARSET);
                     }
 
-                    // add the break before the token
-                    $t .= $break;
-                    $length = $token_length;
-
-                    // skip space after inserting a break
-                    if ($_space) {
-                        $length = 0;
-                        continue;
+                    if (!$_space) {
+                        // add the break before the token
+                        if (!empty($t)) {
+                            $t .= $break;
+                        }
+                        $length = $token_length;
                     }
-                } else if ($token == "\n") {
+                } elseif ($token == "\n") {
                     // hard break must reset counters
                     $_previous = 0;
                     $length = 0;
-                } else {
-                    // remember if we had a space or not
-                    $_previous = $_space;
                 }
+                $_previous = $_space;
                 // add the token
                 $t .= $token;
             }
@@ -78,6 +70,4 @@ if(!function_exists('smarty_mb_wordwrap')) {
 
         return $t;
     }
-
 }
-?>
\ No newline at end of file
diff --git a/include/smarty/libs/plugins/variablefilter.htmlspecialchars.php b/include/smarty/libs/plugins/variablefilter.htmlspecialchars.php
index aff711e48..aecd1e7e7 100644
--- a/include/smarty/libs/plugins/variablefilter.htmlspecialchars.php
+++ b/include/smarty/libs/plugins/variablefilter.htmlspecialchars.php
@@ -2,20 +2,18 @@
 /**
  * Smarty plugin
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage PluginsFilter
  */
 
 /**
  * Smarty htmlspecialchars variablefilter plugin
  *
- * @param string                   $source input string
- * @param Smarty_Internal_Template $smarty Smarty object
+ * @param string $source input string
+ *
  * @return string filtered output
  */
-function smarty_variablefilter_htmlspecialchars($source, $smarty)
+function smarty_variablefilter_htmlspecialchars($source)
 {
     return htmlspecialchars($source, ENT_QUOTES, Smarty::$_CHARSET);
 }
-
-?>
\ No newline at end of file
diff --git a/include/smarty/libs/sysplugins/smarty_cacheresource.php b/include/smarty/libs/sysplugins/smarty_cacheresource.php
index ca18add5e..8cd2805a5 100644
--- a/include/smarty/libs/sysplugins/smarty_cacheresource.php
+++ b/include/smarty/libs/sysplugins/smarty_cacheresource.php
@@ -1,106 +1,115 @@
 <?php
 /**
-* Smarty Internal Plugin
-*
-* @package Smarty
-* @subpackage Cacher
-*/
+ * Smarty Internal Plugin
+ *
+ * @package    Smarty
+ * @subpackage Cacher
+ */
 
 /**
-* Cache Handler API
-*
-* @package Smarty
-* @subpackage Cacher
-* @author Rodney Rehm
-*/
-abstract class Smarty_CacheResource {
-    /**
-    * cache for Smarty_CacheResource instances
-    * @var array
-    */
-    public static $resources = array();
-
-    /**
-    * resource types provided by the core
-    * @var array
-    */
-    protected static $sysplugins = array(
-        'file' => true,
-    );
-
-    /**
-    * populate Cached Object with meta data from Resource
-    *
-    * @param Smarty_Template_Cached $cached cached object
-    * @param Smarty_Internal_Template $_template template object
-    * @return void
-    */
-    public abstract function populate(Smarty_Template_Cached $cached, Smarty_Internal_Template $_template);
-
-    /**
-    * populate Cached Object with timestamp and exists from Resource
-    *
-    * @param Smarty_Template_Cached $source cached object
-    * @return void
-    */
-    public abstract function populateTimestamp(Smarty_Template_Cached $cached);
-
-    /**
-    * Read the cached template and process header
-    *
-    * @param Smarty_Internal_Template $_template template object
-    * @param Smarty_Template_Cached $cached cached object
-    * @return booelan true or false if the cached content does not exist
-    */
-    public abstract function process(Smarty_Internal_Template $_template, Smarty_Template_Cached $cached=null);
-
-    /**
-    * Write the rendered template output to cache
-    *
-    * @param Smarty_Internal_Template $_template template object
-    * @param string $content content to cache
-    * @return boolean success
-    */
-    public abstract function writeCachedContent(Smarty_Internal_Template $_template, $content);
-
-    /**
-    * Return cached content
-    *
-    * @param Smarty_Internal_Template $_template template object
-    * @param string $content content of cache
-    */
+ * Cache Handler API
+ *
+ * @package    Smarty
+ * @subpackage Cacher
+ * @author     Rodney Rehm
+ */
+abstract class Smarty_CacheResource
+{
+    /**
+     * resource types provided by the core
+     *
+     * @var array
+     */
+    protected static $sysplugins = array('file' => 'smarty_internal_cacheresource_file.php',);
+
+    /**
+     * populate Cached Object with meta data from Resource
+     *
+     * @param Smarty_Template_Cached   $cached    cached object
+     * @param Smarty_Internal_Template $_template template object
+     *
+     * @return void
+     */
+    abstract public function populate(Smarty_Template_Cached $cached, Smarty_Internal_Template $_template);
+
+    /**
+     * populate Cached Object with timestamp and exists from Resource
+     *
+     * @param Smarty_Template_Cached $cached
+     *
+     * @return void
+     */
+    abstract public function populateTimestamp(Smarty_Template_Cached $cached);
+
+    /**
+     * Read the cached template and process header
+     *
+     * @param Smarty_Internal_Template $_template template object
+     * @param Smarty_Template_Cached   $cached    cached object
+     * @param bool                     $update    flag if called because cache update
+     *
+     * @return bool true or false if the cached content does not exist
+     */
+    abstract public function process(Smarty_Internal_Template $_template, Smarty_Template_Cached $cached = null, $update = false);
+
+    /**
+     * Write the rendered template output to cache
+     *
+     * @param Smarty_Internal_Template $_template template object
+     * @param string                   $content   content to cache
+     *
+     * @return boolean success
+     */
+    abstract public function writeCachedContent(Smarty_Internal_Template $_template, $content);
+
+    /**
+     * Return cached content
+     *
+     * @param Smarty_Internal_Template $_template template object
+     *
+     * @return null|string
+     */
     public function getCachedContent(Smarty_Internal_Template $_template)
     {
         if ($_template->cached->handler->process($_template)) {
             ob_start();
-            $_template->properties['unifunc']($_template);
+            $unifunc = $_template->cached->unifunc;
+            $unifunc($_template);
             return ob_get_clean();
         }
+
         return null;
     }
 
     /**
-    * Empty cache
-    *
-    * @param Smarty $smarty Smarty object
-    * @param integer $exp_time expiration time (number of seconds, not timestamp)
-    * @return integer number of cache files deleted
-    */
-    public abstract function clearAll(Smarty $smarty, $exp_time=null);
-
-    /**
-    * Empty cache for a specific template
-    *
-    * @param Smarty $smarty Smarty object
-    * @param string $resource_name template name
-    * @param string $cache_id cache id
-    * @param string $compile_id compile id
-    * @param integer $exp_time expiration time (number of seconds, not timestamp)
-    * @return integer number of cache files deleted
-    */
-    public abstract function clear(Smarty $smarty, $resource_name, $cache_id, $compile_id, $exp_time);
-
-
+     * Empty cache
+     *
+     * @param Smarty  $smarty   Smarty object
+     * @param integer $exp_time expiration time (number of seconds, not timestamp)
+     *
+     * @return integer number of cache files deleted
+     */
+    abstract public function clearAll(Smarty $smarty, $exp_time = null);
+
+    /**
+     * Empty cache for a specific template
+     *
+     * @param Smarty  $smarty        Smarty object
+     * @param string  $resource_name template name
+     * @param string  $cache_id      cache id
+     * @param string  $compile_id    compile id
+     * @param integer $exp_time      expiration time (number of seconds, not timestamp)
+     *
+     * @return integer number of cache files deleted
+     */
+    abstract public function clear(Smarty $smarty, $resource_name, $cache_id, $compile_id, $exp_time);
+
+    /**
+     * @param Smarty                 $smarty
+     * @param Smarty_Template_Cached $cached
+     *
+     * @return bool|null
+     */
     public function locked(Smarty $smarty, Smarty_Template_Cached $cached)
     {
         // theoretically locking_timeout should be checked against time_limit (max_execution_time)
@@ -114,35 +123,61 @@ abstract class Smarty_CacheResource {
             }
             sleep(1);
         }
+
         return $hadLock;
     }
 
+    /**
+     * Check is cache is locked for this template
+     *
+     * @param Smarty                 $smarty
+     * @param Smarty_Template_Cached $cached
+     *
+     * @return bool
+     */
     public function hasLock(Smarty $smarty, Smarty_Template_Cached $cached)
     {
         // check if lock exists
         return false;
     }
 
+    /**
+     * Lock cache for this template
+     *
+     * @param Smarty                 $smarty
+     * @param Smarty_Template_Cached $cached
+     *
+     * @return bool
+     */
     public function acquireLock(Smarty $smarty, Smarty_Template_Cached $cached)
     {
         // create lock
         return true;
     }
 
+    /**
+     * Unlock cache for this template
+     *
+     * @param Smarty                 $smarty
+     * @param Smarty_Template_Cached $cached
+     *
+     * @return bool
+     */
     public function releaseLock(Smarty $smarty, Smarty_Template_Cached $cached)
     {
         // release lock
         return true;
     }
 
-
     /**
-    * Load Cache Resource Handler
-    *
-    * @param Smarty $smarty Smarty object
-    * @param string $type name of the cache resource
-    * @return Smarty_CacheResource Cache Resource Handler
-    */
+     * Load Cache Resource Handler
+     *
+     * @param Smarty $smarty Smarty object
+     * @param string $type   name of the cache resource
+     *
+     * @throws SmartyException
+     * @return Smarty_CacheResource Cache Resource Handler
+     */
     public static function load(Smarty $smarty, $type = null)
     {
         if (!isset($type)) {
@@ -150,232 +185,42 @@ abstract class Smarty_CacheResource {
         }
 
         // try smarty's cache
-        if (isset($smarty->_cacheresource_handlers[$type])) {
-            return $smarty->_cacheresource_handlers[$type];
+        if (isset($smarty->_cache['cacheresource_handlers'][$type])) {
+            return $smarty->_cache['cacheresource_handlers'][$type];
         }
-        
+
         // try registered resource
         if (isset($smarty->registered_cache_resources[$type])) {
             // do not cache these instances as they may vary from instance to instance
-            return $smarty->_cacheresource_handlers[$type] = $smarty->registered_cache_resources[$type];
+            return $smarty->_cache['cacheresource_handlers'][$type] = $smarty->registered_cache_resources[$type];
         }
         // try sysplugins dir
         if (isset(self::$sysplugins[$type])) {
-            if (!isset(self::$resources[$type])) {
-                $cache_resource_class = 'Smarty_Internal_CacheResource_' . ucfirst($type);
-                self::$resources[$type] = new $cache_resource_class();
-            }
-            return $smarty->_cacheresource_handlers[$type] = self::$resources[$type];
+            $cache_resource_class = 'Smarty_Internal_CacheResource_' . ucfirst($type);
+            return $smarty->_cache['cacheresource_handlers'][$type] = new $cache_resource_class();
         }
         // try plugins dir
         $cache_resource_class = 'Smarty_CacheResource_' . ucfirst($type);
         if ($smarty->loadPlugin($cache_resource_class)) {
-            if (!isset(self::$resources[$type])) {
-                self::$resources[$type] = new $cache_resource_class();
-            }
-            return $smarty->_cacheresource_handlers[$type] = self::$resources[$type];
+            return $smarty->_cache['cacheresource_handlers'][$type] = new $cache_resource_class();
         }
         // give up
         throw new SmartyException("Unable to load cache resource '{$type}'");
     }
 
     /**
-    * Invalid Loaded Cache Files
-    *
-    * @param Smarty $smarty Smarty object
-    */
-    public static function invalidLoadedCache(Smarty $smarty)
+     * Invalid Loaded Cache Files
+     *
+     * @param Smarty $smarty Smarty object
+     */
+    public function invalidLoadedCache(Smarty $smarty)
     {
-        foreach ($smarty->template_objects as $tpl) {
-            if (isset($tpl->cached)) {
-                $tpl->cached->valid = false;
-                $tpl->cached->processed = false;
-            }
-        }
-    }
-}
-
-/**
-* Smarty Resource Data Object
-*
-* Cache Data Container for Template Files
-*
-* @package Smarty
-* @subpackage TemplateResources
-* @author Rodney Rehm
-*/
-class Smarty_Template_Cached {
-    /**
-    * Source Filepath
-    * @var string
-    */
-    public $filepath = false;
-
-    /**
-    * Source Content
-    * @var string
-    */
-    public $content = null;
-
-    /**
-    * Source Timestamp
-    * @var integer
-    */
-    public $timestamp = false;
-
-    /**
-    * Source Existance
-    * @var boolean
-    */
-    public $exists = false;
-
-    /**
-    * Cache Is Valid
-    * @var boolean
-    */
-    public $valid = false;
-
-    /**
-    * Cache was processed
-    * @var boolean
-    */
-    public $processed = false;
-
-    /**
-    * CacheResource Handler
-    * @var Smarty_CacheResource
-    */
-    public $handler = null;
-
-    /**
-    * Template Compile Id (Smarty_Internal_Template::$compile_id)
-    * @var string
-    */
-    public $compile_id = null;
-
-    /**
-    * Template Cache Id (Smarty_Internal_Template::$cache_id)
-    * @var string
-    */
-    public $cache_id = null;
-
-    /**
-    * Id for cache locking
-    * @var string
-    */
-    public $lock_id = null;
-
-    /**
-    * flag that cache is locked by this instance
-    * @var bool
-    */
-    public $is_locked = false;
-
-    /**
-    * Source Object
-    * @var Smarty_Template_Source
-    */
-    public $source = null;
-
-    /**
-    * create Cached Object container
-    *
-    * @param Smarty_Internal_Template $_template template object
-    */
-    public function __construct(Smarty_Internal_Template $_template)
-    {
-        $this->compile_id = $_template->compile_id;
-        $this->cache_id = $_template->cache_id;
-        $this->source = $_template->source;
-        $_template->cached = $this;
-        $smarty = $_template->smarty;
-
-        //
-        // load resource handler
-        //
-        $this->handler = $handler = Smarty_CacheResource::load($smarty); // Note: prone to circular references
-
-        //
-        //    check if cache is valid
-        //
-        if (!($_template->caching == Smarty::CACHING_LIFETIME_CURRENT || $_template->caching == Smarty::CACHING_LIFETIME_SAVED) || $_template->source->recompiled) {
-            $handler->populate($this, $_template);
-            return;
-        }
-        while (true) {
-            while (true) {
-                $handler->populate($this, $_template);
-                if ($this->timestamp === false || $smarty->force_compile || $smarty->force_cache) {
-                    $this->valid = false;
-                } else {
-                    $this->valid = true;
-                }
-                if ($this->valid && $_template->caching == Smarty::CACHING_LIFETIME_CURRENT && $_template->cache_lifetime >= 0 && time() > ($this->timestamp + $_template->cache_lifetime)) {
-                    // lifetime expired
-                    $this->valid = false;
-                }
-                if ($this->valid || !$_template->smarty->cache_locking) {
-                    break;
+        if (isset($smarty->_cache['template_objects'])) {
+            foreach ($smarty->_cache['template_objects'] as $key => $tpl) {
+                if (isset($tpl->cached)) {
+                    unset ($smarty->_cache['template_objects'][$key]);
                 }
-                if (!$this->handler->locked($_template->smarty, $this)) {
-                    $this->handler->acquireLock($_template->smarty, $this);
-                    break 2;
-                }
-            }
-            if ($this->valid) {
-                if (!$_template->smarty->cache_locking || $this->handler->locked($_template->smarty, $this) === null) {
-                    // load cache file for the following checks
-                    if ($smarty->debugging) {
-                        Smarty_Internal_Debug::start_cache($_template);
-                    }
-                    if($handler->process($_template, $this) === false) {
-                        $this->valid = false;
-                    } else {
-                        $this->processed = true;
-                    }
-                    if ($smarty->debugging) {
-                        Smarty_Internal_Debug::end_cache($_template);
-                    }
-                } else {
-                    continue;
-                }
-            } else {
-                return;
-            }
-            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 (!$this->valid && $_template->smarty->cache_locking) {
-                $this->handler->acquireLock($_template->smarty, $this);
-                return;
-            } else {
-                return;
             }
         }
     }
-
-    /**
-    * Write this cache object to handler
-    *
-    * @param Smarty_Internal_Template $_template template object
-    * @param string $content content to cache
-    * @return boolean success
-    */
-    public function write(Smarty_Internal_Template $_template, $content)
-    {
-        if (!$_template->source->recompiled) {
-            if ($this->handler->writeCachedContent($_template, $content)) {
-                $this->timestamp = time();
-                $this->exists = true;
-                $this->valid = true;
-                if ($_template->smarty->cache_locking) {
-                    $this->handler->releaseLock($_template->smarty, $this);
-                }
-                return true;
-            }
-        }
-        return false;
-    }
-
 }
-?>
\ No newline at end of file
diff --git a/include/smarty/libs/sysplugins/smarty_cacheresource_custom.php b/include/smarty/libs/sysplugins/smarty_cacheresource_custom.php
index ee9de157b..4e9606ef1 100644
--- a/include/smarty/libs/sysplugins/smarty_cacheresource_custom.php
+++ b/include/smarty/libs/sysplugins/smarty_cacheresource_custom.php
@@ -2,42 +2,43 @@
 /**
  * Smarty Internal Plugin
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage Cacher
  */
 
 /**
  * Cache Handler API
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage Cacher
- * @author Rodney Rehm
+ * @author     Rodney Rehm
  */
-abstract class Smarty_CacheResource_Custom extends Smarty_CacheResource {
-
+abstract class Smarty_CacheResource_Custom extends Smarty_CacheResource
+{
     /**
      * fetch cached content and its modification time from data source
      *
-     * @param string $id         unique cache content identifier
-     * @param string $name       template name
-     * @param string $cache_id   cache id
-     * @param string $compile_id compile id
-     * @param string $content    cached content
-     * @param integer $mtime cache modification timestamp (epoch)
+     * @param  string  $id         unique cache content identifier
+     * @param  string  $name       template name
+     * @param  string  $cache_id   cache id
+     * @param  string  $compile_id compile id
+     * @param  string  $content    cached content
+     * @param  integer $mtime      cache modification timestamp (epoch)
+     *
      * @return void
      */
-    protected abstract function fetch($id, $name, $cache_id, $compile_id, &$content, &$mtime);
+    abstract protected function fetch($id, $name, $cache_id, $compile_id, &$content, &$mtime);
 
     /**
      * Fetch cached content's modification timestamp from data source
-     *
      * {@internal implementing this method is optional.
      *  Only implement it if modification times can be accessed faster than loading the complete cached content.}}
      *
-     * @param string $id         unique cache content identifier
-     * @param string $name       template name
-     * @param string $cache_id   cache id
-     * @param string $compile_id compile id
+     * @param  string $id         unique cache content identifier
+     * @param  string $name       template name
+     * @param  string $cache_id   cache id
+     * @param  string $compile_id compile id
+     *
      * @return integer|boolean timestamp (epoch) the template was modified, or false if not found
      */
     protected function fetchTimestamp($id, $name, $cache_id, $compile_id)
@@ -48,47 +49,54 @@ abstract class Smarty_CacheResource_Custom extends Smarty_CacheResource {
     /**
      * Save content to cache
      *
-     * @param string       $id         unique cache content identifier
-     * @param string       $name       template name
-     * @param string       $cache_id   cache id
-     * @param string       $compile_id compile id
-     * @param integer|null $exp_time   seconds till expiration or null
-     * @param string $content content to cache
-     * @return boolean success
+     * @param  string       $id         unique cache content identifier
+     * @param  string       $name       template name
+     * @param  string       $cache_id   cache id
+     * @param  string       $compile_id compile id
+     * @param  integer|null $exp_time   seconds till expiration or null
+     * @param  string       $content    content to cache
+     *
+     * @return boolean      success
      */
-    protected abstract function save($id, $name, $cache_id, $compile_id, $exp_time, $content);
+    abstract protected function save($id, $name, $cache_id, $compile_id, $exp_time, $content);
 
     /**
      * Delete content from cache
      *
-     * @param string       $name       template name
-     * @param string       $cache_id   cache id
-     * @param string       $compile_id compile id
-     * @param integer|null $exp_time   seconds till expiration time in seconds or null
-     * @return integer number of deleted caches
+     * @param  string       $name       template name
+     * @param  string       $cache_id   cache id
+     * @param  string       $compile_id compile id
+     * @param  integer|null $exp_time   seconds till expiration time in seconds or null
+     *
+     * @return integer      number of deleted caches
      */
-    protected abstract function delete($name, $cache_id, $compile_id, $exp_time);
+    abstract protected function delete($name, $cache_id, $compile_id, $exp_time);
 
     /**
      * populate Cached Object with meta data from Resource
      *
-     * @param Smarty_Template_Cached   $cached    cached object
-     * @param Smarty_Internal_Template $_template template object
+     * @param  Smarty_Template_Cached   $cached    cached object
+     * @param  Smarty_Internal_Template $_template template object
+     *
      * @return void
      */
     public function populate(Smarty_Template_Cached $cached, Smarty_Internal_Template $_template)
     {
         $_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);
+        $_compile_id = isset($cached->compile_id) ? preg_replace('![^\w]+!', '_', $cached->compile_id) : null;
+        $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);
     }
 
     /**
      * populate Cached Object with timestamp and exists from Resource
      *
-     * @param Smarty_Template_Cached $source cached object
+     * @param Smarty_Template_Cached $cached
+     *
      * @return void
      */
     public function populateTimestamp(Smarty_Template_Cached $cached)
@@ -97,6 +105,7 @@ abstract class Smarty_CacheResource_Custom extends Smarty_CacheResource {
         if ($mtime !== null) {
             $cached->timestamp = $mtime;
             $cached->exists = !!$cached->timestamp;
+
             return;
         }
         $timestamp = null;
@@ -108,11 +117,13 @@ abstract class Smarty_CacheResource_Custom extends Smarty_CacheResource {
     /**
      * Read the cached template and process the header
      *
-     * @param Smarty_Internal_Template $_template template object
-     * @param Smarty_Template_Cached $cached cached object
-     * @return booelan true or false if the cached content does not exist
+     * @param  Smarty_Internal_Template $_template template object
+     * @param  Smarty_Template_Cached   $cached    cached object
+     * @param bool                      $update    flag if called because cache update
+     *
+     * @return boolean                 true or false if the cached content does not exist
      */
-    public function process(Smarty_Internal_Template $_template, Smarty_Template_Cached $cached=null)
+    public function process(Smarty_Internal_Template $_template, Smarty_Template_Cached $cached = null, $update = false)
     {
         if (!$cached) {
             $cached = $_template->cached;
@@ -120,118 +131,151 @@ abstract class Smarty_CacheResource_Custom extends Smarty_CacheResource {
         $content = $cached->content ? $cached->content : null;
         $timestamp = $cached->timestamp ? $cached->timestamp : null;
         if ($content === null || !$timestamp) {
-            $this->fetch(
-                $_template->cached->filepath,
-                $_template->source->name,
-                $_template->cache_id,
-                $_template->compile_id,
-                $content,
-                $timestamp
-            );
+            $this->fetch($_template->cached->filepath, $_template->source->name, $_template->cache_id, $_template->compile_id, $content, $timestamp);
         }
         if (isset($content)) {
+            /** @var Smarty_Internal_Template $_smarty_tpl
+             * used in evaluated code
+             */
             $_smarty_tpl = $_template;
             eval("?>" . $content);
+            $cached->content = null;
             return true;
         }
+
         return false;
     }
 
     /**
      * Write the rendered template output to cache
      *
-     * @param Smarty_Internal_Template $_template template object
-     * @param string                   $content   content to cache
-     * @return boolean success
+     * @param  Smarty_Internal_Template $_template template object
+     * @param  string                   $content   content to cache
+     *
+     * @return boolean                  success
      */
     public function writeCachedContent(Smarty_Internal_Template $_template, $content)
     {
-        return $this->save(
-            $_template->cached->filepath,
-            $_template->source->name,
-            $_template->cache_id,
-            $_template->compile_id,
-            $_template->properties['cache_lifetime'],
-            $content
-        );
+        return $this->save($_template->cached->filepath, $_template->source->name, $_template->cache_id, $_template->compile_id, $_template->cache_lifetime, $content);
+    }
+
+    /**
+     * Read cached template from cache
+     *
+     * @param  Smarty_Internal_Template $_template template object
+     *
+     * @return string  content
+     */
+    public function readCachedContent(Smarty_Internal_Template $_template)
+    {
+        $content = $_template->cached->content ? $_template->cached->content : null;
+        $timestamp = null;
+        if ($content === null) {
+            $timestamp = null;
+            $this->fetch($_template->cached->filepath, $_template->source->name, $_template->cache_id, $_template->compile_id, $content, $timestamp);
+        }
+        if (isset($content)) {
+            return $content;
+        }
+        return false;
     }
 
     /**
      * Empty cache
      *
-     * @param Smarty  $smarty   Smarty object
-     * @param integer $exp_time expiration time (number of seconds, not timestamp)
+     * @param  Smarty  $smarty   Smarty object
+     * @param  integer $exp_time expiration time (number of seconds, not timestamp)
+     *
      * @return integer number of cache files deleted
      */
-    public function clearAll(Smarty $smarty, $exp_time=null)
+    public function clearAll(Smarty $smarty, $exp_time = null)
     {
-        $this->cache = array();
         return $this->delete(null, null, null, $exp_time);
     }
 
     /**
      * Empty cache for a specific template
      *
-     * @param Smarty  $smarty        Smarty object
-     * @param string  $resource_name template name
-     * @param string  $cache_id      cache id
-     * @param string  $compile_id    compile id
-     * @param integer $exp_time      expiration time (number of seconds, not timestamp)
+     * @param  Smarty  $smarty        Smarty object
+     * @param  string  $resource_name template name
+     * @param  string  $cache_id      cache id
+     * @param  string  $compile_id    compile id
+     * @param  integer $exp_time      expiration time (number of seconds, not timestamp)
+     *
      * @return integer number of cache files deleted
      */
     public function clear(Smarty $smarty, $resource_name, $cache_id, $compile_id, $exp_time)
     {
-        $this->cache = array();
-        return $this->delete($resource_name, $cache_id, $compile_id, $exp_time);
+        $cache_name = null;
+
+        if (isset($resource_name)) {
+            $source = Smarty_Template_Source::load(null, $smarty, $resource_name);
+            if ($source->exists) {
+                $cache_name = $source->name;
+            } else {
+                return 0;
+            }
+            // remove from template cache
+            if (isset($smarty->_cache['template_objects'])) {
+                foreach ($smarty->_cache['template_objects'] as $key => $_tpl) {
+                    if (isset($_tpl->cached) && $_tpl->source->uid == $source->uid) {
+                        unset($smarty->_cache['template_objects'][$key]);
+                    }
+                }
+            }
+        }
+
+        return $this->delete($cache_name, $cache_id, $compile_id, $exp_time);
     }
 
     /**
      * Check is cache is locked for this template
      *
-     * @param Smarty $smarty Smarty object
-     * @param Smarty_Template_Cached $cached cached object
-     * @return booelan true or false if cache is locked
+     * @param  Smarty                 $smarty Smarty object
+     * @param  Smarty_Template_Cached $cached cached object
+     *
+     * @return boolean               true or false if cache is locked
      */
     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;
     }
 
     /**
      * Lock cache for this template
      *
-     * @param Smarty $smarty Smarty object
+     * @param Smarty                 $smarty Smarty object
      * @param Smarty_Template_Cached $cached cached object
+     *
+     * @return bool|void
      */
     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, '');
     }
 
     /**
      * Unlock cache for this template
      *
-     * @param Smarty $smarty Smarty object
+     * @param Smarty                 $smarty Smarty object
      * @param Smarty_Template_Cached $cached cached object
+     *
+     * @return bool|void
      */
     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);
     }
 }
-?>
\ No newline at end of file
diff --git a/include/smarty/libs/sysplugins/smarty_cacheresource_keyvaluestore.php b/include/smarty/libs/sysplugins/smarty_cacheresource_keyvaluestore.php
index dff9b65aa..ee4021a19 100644
--- a/include/smarty/libs/sysplugins/smarty_cacheresource_keyvaluestore.php
+++ b/include/smarty/libs/sysplugins/smarty_cacheresource_keyvaluestore.php
@@ -2,44 +2,44 @@
 /**
  * Smarty Internal Plugin
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage Cacher
  */
 
 /**
  * Smarty Cache Handler Base for Key/Value Storage Implementations
- *
  * This class implements the functionality required to use simple key/value stores
  * for hierarchical cache groups. key/value stores like memcache or APC do not support
  * wildcards in keys, therefore a cache group cannot be cleared like "a|*" - which
  * is no problem to filesystem and RDBMS implementations.
- *
  * This implementation is based on the concept of invalidation. While one specific cache
  * can be identified and cleared, any range of caches cannot be identified. For this reason
  * each level of the cache group hierarchy can have its own value in the store. These values
  * are nothing but microtimes, telling us when a particular cache group was cleared for the
  * last time. These keys are evaluated for every cache read to determine if the cache has
  * been invalidated since it was created and should hence be treated as inexistent.
- *
  * Although deep hierarchies are possible, they are not recommended. Try to keep your
  * cache groups as shallow as possible. Anything up 3-5 parents should be ok. So
  * »a|b|c« is a good depth where »a|b|c|d|e|f|g|h|i|j|k« isn't. Try to join correlating
  * cache groups: if your cache groups look somewhat like »a|b|$page|$items|$whatever«
  * consider using »a|b|c|$page-$items-$whatever« instead.
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage Cacher
- * @author Rodney Rehm
+ * @author     Rodney Rehm
  */
-abstract class Smarty_CacheResource_KeyValueStore extends Smarty_CacheResource {
-
+abstract class Smarty_CacheResource_KeyValueStore extends Smarty_CacheResource
+{
     /**
      * cache for contents
+     *
      * @var array
      */
     protected $contents = array();
+
     /**
      * cache for timestamps
+     *
      * @var array
      */
     protected $timestamps = array();
@@ -47,16 +47,15 @@ abstract class Smarty_CacheResource_KeyValueStore extends Smarty_CacheResource {
     /**
      * populate Cached Object with meta data from Resource
      *
-     * @param Smarty_Template_Cached   $cached    cached object
-     * @param Smarty_Internal_Template $_template template object
+     * @param  Smarty_Template_Cached   $cached    cached object
+     * @param  Smarty_Internal_Template $_template template object
+     *
      * @return void
      */
     public function populate(Smarty_Template_Cached $cached, Smarty_Internal_Template $_template)
     {
-        $cached->filepath = $_template->source->uid
-                . '#' . $this->sanitize($cached->source->name)
-                . '#' . $this->sanitize($cached->cache_id)
-                . '#' . $this->sanitize($cached->compile_id);
+        $cached->filepath = $_template->source->uid . '#' . $this->sanitize($cached->source->resource) . '#' .
+            $this->sanitize($cached->cache_id) . '#' . $this->sanitize($cached->compile_id);
 
         $this->populateTimestamp($cached);
     }
@@ -64,7 +63,8 @@ abstract class Smarty_CacheResource_KeyValueStore extends Smarty_CacheResource {
     /**
      * populate Cached Object with timestamp and exists from Resource
      *
-     * @param Smarty_Template_Cached $cached cached object
+     * @param  Smarty_Template_Cached $cached cached object
+     *
      * @return void
      */
     public function populateTimestamp(Smarty_Template_Cached $cached)
@@ -80,11 +80,13 @@ abstract class Smarty_CacheResource_KeyValueStore extends Smarty_CacheResource {
     /**
      * Read the cached template and process the header
      *
-     * @param Smarty_Internal_Template $_template template object
-     * @param Smarty_Template_Cached $cached cached object
-     * @return booelan true or false if the cached content does not exist
+     * @param  Smarty_Internal_Template $_template template object
+     * @param  Smarty_Template_Cached   $cached    cached object
+     * @param bool                      $update    flag if called because cache update
+     *
+     * @return boolean                 true or false if the cached content does not exist
      */
-    public function process(Smarty_Internal_Template $_template, Smarty_Template_Cached $cached=null)
+    public function process(Smarty_Internal_Template $_template, Smarty_Template_Cached $cached = null, $update = false)
     {
         if (!$cached) {
             $cached = $_template->cached;
@@ -97,55 +99,92 @@ abstract class Smarty_CacheResource_KeyValueStore extends Smarty_CacheResource {
             }
         }
         if (isset($content)) {
+            /** @var Smarty_Internal_Template $_smarty_tpl
+             * used in evaluated code
+             */
             $_smarty_tpl = $_template;
             eval("?>" . $content);
+
             return true;
         }
+
         return false;
     }
 
     /**
      * Write the rendered template output to cache
      *
-     * @param Smarty_Internal_Template $_template template object
-     * @param string $content content to cache
-     * @return boolean success
+     * @param  Smarty_Internal_Template $_template template object
+     * @param  string                   $content   content to cache
+     *
+     * @return boolean                  success
      */
     public function writeCachedContent(Smarty_Internal_Template $_template, $content)
     {
         $this->addMetaTimestamp($content);
-        return $this->write(array($_template->cached->filepath => $content), $_template->properties['cache_lifetime']);
+
+        return $this->write(array($_template->cached->filepath => $content), $_template->cache_lifetime);
     }
 
     /**
-     * Empty cache
+     * Read cached template from cache
      *
+     * @param  Smarty_Internal_Template $_template template object
+     *
+     * @return string  content
+     */
+    public function readCachedContent(Smarty_Internal_Template $_template)
+    {
+        $content = $_template->cached->content ? $_template->cached->content : null;
+        $timestamp = null;
+        if ($content === null) {
+            if (!$this->fetch($_template->cached->filepath, $_template->source->name, $_template->cache_id, $_template->compile_id, $content, $timestamp, $_template->source->uid)) {
+                return false;
+            }
+        }
+        if (isset($content)) {
+            return $content;
+        }
+        return false;
+    }
+
+    /**
+     * Empty cache
      * {@internal the $exp_time argument is ignored altogether }}
      *
-     * @param Smarty  $smarty   Smarty object
-     * @param integer $exp_time expiration time [being ignored]
+     * @param  Smarty  $smarty   Smarty object
+     * @param  integer $exp_time expiration time [being ignored]
+     *
      * @return integer number of cache files deleted [always -1]
      * @uses purge() to clear the whole store
      * @uses invalidate() to mark everything outdated if purge() is inapplicable
      */
-    public function clearAll(Smarty $smarty, $exp_time=null)
+    public function clearAll(Smarty $smarty, $exp_time = null)
     {
         if (!$this->purge()) {
             $this->invalidate(null);
         }
-        return -1;
+        // remove from template cache
+        if (isset($smarty->_cache['template_objects'])) {
+            foreach ($smarty->_cache['template_objects'] as $key => $tpl) {
+                if (isset($tpl->cached)) {
+                    unset($smarty->_cache['template_objects'][$key]);
+                }
+            }
+        }
+        return - 1;
     }
 
     /**
      * Empty cache for a specific template
-     *
      * {@internal the $exp_time argument is ignored altogether}}
      *
-     * @param Smarty  $smarty        Smarty object
-     * @param string  $resource_name template name
-     * @param string  $cache_id      cache id
-     * @param string  $compile_id    compile id
-     * @param integer $exp_time      expiration time [being ignored]
+     * @param  Smarty  $smarty        Smarty object
+     * @param  string  $resource_name template name
+     * @param  string  $cache_id      cache id
+     * @param  string  $compile_id    compile id
+     * @param  integer $exp_time      expiration time [being ignored]
+     *
      * @return integer number of cache files deleted [always -1]
      * @uses buildCachedFilepath() to generate the CacheID
      * @uses invalidate() to mark CacheIDs parent chain as outdated
@@ -153,53 +192,54 @@ abstract class Smarty_CacheResource_KeyValueStore extends Smarty_CacheResource {
      */
     public function clear(Smarty $smarty, $resource_name, $cache_id, $compile_id, $exp_time)
     {
-        $uid = $this->getTemplateUid($smarty, $resource_name, $cache_id, $compile_id);
-        $cid = $uid . '#' . $this->sanitize($resource_name) . '#' . $this->sanitize($cache_id) . '#' . $this->sanitize($compile_id);
+        $uid = $this->getTemplateUid($smarty, $resource_name);
+        $cid = $uid . '#' . $this->sanitize($resource_name) . '#' . $this->sanitize($cache_id) . '#' .
+            $this->sanitize($compile_id);
         $this->delete(array($cid));
         $this->invalidate($cid, $resource_name, $cache_id, $compile_id, $uid);
-        return -1;
+        // remove from template cache
+        if (isset($resource_name) && isset($smarty->_cache['template_objects'])) {
+            if (isset($smarty->_cache['template_objects'])) {
+                foreach ($smarty->_cache['template_objects'] as $key => $tpl) {
+                    if ($tpl->source->uid == $uid && isset($tpl->cached)) {
+                        unset($smarty->_cache['template_objects'][$key]);
+                    }
+                }
+            }
+        }
+        return - 1;
     }
+
     /**
      * Get template's unique ID
      *
-     * @param Smarty $smarty        Smarty object
-     * @param string $resource_name template name
-     * @param string $cache_id      cache id
-     * @param string $compile_id    compile id
+     * @param  Smarty $smarty        Smarty object
+     * @param  string $resource_name template name
+     *
      * @return string filepath of cache file
+     * @throws \SmartyException
+     *
      */
-    protected function getTemplateUid(Smarty $smarty, $resource_name, $cache_id, $compile_id)
+    protected function getTemplateUid(Smarty $smarty, $resource_name)
     {
-        $uid = '';
         if (isset($resource_name)) {
-            $tpl = new $smarty->template_class($resource_name, $smarty);
-            if ($tpl->source->exists) {
-                $uid = $tpl->source->uid;
-            }
-            
-            // remove from template cache
-            if ($smarty->allow_ambiguous_resources) {
-                $_templateId = $tpl->source->unique_resource . $tpl->cache_id . $tpl->compile_id;
-            } else {
-                $_templateId = $smarty->joined_template_dir . '#' . $resource_name . $tpl->cache_id . $tpl->compile_id;
-            }
-            if (isset($_templateId[150])) {
-                $_templateId = sha1($_templateId);
+            $source = Smarty_Template_Source::load(null, $smarty, $resource_name);
+            if ($source->exists) {
+                return $source->uid;
             }
-            unset($smarty->template_objects[$_templateId]);
         }
-        return $uid;
+        return '';
     }
 
     /**
      * Sanitize CacheID components
      *
-     * @param string $string CacheID component to sanitize
+     * @param  string $string CacheID component to sanitize
+     *
      * @return string sanitized CacheID component
      */
     protected function sanitize($string)
     {
-        // some poeple smoke bad weed
         $string = trim($string, '|');
         if (!$string) {
             return null;
@@ -210,13 +250,14 @@ abstract class Smarty_CacheResource_KeyValueStore extends Smarty_CacheResource {
     /**
      * Fetch and prepare a cache object.
      *
-     * @param string  $cid           CacheID to fetch
-     * @param string  $resource_name template name
-     * @param string  $cache_id      cache id
-     * @param string  $compile_id    compile id
-     * @param string  $content       cached content
-     * @param integer &$timestamp    cached timestamp (epoch)
-     * @param string  $resource_uid  resource's uid
+     * @param  string  $cid           CacheID to fetch
+     * @param  string  $resource_name template name
+     * @param  string  $cache_id      cache id
+     * @param  string  $compile_id    compile id
+     * @param  string  $content       cached content
+     * @param  integer &$timestamp    cached timestamp (epoch)
+     * @param  string  $resource_uid  resource's uid
+     *
      * @return boolean success
      */
     protected function fetch($cid, $resource_name = null, $cache_id = null, $compile_id = null, &$content = null, &$timestamp = null, $resource_uid = null)
@@ -238,7 +279,6 @@ abstract class Smarty_CacheResource_KeyValueStore extends Smarty_CacheResource {
 
     /**
      * Add current microtime to the beginning of $cache_content
-     *
      * {@internal the header uses 8 Bytes, the first 4 Bytes are the seconds, the second 4 Bytes are the microseconds}}
      *
      * @param string &$content the content to be cached
@@ -253,25 +293,25 @@ abstract class Smarty_CacheResource_KeyValueStore extends Smarty_CacheResource {
     /**
      * Extract the timestamp the $content was cached
      *
-     * @param string &$content the cached content
-     * @return float the microtime the content was cached
+     * @param  string &$content the cached content
+     *
+     * @return float  the microtime the content was cached
      */
     protected function getMetaTimestamp(&$content)
     {
-        $s = unpack("N", substr($content, 0, 4));
-        $m = unpack("N", substr($content, 4, 4));
-        $content = substr($content, 8);
-        return $s[1] + ($m[1] / 100000000);
+        extract(unpack('N1s/N1m/a*content', $content));
+        return $s + ($m / 100000000);
     }
 
     /**
      * Invalidate CacheID
      *
-     * @param string $cid           CacheID
-     * @param string $resource_name template name
-     * @param string $cache_id      cache id
-     * @param string $compile_id    compile id
-     * @param string $resource_uid  source's uid
+     * @param  string $cid           CacheID
+     * @param  string $resource_name template name
+     * @param  string $cache_id      cache id
+     * @param  string $compile_id    compile id
+     * @param  string $resource_uid  source's uid
+     *
      * @return void
      */
     protected function invalidate($cid = null, $resource_name = null, $cache_id = null, $compile_id = null, $resource_uid = null)
@@ -281,22 +321,24 @@ abstract class Smarty_CacheResource_KeyValueStore extends Smarty_CacheResource {
         // invalidate everything
         if (!$resource_name && !$cache_id && !$compile_id) {
             $key = 'IVK#ALL';
-        }
-        // invalidate all caches by template
-        else if ($resource_name && !$cache_id && !$compile_id) {
-            $key = 'IVK#TEMPLATE#' . $resource_uid . '#' . $this->sanitize($resource_name);
-        }
-        // invalidate all caches by cache group
-        else if (!$resource_name && $cache_id && !$compile_id) {
-            $key = 'IVK#CACHE#' . $this->sanitize($cache_id);
-        }
-        // invalidate all caches by compile id
-        else if (!$resource_name && !$cache_id && $compile_id) {
-            $key = 'IVK#COMPILE#' . $this->sanitize($compile_id);
-        }
-        // invalidate by combination
+        } // invalidate all caches by template
         else {
-            $key = 'IVK#CID#' . $cid;
+            if ($resource_name && !$cache_id && !$compile_id) {
+                $key = 'IVK#TEMPLATE#' . $resource_uid . '#' . $this->sanitize($resource_name);
+            } // invalidate all caches by cache group
+            else {
+                if (!$resource_name && $cache_id && !$compile_id) {
+                    $key = 'IVK#CACHE#' . $this->sanitize($cache_id);
+                } // invalidate all caches by compile id
+                else {
+                    if (!$resource_name && !$cache_id && $compile_id) {
+                        $key = 'IVK#COMPILE#' . $this->sanitize($compile_id);
+                    } // invalidate by combination
+                    else {
+                        $key = 'IVK#CID#' . $cid;
+                    }
+                }
+            }
         }
         $this->write(array($key => $now));
     }
@@ -304,12 +346,13 @@ abstract class Smarty_CacheResource_KeyValueStore extends Smarty_CacheResource {
     /**
      * Determine the latest timestamp known to the invalidation chain
      *
-     * @param string $cid           CacheID to determine latest invalidation timestamp of
-     * @param string $resource_name template name
-     * @param string $cache_id      cache id
-     * @param string $compile_id    compile id
-     * @param string $resource_uid  source's filepath
-     * @return float the microtime the CacheID was invalidated
+     * @param  string $cid           CacheID to determine latest invalidation timestamp of
+     * @param  string $resource_name template name
+     * @param  string $cache_id      cache id
+     * @param  string $compile_id    compile id
+     * @param  string $resource_uid  source's filepath
+     *
+     * @return float  the microtime the CacheID was invalidated
      */
     protected function getLatestInvalidationTimestamp($cid, $resource_name = null, $cache_id = null, $compile_id = null, $resource_uid = null)
     {
@@ -321,27 +364,28 @@ abstract class Smarty_CacheResource_KeyValueStore extends Smarty_CacheResource {
         if (!($_cid = $this->listInvalidationKeys($cid, $resource_name, $cache_id, $compile_id, $resource_uid))) {
             return 0;
         }
-        
+
         // there are no InValidationKeys
         if (!($values = $this->read($_cid))) {
             return 0;
         }
         // make sure we're dealing with floats
         $values = array_map('floatval', $values);
+
         return max($values);
     }
 
     /**
      * Translate a CacheID into the list of applicable InvalidationKeys.
-     *
      * Splits "some|chain|into|an|array" into array( '#clearAll#', 'some', 'some|chain', 'some|chain|into', ... )
      *
-     * @param string $cid           CacheID to translate
-     * @param string $resource_name template name
-     * @param string $cache_id      cache id
-     * @param string $compile_id    compile id
-     * @param string $resource_uid  source's filepath
-     * @return array list of InvalidationKeys
+     * @param  string $cid           CacheID to translate
+     * @param  string $resource_name template name
+     * @param  string $cache_id      cache id
+     * @param  string $compile_id    compile id
+     * @param  string $resource_uid  source's filepath
+     *
+     * @return array  list of InvalidationKeys
      * @uses $invalidationKeyPrefix to prepend to each InvalidationKey
      */
     protected function listInvalidationKeys($cid, $resource_name = null, $cache_id = null, $compile_id = null, $resource_uid = null)
@@ -357,7 +401,6 @@ abstract class Smarty_CacheResource_KeyValueStore extends Smarty_CacheResource {
             $t[] = 'IVK#COMPILE' . $_compile;
         }
         $_name .= '#';
-        // some poeple smoke bad weed
         $cid = trim($cache_id, '|');
         if (!$cid) {
             return $t;
@@ -378,30 +421,35 @@ abstract class Smarty_CacheResource_KeyValueStore extends Smarty_CacheResource {
             $t[] = 'IVK#CACHE#' . $part;
             $t[] = 'IVK#CID' . $_name . $part . $_compile;
             // skip past delimiter position
-            $i++;
+            $i ++;
         }
+
         return $t;
     }
 
     /**
      * Check is cache is locked for this template
      *
-     * @param Smarty $smarty Smarty object
-     * @param Smarty_Template_Cached $cached cached object
-     * @return booelan true or false if cache is locked
+     * @param  Smarty                 $smarty Smarty object
+     * @param  Smarty_Template_Cached $cached cached object
+     *
+     * @return boolean               true or false if cache is locked
      */
     public function hasLock(Smarty $smarty, Smarty_Template_Cached $cached)
     {
         $key = 'LOCK#' . $cached->filepath;
         $data = $this->read(array($key));
+
         return $data && time() - $data[$key] < $smarty->locking_timeout;
     }
 
     /**
      * Lock cache for this template
      *
-     * @param Smarty $smarty Smarty object
+     * @param Smarty                 $smarty Smarty object
      * @param Smarty_Template_Cached $cached cached object
+     *
+     * @return bool|void
      */
     public function acquireLock(Smarty $smarty, Smarty_Template_Cached $cached)
     {
@@ -413,8 +461,10 @@ abstract class Smarty_CacheResource_KeyValueStore extends Smarty_CacheResource {
     /**
      * Unlock cache for this template
      *
-     * @param Smarty $smarty Smarty object
+     * @param Smarty                 $smarty Smarty object
      * @param Smarty_Template_Cached $cached cached object
+     *
+     * @return bool|void
      */
     public function releaseLock(Smarty $smarty, Smarty_Template_Cached $cached)
     {
@@ -426,27 +476,30 @@ abstract class Smarty_CacheResource_KeyValueStore extends Smarty_CacheResource {
     /**
      * Read values for a set of keys from cache
      *
-     * @param array $keys list of keys to fetch
+     * @param  array $keys list of keys to fetch
+     *
      * @return array list of values with the given keys used as indexes
      */
-    protected abstract function read(array $keys);
+    abstract protected function read(array $keys);
 
     /**
      * Save values for a set of keys to cache
      *
-     * @param array $keys   list of values to save
-     * @param int   $expire expiration time
+     * @param  array $keys   list of values to save
+     * @param  int   $expire expiration time
+     *
      * @return boolean true on success, false on failure
      */
-    protected abstract function write(array $keys, $expire=null);
+    abstract protected function write(array $keys, $expire = null);
 
     /**
      * Remove values from cache
      *
-     * @param array $keys list of keys to delete
+     * @param  array $keys list of keys to delete
+     *
      * @return boolean true on success, false on failure
      */
-    protected abstract function delete(array $keys);
+    abstract protected function delete(array $keys);
 
     /**
      * Remove *all* values from cache
@@ -457,7 +510,4 @@ abstract class Smarty_CacheResource_KeyValueStore extends Smarty_CacheResource {
     {
         return false;
     }
-
 }
-
-?>
\ No newline at end of file
diff --git a/include/smarty/libs/sysplugins/smarty_config_source.php b/include/smarty/libs/sysplugins/smarty_config_source.php
deleted file mode 100644
index 043ff13e9..000000000
--- a/include/smarty/libs/sysplugins/smarty_config_source.php
+++ /dev/null
@@ -1,95 +0,0 @@
-<?php
-/**
- * Smarty Internal Plugin
- *
- * @package Smarty
- * @subpackage TemplateResources
- */
-
-/**
- * Smarty Resource Data Object
- *
- * Meta Data Container for Config Files
- *
- * @package Smarty
- * @subpackage TemplateResources
- * @author Rodney Rehm
- *
- * @property string $content
- * @property int    $timestamp
- * @property bool   $exists
- */
-class Smarty_Config_Source extends Smarty_Template_Source {
-
-    /**
-     * create Config Object container
-     *
-     * @param Smarty_Resource $handler          Resource Handler this source object communicates with
-     * @param Smarty          $smarty           Smarty instance this source object belongs to
-     * @param string          $resource         full config_resource
-     * @param string          $type             type of resource
-     * @param string          $name             resource name
-     * @param string          $unique_resource  unqiue resource name
-     */
-    public function __construct(Smarty_Resource $handler, Smarty $smarty, $resource, $type, $name, $unique_resource)
-    {
-        $this->handler = $handler; // Note: prone to circular references
-
-        // Note: these may be ->config_compiler_class etc in the future
-        //$this->config_compiler_class = $handler->config_compiler_class;
-        //$this->config_lexer_class = $handler->config_lexer_class;
-        //$this->config_parser_class = $handler->config_parser_class;
-
-        $this->smarty = $smarty;
-        $this->resource = $resource;
-        $this->type = $type;
-        $this->name = $name;
-        $this->unique_resource = $unique_resource;
-    }
-
-    /**
-     * <<magic>> Generic setter.
-     *
-     * @param string $property_name valid: content, timestamp, exists
-     * @param mixed  $value         newly assigned value (not check for correct type)
-     * @throws SmartyException when the given property name is not valid
-     */
-    public function __set($property_name, $value)
-    {
-        switch ($property_name) {
-            case 'content':
-            case 'timestamp':
-            case 'exists':
-                $this->$property_name = $value;
-                break;
-
-            default:
-                throw new SmartyException("invalid config property '$property_name'.");
-        }
-    }
-
-    /**
-     * <<magic>> Generic getter.
-     *
-     * @param string $property_name valid: content, timestamp, exists
-     * @throws SmartyException when the given property name is not valid
-     */
-    public function __get($property_name)
-    {
-        switch ($property_name) {
-            case 'timestamp':
-            case 'exists':
-                $this->handler->populateTimestamp($this);
-                return $this->$property_name;
-
-            case 'content':
-                return $this->content = $this->handler->getContent($this);
-
-            default:
-                throw new SmartyException("config property '$property_name' does not exist.");
-        }
-    }
-
-}
-
-?>
\ No newline at end of file
diff --git a/include/smarty/libs/sysplugins/smarty_data.php b/include/smarty/libs/sysplugins/smarty_data.php
new file mode 100644
index 000000000..7cf18a43e
--- /dev/null
+++ b/include/smarty/libs/sysplugins/smarty_data.php
@@ -0,0 +1,68 @@
+<?php
+/**
+ * Smarty Plugin Data
+ * This file contains the data object
+ *
+ * @package    Smarty
+ * @subpackage Template
+ * @author     Uwe Tews
+ */
+
+/**
+ * class for the Smarty data object
+ * The Smarty data object will hold Smarty variables in the current scope
+ *
+ * @package    Smarty
+ * @subpackage Template
+ */
+class Smarty_Data extends Smarty_Internal_Data
+{
+    /**
+     * Counter
+     *
+     * @var int
+     */
+    static $count = 0;
+
+    /**
+     * Data block name
+     *
+     * @var string
+     */
+    public $dataObjectName = '';
+
+    /**
+     * Smarty object
+     *
+     * @var Smarty
+     */
+    public $smarty = null;
+
+    /**
+     * create Smarty data object
+     *
+     * @param Smarty|array                    $_parent parent template
+     * @param Smarty|Smarty_Internal_Template $smarty  global smarty instance
+     * @param string                          $name    optional data block name
+     *
+     * @throws SmartyException
+     */
+    public function __construct($_parent = null, $smarty = null, $name = null)
+    {
+        parent::__construct();
+        self::$count ++;
+        $this->dataObjectName = 'Data_object ' . (isset($name) ? "'{$name}'" : self::$count);
+        $this->smarty = $smarty;
+        if (is_object($_parent)) {
+            // when object set up back pointer
+            $this->parent = $_parent;
+        } elseif (is_array($_parent)) {
+            // set up variable values
+            foreach ($_parent as $_key => $_val) {
+                $this->tpl_vars[$_key] = new Smarty_Variable($_val);
+            }
+        } elseif ($_parent != null) {
+            throw new SmartyException("Wrong type for template variables");
+        }
+    }
+}
diff --git a/include/smarty/libs/sysplugins/smarty_internal_cacheresource_file.php b/include/smarty/libs/sysplugins/smarty_internal_cacheresource_file.php
index 04194b396..64d02dfe5 100644
--- a/include/smarty/libs/sysplugins/smarty_internal_cacheresource_file.php
+++ b/include/smarty/libs/sysplugins/smarty_internal_cacheresource_file.php
@@ -2,41 +2,39 @@
 /**
  * Smarty Internal Plugin CacheResource File
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage Cacher
- * @author Uwe Tews
- * @author Rodney Rehm
+ * @author     Uwe Tews
+ * @author     Rodney Rehm
  */
 
 /**
  * This class does contain all necessary methods for the HTML cache on file system
- *
  * Implements the file system as resource for the HTML cache Version ussing nocache inserts.
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage Cacher
  */
-class Smarty_Internal_CacheResource_File extends Smarty_CacheResource {
-
+class Smarty_Internal_CacheResource_File extends Smarty_CacheResource
+{
     /**
      * populate Cached Object with meta data from Resource
      *
      * @param Smarty_Template_Cached   $cached    cached object
      * @param Smarty_Internal_Template $_template template object
+     *
      * @return void
      */
     public function populate(Smarty_Template_Cached $cached, Smarty_Internal_Template $_template)
     {
         $_source_file_path = str_replace(':', '.', $_template->source->filepath);
         $_cache_id = isset($_template->cache_id) ? preg_replace('![^\w\|]+!', '_', $_template->cache_id) : null;
-        $_compile_id = isset($_template->compile_id) ? preg_replace('![^\w\|]+!', '_', $_template->compile_id) : null;
+        $_compile_id = isset($_template->compile_id) ? preg_replace('![^\w]+!', '_', $_template->compile_id) : null;
         $_filepath = $_template->source->uid;
         // if use_sub_dirs, break file into directories
         if ($_template->smarty->use_sub_dirs) {
-            $_filepath = substr($_filepath, 0, 2) . DS
-                . substr($_filepath, 2, 2) . DS
-                . substr($_filepath, 4, 2) . DS
-                . $_filepath;
+            $_filepath = substr($_filepath, 0, 2) . DS . substr($_filepath, 2, 2) . DS . substr($_filepath, 4, 2) . DS .
+                $_filepath;
         }
         $_compile_dir_sep = $_template->smarty->use_sub_dirs ? DS : '^';
         if (isset($_cache_id)) {
@@ -58,36 +56,52 @@ class Smarty_Internal_CacheResource_File extends Smarty_CacheResource {
             } else {
                 $_lock_dir = $_cache_dir;
             }
-            $cached->lock_id = $_lock_dir.sha1($_cache_id.$_compile_id.$_template->source->uid).'.lock';
+            $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 = $cached->exists = is_file($cached->filepath);
+        if ($cached->exists) {
+            $cached->timestamp = filemtime($cached->filepath);
         }
-        $cached->filepath = $_cache_dir . $_cache_id . $_compile_id . $_filepath . '.' . basename($_source_file_path) . '.php';
-        $cached->timestamp = @filemtime($cached->filepath);
-        $cached->exists = !!$cached->timestamp;
     }
 
     /**
      * populate Cached Object with timestamp and exists from Resource
      *
      * @param Smarty_Template_Cached $cached cached object
+     *
      * @return void
      */
     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);
+        }
     }
 
     /**
      * Read the cached template and process its header
      *
      * @param Smarty_Internal_Template $_template template object
-     * @param Smarty_Template_Cached $cached cached object
-     * @return booelan true or false if the cached content does not exist
+     * @param Smarty_Template_Cached   $cached    cached object
+     * @param bool                     $update flag if called because cache update
+     *
+     * @return boolean true or false if the cached content does not exist
      */
-    public function process(Smarty_Internal_Template $_template, Smarty_Template_Cached $cached=null)
+    public function process(Smarty_Internal_Template $_template, Smarty_Template_Cached $cached = null, $update = false)
     {
+        /** @var Smarty_Internal_Template $_smarty_tpl
+         * used in included file
+         */
         $_smarty_tpl = $_template;
-        return @include $_template->cached->filepath;
+        $_template->cached->valid = false;
+        if ($update && defined('HHVM_VERSION')) {
+            return $_template->smarty->ext->_hhvm->includeHhvm($_template, $_template->cached->filepath);
+        } else {
+            return @include $_template->cached->filepath;
+        }
     }
 
     /**
@@ -95,14 +109,19 @@ class Smarty_Internal_CacheResource_File extends Smarty_CacheResource {
      *
      * @param Smarty_Internal_Template $_template template object
      * @param string                   $content   content to cache
+     *
      * @return boolean success
      */
     public function writeCachedContent(Smarty_Internal_Template $_template, $content)
     {
-        if (Smarty_Internal_Write_File::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) {
+        if ($_template->smarty->ext->_writeFile->writeFile($_template->cached->filepath, $content, $_template->smarty) === true) {
+            if (function_exists('opcache_invalidate')) {
+                opcache_invalidate($_template->cached->filepath);
+            }
+            $cached = $_template->cached;
+            $cached->timestamp = $cached->exists = is_file($cached->filepath);
+            if ($cached->exists) {
+                $cached->timestamp = filemtime($cached->filepath);
                 return true;
             }
         }
@@ -110,122 +129,56 @@ class Smarty_Internal_CacheResource_File extends Smarty_CacheResource {
     }
 
     /**
+     * Read cached template from cache
+     *
+     * @param  Smarty_Internal_Template $_template template object
+     *
+     * @return string  content
+     */
+    public function readCachedContent(Smarty_Internal_Template $_template)
+    {
+        if (is_file($_template->cached->filepath)) {
+            return file_get_contents($_template->cached->filepath);
+        }
+        return false;
+    }
+
+    /**
      * Empty cache
      *
-     * @param Smarty_Internal_Template $_template template object
-     * @param integer                  $exp_time  expiration time (number of seconds, not timestamp)
+     * @param Smarty  $smarty
+     * @param integer $exp_time expiration time (number of seconds, not timestamp)
+     *
      * @return integer number of cache files deleted
      */
     public function clearAll(Smarty $smarty, $exp_time = null)
     {
-        return $this->clear($smarty, null, null, null, $exp_time);
+        return Smarty_Internal_Extension_Clear::clear($smarty, null, null, null, $exp_time);
     }
 
     /**
      * Empty cache for a specific template
      *
-     * @param Smarty  $_template     template object
+     * @param Smarty  $smarty
      * @param string  $resource_name template name
      * @param string  $cache_id      cache id
      * @param string  $compile_id    compile id
      * @param integer $exp_time      expiration time (number of seconds, not timestamp)
+     *
      * @return integer number of cache files deleted
-    */
+     */
     public function clear(Smarty $smarty, $resource_name, $cache_id, $compile_id, $exp_time)
     {
-        $_cache_id = isset($cache_id) ? preg_replace('![^\w\|]+!', '_', $cache_id) : null;
-        $_compile_id = isset($compile_id) ? preg_replace('![^\w\|]+!', '_', $compile_id) : null;
-        $_dir_sep = $smarty->use_sub_dirs ? '/' : '^';
-        $_compile_id_offset = $smarty->use_sub_dirs ? 3 : 0;
-        $_dir = $smarty->getCacheDir();
-        $_dir_length = strlen($_dir);
-        if (isset($_cache_id)) {
-            $_cache_id_parts = explode('|', $_cache_id);
-            $_cache_id_parts_count = count($_cache_id_parts);
-            if ($smarty->use_sub_dirs) {
-                foreach ($_cache_id_parts as $id_part) {
-                    $_dir .= $id_part . DS;
-                }
-            }
-        }
-        if (isset($resource_name)) {
-            $_save_stat = $smarty->caching;
-            $smarty->caching = true;
-            $tpl = new $smarty->template_class($resource_name, $smarty);
-            $smarty->caching = $_save_stat;
-
-            // remove from template cache
-            $tpl->source; // have the template registered before unset()
-            if ($smarty->allow_ambiguous_resources) {
-                $_templateId = $tpl->source->unique_resource . $tpl->cache_id . $tpl->compile_id;
-            } else {
-                $_templateId = $smarty->joined_template_dir . '#' . $resource_name . $tpl->cache_id . $tpl->compile_id;
-            }
-            if (isset($_templateId[150])) {
-                $_templateId = sha1($_templateId);
-            }
-            unset($smarty->template_objects[$_templateId]);
-
-            if ($tpl->source->exists) {
-                $_resourcename_parts = basename(str_replace('^', '/', $tpl->cached->filepath));
-            } else {
-                return 0;
-            }
-        }
-        $_count = 0;
-        $_time = time();
-        if (file_exists($_dir)) {
-            $_cacheDirs = new RecursiveDirectoryIterator($_dir);
-            $_cache = new RecursiveIteratorIterator($_cacheDirs, RecursiveIteratorIterator::CHILD_FIRST);
-            foreach ($_cache as $_file) {
-                if (substr(basename($_file->getPathname()),0,1) == '.' || strpos($_file, '.svn') !== false) continue;
-                // directory ?
-                if ($_file->isDir()) {
-                    if (!$_cache->isDot()) {
-                        // delete folder if empty
-                        @rmdir($_file->getPathname());
-                    }
-                } else {
-                    $_parts = explode($_dir_sep, str_replace('\\', '/', substr((string)$_file, $_dir_length)));
-                    $_parts_count = count($_parts);
-                    // check name
-                    if (isset($resource_name)) {
-                        if ($_parts[$_parts_count-1] != $_resourcename_parts) {
-                            continue;
-                        }
-                    }
-                    // check compile id
-                    if (isset($_compile_id) && (!isset($_parts[$_parts_count-2 - $_compile_id_offset]) || $_parts[$_parts_count-2 - $_compile_id_offset] != $_compile_id)) {
-                        continue;
-                    }
-                    // check cache id
-                    if (isset($_cache_id)) {
-                        // count of cache id parts
-                        $_parts_count = (isset($_compile_id)) ? $_parts_count - 2 - $_compile_id_offset : $_parts_count - 1 - $_compile_id_offset;
-                        if ($_parts_count < $_cache_id_parts_count) {
-                            continue;
-                        }
-                        for ($i = 0; $i < $_cache_id_parts_count; $i++) {
-                            if ($_parts[$i] != $_cache_id_parts[$i]) continue 2;
-                        }
-                    }
-                    // expired ?
-                    if (isset($exp_time) && $_time - @filemtime($_file) < $exp_time) {
-                        continue;
-                    }
-                    $_count += @unlink((string) $_file) ? 1 : 0;
-                }
-            }
-        }
-        return $_count;
+        return Smarty_Internal_Extension_Clear::clear($smarty, $resource_name, $cache_id, $compile_id, $exp_time);
     }
 
     /**
      * Check is cache is locked for this template
      *
-     * @param Smarty $smarty Smarty object
+     * @param Smarty                 $smarty Smarty object
      * @param Smarty_Template_Cached $cached cached object
-     * @return booelan true or false if cache is locked
+     *
+     * @return boolean true or false if cache is locked
      */
     public function hasLock(Smarty $smarty, Smarty_Template_Cached $cached)
     {
@@ -234,15 +187,21 @@ 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;
+        }
     }
 
     /**
      * Lock cache for this template
      *
-     * @param Smarty $smarty Smarty object
+     * @param Smarty                 $smarty Smarty object
      * @param Smarty_Template_Cached $cached cached object
+     *
+     * @return bool|void
      */
     public function acquireLock(Smarty $smarty, Smarty_Template_Cached $cached)
     {
@@ -253,8 +212,10 @@ class Smarty_Internal_CacheResource_File extends Smarty_CacheResource {
     /**
      * Unlock cache for this template
      *
-     * @param Smarty $smarty Smarty object
+     * @param Smarty                 $smarty Smarty object
      * @param Smarty_Template_Cached $cached cached object
+     *
+     * @return bool|void
      */
     public function releaseLock(Smarty $smarty, Smarty_Template_Cached $cached)
     {
@@ -262,5 +223,3 @@ class Smarty_Internal_CacheResource_File extends Smarty_CacheResource {
         @unlink($cached->lock_id);
     }
 }
-
-?>
\ No newline at end of file
diff --git a/include/smarty/libs/sysplugins/smarty_internal_compile_append.php b/include/smarty/libs/sysplugins/smarty_internal_compile_append.php
index f6036e883..bd2ffe474 100644
--- a/include/smarty/libs/sysplugins/smarty_internal_compile_append.php
+++ b/include/smarty/libs/sysplugins/smarty_internal_compile_append.php
@@ -1,31 +1,31 @@
 <?php
 /**
  * Smarty Internal Plugin Compile Append
- *
  * Compiles the {append} tag
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage Compiler
- * @author Uwe Tews
+ * @author     Uwe Tews
  */
 
 /**
  * Smarty Internal Plugin Compile Append Class
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage Compiler
  */
-class Smarty_Internal_Compile_Append extends Smarty_Internal_Compile_Assign {
-
+class Smarty_Internal_Compile_Append extends Smarty_Internal_Compile_Assign
+{
     /**
      * Compiles code for the {append} 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 \Smarty_Internal_TemplateCompilerBase $compiler  compiler object
+     * @param  array                                       $parameter array with compilation parameter
+     *
      * @return string compiled code
      */
-    public function compile($args, $compiler, $parameter)
+    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter)
     {
         // the following must be assigned at runtime because it will be overwritten in parent class
         $this->required_attributes = array('var', 'value');
@@ -47,7 +47,4 @@ class Smarty_Internal_Compile_Append extends Smarty_Internal_Compile_Assign {
         // call compile assign
         return parent::compile($_new_attr, $compiler, $_params);
     }
-
 }
-
-?>
\ No newline at end of file
diff --git a/include/smarty/libs/sysplugins/smarty_internal_compile_assign.php b/include/smarty/libs/sysplugins/smarty_internal_compile_assign.php
index f2dfedfb8..5e3fce3cc 100644
--- a/include/smarty/libs/sysplugins/smarty_internal_compile_assign.php
+++ b/include/smarty/libs/sysplugins/smarty_internal_compile_assign.php
@@ -1,38 +1,46 @@
 <?php
 /**
  * Smarty Internal Plugin Compile Assign
- *
  * Compiles the {assign} tag
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage Compiler
- * @author Uwe Tews
+ * @author     Uwe Tews
  */
 
 /**
  * Smarty Internal Plugin Compile Assign Class
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage Compiler
  */
-class Smarty_Internal_Compile_Assign extends Smarty_Internal_CompileBase {
+class Smarty_Internal_Compile_Assign extends Smarty_Internal_CompileBase
+{
+    /**
+     * Valid scope names
+     *
+     * @var array
+     */
+    public $valid_scopes = array('local'  => true, 'parent' => true, 'root' => true, 'global' => true,
+                                 'smarty' => true, 'tpl_root' => true);
 
     /**
      * Compiles code for the {assign} 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 \Smarty_Internal_TemplateCompilerBase $compiler  compiler object
+     * @param  array                                $parameter array with compilation parameter
+     *
      * @return string compiled code
+     * @throws \SmartyCompilerException
      */
-    public function compile($args, $compiler, $parameter)
+    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter)
     {
         // the following must be assigned at runtime because it will be overwritten in Smarty_Internal_Compile_Append
         $this->required_attributes = array('var', 'value');
         $this->shorttag_order = array('var', 'value');
-        $this->optional_attributes = array('scope');
+        $this->optional_attributes = array('scope', 'bubble_up');
         $_nocache = 'null';
-        $_scope = Smarty::SCOPE_LOCAL;
         // check and get attributes
         $_attr = $this->getAttributes($compiler, $args);
         // nocache ?
@@ -42,47 +50,49 @@ class Smarty_Internal_Compile_Assign extends Smarty_Internal_CompileBase {
             if (isset($compiler->template->tpl_vars[trim($_attr['var'], "'")])) {
                 $compiler->template->tpl_vars[trim($_attr['var'], "'")]->nocache = true;
             } else {
-                $compiler->template->tpl_vars[trim($_attr['var'], "'")] = new Smarty_variable(null, true);
+                $compiler->template->tpl_vars[trim($_attr['var'], "'")] = new Smarty_Variable(null, true);
             }
         }
         // scope setup
+        $_scope = Smarty::SCOPE_LOCAL;
         if (isset($_attr['scope'])) {
             $_attr['scope'] = trim($_attr['scope'], "'\"");
-            if ($_attr['scope'] == 'parent') {
-                $_scope = Smarty::SCOPE_PARENT;
-            } elseif ($_attr['scope'] == 'root') {
-                $_scope = Smarty::SCOPE_ROOT;
-            } elseif ($_attr['scope'] == 'global') {
-                $_scope = Smarty::SCOPE_GLOBAL;
-            } else {
-                $compiler->trigger_template_error('illegal value for "scope" attribute', $compiler->lex->taglineno);
+            if (!isset($this->valid_scopes[$_attr['scope']])) {
+                $compiler->trigger_template_error("illegal value '{$_attr['scope']}' for \"scope\" attribute", null, true);
+            }
+            if ($_attr['scope'] != 'local') {
+                if ($_attr['scope'] == 'parent') {
+                    $_scope = Smarty::SCOPE_PARENT;
+                } elseif ($_attr['scope'] == 'root') {
+                    $_scope = Smarty::SCOPE_ROOT;
+                } elseif ($_attr['scope'] == 'global') {
+                    $_scope = Smarty::SCOPE_GLOBAL;
+                } elseif ($_attr['scope'] == 'smarty') {
+                    $_scope = Smarty::SCOPE_SMARTY;
+                } elseif ($_attr['scope'] == 'tpl_root') {
+                    $_scope = Smarty::SCOPE_TPL_ROOT;
+                }
+                $_scope += (isset($_attr['bubble_up']) && $_attr['bubble_up'] == 'false') ? 0 : Smarty::SCOPE_BUBBLE_UP;
             }
         }
         // compiled output
         if (isset($parameter['smarty_internal_index'])) {
-            $output = "<?php \$_smarty_tpl->createLocalArrayVariable($_attr[var], $_nocache, $_scope);\n\$_smarty_tpl->tpl_vars[$_attr[var]]->value$parameter[smarty_internal_index] = $_attr[value];";
+            $output =
+                "<?php \$_smarty_tpl->smarty->ext->_var->createLocalArrayVariable(\$_smarty_tpl, $_attr[var], $_nocache);\n\$_smarty_tpl->tpl_vars[$_attr[var]]->value$parameter[smarty_internal_index] = $_attr[value];";
         } else {
             // implement Smarty2's behaviour of variables assigned by reference
             if ($compiler->template->smarty instanceof SmartyBC) {
-                $output = "<?php if (isset(\$_smarty_tpl->tpl_vars[$_attr[var]])) {\$_smarty_tpl->tpl_vars[$_attr[var]] = clone \$_smarty_tpl->tpl_vars[$_attr[var]];";
-                $output .= "\n\$_smarty_tpl->tpl_vars[$_attr[var]]->value = $_attr[value]; \$_smarty_tpl->tpl_vars[$_attr[var]]->nocache = $_nocache; \$_smarty_tpl->tpl_vars[$_attr[var]]->scope = $_scope;";
-                $output .= "\n} else \$_smarty_tpl->tpl_vars[$_attr[var]] = new Smarty_variable($_attr[value], $_nocache, $_scope);";
+                $output =
+                    "<?php if (isset(\$_smarty_tpl->tpl_vars[$_attr[var]])) {\$_smarty_tpl->tpl_vars[$_attr[var]] = clone \$_smarty_tpl->tpl_vars[$_attr[var]];";
+                $output .= "\n\$_smarty_tpl->tpl_vars[$_attr[var]]->value = $_attr[value]; \$_smarty_tpl->tpl_vars[$_attr[var]]->nocache = $_nocache;";
+                $output .= "\n} else \$_smarty_tpl->tpl_vars[$_attr[var]] = new Smarty_Variable($_attr[value], $_nocache);";
             } else {
-                $output = "<?php \$_smarty_tpl->tpl_vars[$_attr[var]] = new Smarty_variable($_attr[value], $_nocache, $_scope);";
+                $output = "<?php \$_smarty_tpl->tpl_vars[$_attr[var]] = new Smarty_Variable($_attr[value], $_nocache);";
             }
         }
-        if ($_scope == Smarty::SCOPE_PARENT) {
-            $output .= "\nif (\$_smarty_tpl->parent != null) \$_smarty_tpl->parent->tpl_vars[$_attr[var]] = clone \$_smarty_tpl->tpl_vars[$_attr[var]];";
-        } elseif ($_scope == Smarty::SCOPE_ROOT || $_scope == Smarty::SCOPE_GLOBAL) {
-            $output .= "\n\$_ptr = \$_smarty_tpl->parent; while (\$_ptr != null) {\$_ptr->tpl_vars[$_attr[var]] = clone \$_smarty_tpl->tpl_vars[$_attr[var]]; \$_ptr = \$_ptr->parent; }";
-        }
-        if ( $_scope == Smarty::SCOPE_GLOBAL) {
-            $output .= "\nSmarty::\$global_tpl_vars[$_attr[var]] = clone \$_smarty_tpl->tpl_vars[$_attr[var]];";
-        }
+        $output .= "\n\$_smarty_tpl->ext->_updateScope->updateScope(\$_smarty_tpl, $_attr[var], $_scope);";
         $output .= '?>';
+
         return $output;
     }
-
 }
-
-?>
\ No newline at end of file
diff --git a/include/smarty/libs/sysplugins/smarty_internal_compile_block.php b/include/smarty/libs/sysplugins/smarty_internal_compile_block.php
index f760e551d..52a541ebd 100644
--- a/include/smarty/libs/sysplugins/smarty_internal_compile_block.php
+++ b/include/smarty/libs/sysplugins/smarty_internal_compile_block.php
@@ -1,23 +1,20 @@
 <?php
-
-/**
- * Smarty Internal Plugin Compile Block
+/*
+ * This file is part of Smarty.
  *
- * Compiles the {block}{/block} tags
+ * (c) 2015 Uwe Tews
  *
- * @package Smarty
- * @subpackage Compiler
- * @author Uwe Tews
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 /**
  * Smarty Internal Plugin Compile Block Class
  *
- * @package Smarty
- * @subpackage Compiler
+ * @author Uwe Tews <uwe.tews@googlemail.com>
  */
-class Smarty_Internal_Compile_Block extends Smarty_Internal_CompileBase {
-
+class Smarty_Internal_Compile_Block extends Smarty_Internal_Compile_Shared_Inheritance
+{
     /**
      * Attribute definition: Overwrites base class.
      *
@@ -32,7 +29,7 @@ class Smarty_Internal_Compile_Block extends Smarty_Internal_CompileBase {
      * @var array
      * @see Smarty_Internal_CompileBase
      */
-    public $shorttag_order = array('name', 'hide');
+    public $shorttag_order = array('name');
 
     /**
      * Attribute definition: Overwrites base class.
@@ -40,243 +37,256 @@ class Smarty_Internal_Compile_Block extends Smarty_Internal_CompileBase {
      * @var array
      * @see Smarty_Internal_CompileBase
      */
-    public $optional_attributes = array('hide');
+    public $option_flags = array('hide', 'nocache');
 
     /**
-     * Compiles code for the {block} tag
+     * Attribute definition: Overwrites base class.
      *
-     * @param array  $args     array with attributes from parser
-     * @param object $compiler compiler object
-     * @return boolean true
+     * @var array
+     * @see Smarty_Internal_CompileBase
      */
-    public function compile($args, $compiler) {
-        // check and get attributes
-        $_attr = $this->getAttributes($compiler, $args);
-        $save = array($_attr, $compiler->parser->current_buffer, $compiler->nocache, $compiler->smarty->merge_compiled_includes, $compiler->merged_templates, $compiler->smarty->merged_templates_func, $compiler->template->properties, $compiler->template->has_nocache_code);
-        $this->openTag($compiler, 'block', $save);
-        if ($_attr['nocache'] == true) {
-            $compiler->nocache = true;
-        }
-        // set flag for {block} tag
-        $compiler->inheritance = true;
-        // must merge includes
-        $compiler->smarty->merge_compiled_includes = true;
+    public $optional_attributes = array('assign');
 
-        $compiler->parser->current_buffer = new _smarty_template_buffer($compiler->parser);
-        $compiler->has_code = false;
-        return true;
-    }
+    /**
+     * nesting level of block tags
+     *
+     * @var int
+     */
+    public static $blockTagNestingLevel = 0;
 
     /**
-     * Save or replace child block source by block name during parsing
+     * Saved compiler object
      *
-     * @param string $block_content     block source content
-     * @param string $block_tag         opening block tag
-     * @param object $template          template object
-     * @param string $filepath          filepath of template source
+     * @var Smarty_Internal_TemplateCompilerBase
      */
-    public static function saveBlockData($block_content, $block_tag, $template, $filepath) {
-        $_rdl = preg_quote($template->smarty->right_delimiter);
-        $_ldl = preg_quote($template->smarty->left_delimiter);
-        if (!$template->smarty->auto_literal) {
-            $al = '\s*';
-        } else {
-            $al = '';
-        }
-        if (0 == preg_match("!({$_ldl}{$al}block\s+)(name=)?(\w+|'.*'|\".*\")(\s*?)?((append|prepend|nocache)?(\s*)?(hide)?)?(\s*{$_rdl})!", $block_tag, $_match)) {
-            $error_text = 'Syntax Error in template "' . $template->source->filepath . '"   "' . htmlspecialchars($block_tag) . '" illegal options';
-            throw new SmartyCompilerException($error_text);
-        } else {
-            $_name = trim($_match[3], '\'"');
-            if ($_match[8] != 'hide' || isset($template->block_data[$_name])) {        // replace {$smarty.block.child}
-                // get nested block tags
-                if (0 != preg_match_all("!({$_ldl}{$al}block\s+)(name=)?(\w+|'.*'|\".*\")([\s\S]*?)(hide)?(\s*{$_rdl})([\s\S]*?)(.*)?({$_ldl}{$al}/block\s*{$_rdl})!", $block_content, $_match2)) {
-                    foreach ($_match2[3] as $key => $name) {
-                        // get it's replacement
-                        $_name2 = trim($name, '\'"');
-                        if ($_match2[5][$key] != 'hide' || isset($template->block_data[$_name2])) {
-                            if (isset($template->block_data[$_name2])) {
-                                $replacement = $template->block_data[$_name2]['source'];
-                            } else {
-                                $replacement = '';
-                            }
-                            // replace {$smarty.block.child} tag
-                            if (preg_match("!{$_ldl}{$al}\\\$smarty\.block\.child\s*{$_rdl}!",$_match2[7][$key])) {
-                                 $replacement =  preg_replace("!({$_ldl}{$al}\\\$smarty\.block\.child\s*{$_rdl})!", $replacement, $_match2[7][$key]);
-                                 $block_content = preg_replace("!(({$_ldl}{$al}block)(.*)?{$name}(.*)?({$_rdl}[\s\S]*?{$_ldl}{$al}/block\s*{$_rdl}))!", $replacement, $block_content);
-                           }
-                             if (preg_match("!{$_ldl}{$al}\\\$smarty\.block\.child\s*{$_rdl}!",$_match2[8][$key])) {
-                                 $replacement =  preg_replace("!{$_ldl}{$al}\\\$smarty\.block\.child\s*{$_rdl}!", $replacement, $_match2[8][$key]);
-                                 $block_content = preg_replace("!(({$_ldl}{$al}block)(.*)?{$name}(.*)?({$_rdl})(.*)?({$_ldl}{$al}/block\s*{$_rdl}))!", $replacement, $block_content);
-                             }
-                        } else {
-                            // remove hidden blocks
-                            $block_content = preg_replace("!(({$_ldl}{$al}block)(.*)?{$name}(.*)?({$_rdl}[\s\S]*?{$_ldl}{$al}/block\s*{$_rdl}))!", '', $block_content);
-                        }
-                    }
-                }
-                // do we have not nested {$smart.block.child}
-                if (0 != preg_match("!({$_ldl}{$al}\\\$smarty\.block\.child\s*{$_rdl})!", $block_content, $_match2)) {
-                    // get child replacement for this block
-                    if (isset($template->block_data[$_name])) {
-                        $replacement = $template->block_data[$_name]['source'];
-                        unset($template->block_data[$_name]);
-                    } else {
-                        $replacement = '';
-                    }
-                    $block_content = preg_replace("!({$_ldl}{$al}\\\$smarty\.block\.child\s*{$_rdl})!", $replacement, $block_content);
-                }
-                if (isset($template->block_data[$_name])) {
-                    if (strpos($template->block_data[$_name]['source'], '%%%%SMARTY_PARENT%%%%') !== false) {
-                        $template->block_data[$_name]['source'] =
-                                str_replace('%%%%SMARTY_PARENT%%%%', $block_content, $template->block_data[$_name]['source']);
-                    } elseif ($template->block_data[$_name]['mode'] == 'prepend') {
-                        $template->block_data[$_name]['source'] .= $block_content;
-                    } elseif ($template->block_data[$_name]['mode'] == 'append') {
-                        $template->block_data[$_name]['source'] = $block_content . $template->block_data[$_name]['source'];
-                    }
-                } else {
-                    $template->block_data[$_name]['source'] = $block_content;
-                    $template->block_data[$_name]['file'] = $filepath;
-                }
-                if ($_match[6] == 'append') {
-                    $template->block_data[$_name]['mode'] = 'append';
-                } elseif ($_match[6] == 'prepend') {
-                    $template->block_data[$_name]['mode'] = 'prepend';
-                } else {
-                    $template->block_data[$_name]['mode'] = 'replace';
-                }
-            }
-        }
-    }
+    public $compiler = null;
 
     /**
-     * Compile saved child block source
+     * Compiles code for the {block} tag
+     *
+     * @param  array                                 $args      array with attributes from parser
+     * @param  \Smarty_Internal_TemplateCompilerBase $compiler  compiler object
+     * @param  array                                 $parameter array with compilation parameter
      *
-     * @param object $compiler  compiler object
-     * @param string $_name     optional name of child block
-     * @return string   compiled code of schild block
+     * @return bool true
      */
-    public static function compileChildBlock($compiler, $_name = null) {
-        $_output = '';
-        // if called by {$smarty.block.child} we must search the name of enclosing {block}
-        if ($_name == null) {
-            $stack_count = count($compiler->_tag_stack);
-            while (--$stack_count >= 0) {
-                if ($compiler->_tag_stack[$stack_count][0] == 'block') {
-                    $_name = trim($compiler->_tag_stack[$stack_count][1][0]['name'], "'\"");
-                    break;
-                }
-            }
-            // flag that child is already compile by {$smarty.block.child} inclusion
-            $compiler->template->block_data[$_name]['compiled'] = true;
-        }
-        if ($_name == null) {
-            $compiler->trigger_template_error('{$smarty.block.child} used out of context', $compiler->lex->taglineno);
+    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter)
+    {
+        if (!isset($compiler->_cache['blockNesting'])) {
+            $compiler->_cache['blockNesting'] = 0;
         }
-        // undefined child?
-        if (!isset($compiler->template->block_data[$_name]['source'])) {
-            return '';
-        }
-        $_tpl = new Smarty_Internal_template('string:' . $compiler->template->block_data[$_name]['source'], $compiler->smarty, $compiler->template, $compiler->template->cache_id,
-                        $compiler->template->compile_id = null, $compiler->template->caching, $compiler->template->cache_lifetime);
-        $_tpl->variable_filters = $compiler->template->variable_filters;
-        $_tpl->properties['nocache_hash'] = $compiler->template->properties['nocache_hash'];
-        $_tpl->source->filepath = $compiler->template->block_data[$_name]['file'];
-        $_tpl->allow_relative_path = true;
-        if ($compiler->nocache) {
-            $_tpl->compiler->forceNocache = 2;
+        if ($compiler->_cache['blockNesting'] == 0) {
+            // make sure that inheritance gets initialized in template code
+            $this->registerInit($compiler);
+            $this->option_flags = array('hide', 'nocache', 'append', 'prepend');
         } else {
-            $_tpl->compiler->forceNocache = 1;
+            $this->option_flags = array('hide', 'nocache');
         }
-        $_tpl->compiler->suppressHeader = true;
-        $_tpl->compiler->suppressTemplatePropertyHeader = true;
-        $_tpl->compiler->suppressMergedTemplates = true;
-        if (strpos($compiler->template->block_data[$_name]['source'], '%%%%SMARTY_PARENT%%%%') !== false) {
-            $_output = str_replace('%%%%SMARTY_PARENT%%%%', $compiler->parser->current_buffer->to_smarty_php(), $_tpl->compiler->compileTemplate($_tpl));
-        } elseif ($compiler->template->block_data[$_name]['mode'] == 'prepend') {
-            $_output = $_tpl->compiler->compileTemplate($_tpl) . $compiler->parser->current_buffer->to_smarty_php();
-        } elseif ($compiler->template->block_data[$_name]['mode'] == 'append') {
-            $_output = $compiler->parser->current_buffer->to_smarty_php() . $_tpl->compiler->compileTemplate($_tpl);
-        } elseif (!empty($compiler->template->block_data[$_name])) {
-            $_output = $_tpl->compiler->compileTemplate($_tpl);
+        // check and get attributes
+        $_attr = $this->getAttributes($compiler, $args);
+        $compiler->_cache['blockNesting'] ++;
+        $compiler->_cache['blockName'][$compiler->_cache['blockNesting']] = $_attr['name'];
+        $compiler->_cache['blockParams'][$compiler->_cache['blockNesting']][0] = 'block_' . preg_replace('![^\w]+!', '_', uniqid(rand(), true));
+        $compiler->_cache['blockParams'][$compiler->_cache['blockNesting']][1] = false;
+        $this->openTag($compiler, 'block', array($_attr, $compiler->nocache, $compiler->parser->current_buffer,
+                                                 $compiler->template->compiled->has_nocache_code,
+                                                 $compiler->template->caching));
+        // must whole block be nocache ?
+        if ($compiler->tag_nocache) {
+            $i = 0;
         }
-        $compiler->template->properties['file_dependency'] = array_merge($compiler->template->properties['file_dependency'], $_tpl->properties['file_dependency']);
-        $compiler->template->properties['function'] = array_merge($compiler->template->properties['function'], $_tpl->properties['function']);
-        $compiler->merged_templates = array_merge($compiler->merged_templates, $_tpl->compiler->merged_templates);
-        $compiler->template->variable_filters = $_tpl->variable_filters;
-        if ($_tpl->has_nocache_code) {
-            $compiler->template->has_nocache_code = true;
+        $compiler->nocache = $compiler->nocache | $compiler->tag_nocache;
+        // $compiler->suppressNocacheProcessing = true;
+        if ($_attr['nocache'] === true) {
+            //$compiler->trigger_template_error('nocache option not allowed', $compiler->parser->lex->taglineno);
         }
-        foreach ($_tpl->required_plugins as $key => $tmp1) {
-            if ($compiler->nocache && $compiler->template->caching) {
-                $code = 'nocache';
-            } else {
-                $code = $key;
-            }
-            foreach ($tmp1 as $name => $tmp) {
-                foreach ($tmp as $type => $data) {
-                    $compiler->template->required_plugins[$code][$name][$type] = $data;
-                }
-            }
+        $compiler->parser->current_buffer = new Smarty_Internal_ParseTree_Template();
+        $compiler->template->compiled->has_nocache_code = false;
+        $compiler->suppressNocacheProcessing = true;
+    }
+
+    /**
+     * Compile saved child block source
+     *
+     * @param \Smarty_Internal_TemplateCompilerBase compiler object
+     * @param string                                $_name   optional name of child block
+     *
+     * @return string   compiled code of child block
+     */
+    static function compileChildBlock(Smarty_Internal_TemplateCompilerBase $compiler, $_name = null)
+    {
+        if (!isset($compiler->_cache['blockNesting'])) {
+            $compiler->trigger_template_error(' tag {$smarty.block.child} used outside {block} tags ',
+                                              $compiler->parser->lex->taglineno);
         }
-        unset($_tpl);
-        return $_output;
+        $compiler->has_code = true;
+        $compiler->suppressNocacheProcessing = true;
+        $compiler->_cache['blockParams'][$compiler->_cache['blockNesting']][1] = true;
+        $output = "<?php \n\$_smarty_tpl->ext->_inheritance->processBlock(\$_smarty_tpl, 2, {$compiler->_cache['blockName'][$compiler->_cache['blockNesting']]}, null, \$_blockParentStack);\n?>\n";
+        return $output;
     }
 
+    /**
+     * Compile $smarty.block.parent
+     *
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object
+     * @param string                                $_name    optional name of child block
+     *
+     * @return string   compiled code of child block
+     */
+    static function compileParentBlock(Smarty_Internal_TemplateCompilerBase $compiler, $_name = null)
+    {
+        if (!isset($compiler->_cache['blockNesting'])) {
+            $compiler->trigger_template_error(' tag {$smarty.block.parent} used outside {block} tags ',
+                                              $compiler->parser->lex->taglineno);
+        }
+        $compiler->suppressNocacheProcessing = true;
+        $compiler->has_code = true;
+        $output = "<?php \n\$_smarty_tpl->ext->_inheritance->processBlock(\$_smarty_tpl, 3, {$compiler->_cache['blockName'][$compiler->_cache['blockNesting']]}, null, \$_blockParentStack);\n?>\n";
+        return $output;
+    }
 }
 
 /**
  * Smarty Internal Plugin Compile BlockClose Class
  *
- * @package Smarty
- * @subpackage Compiler
  */
-class Smarty_Internal_Compile_Blockclose extends Smarty_Internal_CompileBase {
-
+class Smarty_Internal_Compile_Blockclose extends Smarty_Internal_Compile_Shared_Inheritance
+{
     /**
      * Compiles code for the {/block} tag
      *
-     * @param array  $args     array with attributes from parser
-     * @param object $compiler compiler object
-     * @return string compiled code
+     * @param  array                                $args      array with attributes from parser
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler  compiler object
+     * @param  array                                $parameter array with compilation parameter
+     *
+     * @return bool true
      */
-    public function compile($args, $compiler) {
-        $compiler->has_code = true;
-        // check and get attributes
-        $_attr = $this->getAttributes($compiler, $args);
-        $saved_data = $this->closeTag($compiler, array('block'));
-        $_name = trim($saved_data[0]['name'], "\"'");
-        if (isset($compiler->template->block_data[$_name]) && !isset($compiler->template->block_data[$_name]['compiled'])) {
-            // restore to status before {block} tag as new subtemplate code of parent {block} is not needed
-            // TODO: Below code was disabled in 3.1.8 because of problems with {include} in nested {block} tags in child templates
-            //       combined with append/prepend or $smarty.block.parent
-            //       For later versions it should be checked under which conditions it could run for optimisation
-            //
-            //$compiler->merged_templates = $saved_data[4];
-            //$compiler->smarty->merged_templates_func = $saved_data[5];
-            //$compiler->template->properties = $saved_data[6];
-            //$compiler->template->has_nocache_code = $saved_data[7];
-            $_output = Smarty_Internal_Compile_Block::compileChildBlock($compiler, $_name);
-        } else {
-            if (isset($saved_data[0]['hide']) && !isset($compiler->template->block_data[$_name]['source'])) {
-                $_output = '';
-            } else {
-                $_output = $compiler->parser->current_buffer->to_smarty_php();
+    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter)
+    {
+        list($_attr, $_nocache, $_buffer, $_has_nocache_code, $_caching) = $this->closeTag($compiler, array('block'));
+        // init block parameter
+        $_block = $compiler->_cache['blockParams'][$compiler->_cache['blockNesting']];
+        unset($compiler->_cache['blockParams'][$compiler->_cache['blockNesting']]);
+        $_block[2] = $_block[3] = 0;
+        $_name =  trim($_attr['name'], "'\"");
+        $_assign = isset($_attr['assign']) ? $_attr['assign'] : null;
+        unset($_attr['assign'], $_attr['name']);
+        foreach ($_attr as $name => $stat) {
+            if ((is_bool($stat) && $stat !== false) || (!is_bool($stat) && $stat != 'false')) {
+                $_block[$name] = is_string($stat) ? trim($stat, "'\"") : $stat;
             }
-            unset($compiler->template->block_data[$_name]['compiled']);
         }
-        // reset flags
-        $compiler->parser->current_buffer = $saved_data[1];
-        $compiler->nocache = $saved_data[2];
-        $compiler->smarty->merge_compiled_includes = $saved_data[3];
-        // reset flag for {block} tag
-        $compiler->inheritance = false;
-        // $_output content has already nocache code processed
+        $_funcName = $_block[0];
+        // get compiled block code
+        $_functionCode = $compiler->parser->current_buffer;
+        // setup buffer for template function code
+        $compiler->parser->current_buffer = new Smarty_Internal_ParseTree_Template();
+
+        if ($compiler->template->compiled->has_nocache_code) {
+            //            $compiler->parent_compiler->template->tpl_function[$_name]['call_name_caching'] = $_funcNameCaching;
+            $_block[6] = $_funcNameCaching = $_funcName . '_nocache';
+            $output = "<?php\n";
+            $output .= "/* {block '{$_name}'} {$compiler->template->source->type}:{$compiler->template->source->name} */\n";
+            $output .= "function {$_funcNameCaching} (\$_smarty_tpl, \$_blockParentStack) {\n";
+            $output .= "/*/%%SmartyNocache:{$compiler->template->compiled->nocache_hash}%%*/\n";
+            $output .= "\$_smarty_tpl->cached->hashes['{$compiler->template->compiled->nocache_hash}'] = true;\n";
+            if (isset($_assign)) {
+                $output .= "ob_start();\n";
+            }
+            $output .= "?>\n";
+            $compiler->parser->current_buffer->append_subtree($compiler->parser,
+                                                              new Smarty_Internal_ParseTree_Tag($compiler->parser,
+                                                                                                $output));
+            $compiler->parser->current_buffer->append_subtree($compiler->parser, $_functionCode);
+            $output = "<?php\n";
+            if (isset($_assign)) {
+                $output .= "\$_smarty_tpl->tpl_vars[{$_assign}] = new Smarty_Variable(ob_get_clean());\n";
+            }
+            $output .= "/*%%SmartyNocache:{$compiler->template->compiled->nocache_hash}%%*/\n";
+            $output .= "}\n";
+            $output .= "/* {/block '{$_name}'} */\n\n";
+            $output .= "?>\n";
+            $compiler->parser->current_buffer->append_subtree($compiler->parser,
+                                                              new Smarty_Internal_ParseTree_Tag($compiler->parser,
+                                                                                                $output));
+            $compiler->blockOrFunctionCode .= $f = $compiler->parser->current_buffer->to_smarty_php($compiler->parser);
+            $compiler->parser->current_buffer = new Smarty_Internal_ParseTree_Template();
+            $this->compiler = $compiler;
+            $_functionCode = new Smarty_Internal_ParseTree_Tag($compiler->parser,
+                                                               preg_replace_callback("/((<\?php )?echo '\/\*%%SmartyNocache:{$compiler->template->compiled->nocache_hash}%%\*\/([\S\s]*?)\/\*\/%%SmartyNocache:{$compiler->template->compiled->nocache_hash}%%\*\/';(\?>\n)?)/",
+                                                                                     array($this, 'removeNocache'),
+                                                                                     $_functionCode->to_smarty_php($compiler->parser)));
+            $this->compiler = null;
+        }
+        $output = "<?php\n";
+        $output .= "/* {block '{$_name}'}  {$compiler->template->source->type}:{$compiler->template->source->name} */\n";
+        $output .= "function {$_funcName}(\$_smarty_tpl, \$_blockParentStack) {\n";
+        if (isset($_assign)) {
+            $output .= "ob_start();\n";
+        }
+        $output .= "?>\n";
+        $compiler->parser->current_buffer->append_subtree($compiler->parser,
+                                                          new Smarty_Internal_ParseTree_Tag($compiler->parser,
+                                                                                            $output));
+        $compiler->parser->current_buffer->append_subtree($compiler->parser, $_functionCode);
+        $output = "<?php\n";
+        if (isset($_assign)) {
+            $output .= "\$_smarty_tpl->tpl_vars[{$_assign}] = new Smarty_Variable(ob_get_clean());\n";
+        }
+        $output .= "}\n";
+        $output .= "/* {/block '{$_name}'} */\n\n";
+        $output .= "?>\n";
+        $compiler->parser->current_buffer->append_subtree($compiler->parser,
+                                                          new Smarty_Internal_ParseTree_Tag($compiler->parser,
+                                                                                            $output));
+        $compiler->blockOrFunctionCode .= $compiler->parser->current_buffer->to_smarty_php($compiler->parser);
+        // nocache plugins must be copied
+        if (!empty($compiler->template->compiled->required_plugins['nocache'])) {
+            foreach ($compiler->template->compiled->required_plugins['nocache'] as $plugin => $tmp) {
+                foreach ($tmp as $type => $data) {
+                    $compiler->parent_compiler->template->compiled->required_plugins['compiled'][$plugin][$type] =
+                        $data;
+                }
+            }
+        }
+
+
+        // restore old status
+        $compiler->template->compiled->has_nocache_code = $_has_nocache_code;
+        $compiler->tag_nocache = $compiler->nocache;
+        $compiler->nocache = $_nocache;
+        $compiler->parser->current_buffer = $_buffer;
+        $output = "<?php \n";
+        if ($compiler->_cache['blockNesting'] == 1) {
+            $output .= "\$_smarty_tpl->ext->_inheritance->processBlock(\$_smarty_tpl, 0, {$compiler->_cache['blockName'][$compiler->_cache['blockNesting']]}, " .
+                var_export($_block, true) . ");\n";
+        } else {
+            $output .= "\$_smarty_tpl->ext->_inheritance->processBlock(\$_smarty_tpl, 0, {$compiler->_cache['blockName'][$compiler->_cache['blockNesting']]}, " .
+                var_export($_block, true) . ", \$_blockParentStack);\n";
+
+        }
+        $output .= "?>\n";
+        $compiler->_cache['blockNesting'] --;
+        if ($compiler->_cache['blockNesting'] == 0) {
+            unset($compiler->_cache['blockNesting']);
+        }
+        $compiler->has_code = true;
         $compiler->suppressNocacheProcessing = true;
-        return $_output;
+        return $output;
     }
 
+    /**
+     * @param $match
+     *
+     * @return mixed
+     */
+    function removeNocache($match)
+    {
+        $code =
+            preg_replace("/((<\?php )?echo '\/\*%%SmartyNocache:{$this->compiler->template->compiled->nocache_hash}%%\*\/)|(\/\*\/%%SmartyNocache:{$this->compiler->template->compiled->nocache_hash}%%\*\/';(\?>\n)?)/",
+                         '', $match[0]);
+        $code = str_replace(array('\\\'', '\\\\\''), array('\'', '\\\''), $code);
+        return $code;
+    }
 }
-
-?>
\ No newline at end of file
diff --git a/include/smarty/libs/sysplugins/smarty_internal_compile_break.php b/include/smarty/libs/sysplugins/smarty_internal_compile_break.php
index b25bef6c4..cbc73d36a 100644
--- a/include/smarty/libs/sysplugins/smarty_internal_compile_break.php
+++ b/include/smarty/libs/sysplugins/smarty_internal_compile_break.php
@@ -1,21 +1,21 @@
 <?php
 /**
  * Smarty Internal Plugin Compile Break
- *
  * Compiles the {break} tag
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage Compiler
- * @author Uwe Tews
+ * @author     Uwe Tews
  */
+
 /**
  * Smarty Internal Plugin Compile Break Class
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage Compiler
  */
-class Smarty_Internal_Compile_Break extends Smarty_Internal_CompileBase {
-
+class Smarty_Internal_Compile_Break extends Smarty_Internal_CompileBase
+{
     /**
      * Attribute definition: Overwrites base class.
      *
@@ -23,6 +23,7 @@ class Smarty_Internal_Compile_Break extends Smarty_Internal_CompileBase {
      * @see Smarty_Internal_CompileBase
      */
     public $optional_attributes = array('levels');
+
     /**
      * Attribute definition: Overwrites base class.
      *
@@ -34,24 +35,26 @@ class Smarty_Internal_Compile_Break extends Smarty_Internal_CompileBase {
     /**
      * Compiles code for the {break} 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 \Smarty_Internal_TemplateCompilerBase $compiler  compiler object
+     * @param  array                                       $parameter array with compilation parameter
+     *
      * @return string compiled code
+     * @throws \SmartyCompilerException
      */
-    public function compile($args, $compiler, $parameter)
+    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter)
     {
         static $_is_loopy = array('for' => true, 'foreach' => true, 'while' => true, 'section' => true);
         // check and get attributes
         $_attr = $this->getAttributes($compiler, $args);
 
         if ($_attr['nocache'] === true) {
-            $compiler->trigger_template_error('nocache option not allowed', $compiler->lex->taglineno);
+            $compiler->trigger_template_error('nocache option not allowed', null, true);
         }
 
         if (isset($_attr['levels'])) {
             if (!is_numeric($_attr['levels'])) {
-                $compiler->trigger_template_error('level attribute must be a numeric constant', $compiler->lex->taglineno);
+                $compiler->trigger_template_error('level attribute must be a numeric constant', null, true);
             }
             $_levels = $_attr['levels'];
         } else {
@@ -61,17 +64,14 @@ class Smarty_Internal_Compile_Break extends Smarty_Internal_CompileBase {
         $stack_count = count($compiler->_tag_stack) - 1;
         while ($level_count > 0 && $stack_count >= 0) {
             if (isset($_is_loopy[$compiler->_tag_stack[$stack_count][0]])) {
-                $level_count--;
+                $level_count --;
             }
-            $stack_count--;
+            $stack_count --;
         }
         if ($level_count != 0) {
-            $compiler->trigger_template_error("cannot break {$_levels} level(s)", $compiler->lex->taglineno);
+            $compiler->trigger_template_error("cannot break {$_levels} level(s)", null, true);
         }
-        $compiler->has_code = true;
-        return "<?php break {$_levels}?>";
-    }
 
+        return "<?php break {$_levels};?>";
+    }
 }
-
-?>
\ No newline at end of file
diff --git a/include/smarty/libs/sysplugins/smarty_internal_compile_call.php b/include/smarty/libs/sysplugins/smarty_internal_compile_call.php
index af12a048c..b7204bec0 100644
--- a/include/smarty/libs/sysplugins/smarty_internal_compile_call.php
+++ b/include/smarty/libs/sysplugins/smarty_internal_compile_call.php
@@ -1,22 +1,21 @@
 <?php
 /**
  * Smarty Internal Plugin Compile Function_Call
- *
  * Compiles the calls of user defined tags defined by {function}
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage Compiler
- * @author Uwe Tews
+ * @author     Uwe Tews
  */
 
 /**
  * Smarty Internal Plugin Compile Function_Call Class
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage Compiler
  */
-class Smarty_Internal_Compile_Call extends Smarty_Internal_CompileBase {
-
+class Smarty_Internal_Compile_Call extends Smarty_Internal_CompileBase
+{
     /**
      * Attribute definition: Overwrites base class.
      *
@@ -24,6 +23,7 @@ class Smarty_Internal_Compile_Call extends Smarty_Internal_CompileBase {
      * @see Smarty_Internal_CompileBase
      */
     public $required_attributes = array('name');
+
     /**
      * Attribute definition: Overwrites base class.
      *
@@ -31,6 +31,7 @@ class Smarty_Internal_Compile_Call extends Smarty_Internal_CompileBase {
      * @see Smarty_Internal_CompileBase
      */
     public $shorttag_order = array('name');
+
     /**
      * Attribute definition: Overwrites base class.
      *
@@ -42,9 +43,9 @@ class Smarty_Internal_Compile_Call extends Smarty_Internal_CompileBase {
     /**
      * Compiles the calls of user defined tags defined by {function}
      *
-     * @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 $compiler compiler object
+     *
      * @return string compiled code
      */
     public function compile($args, $compiler)
@@ -53,16 +54,14 @@ class Smarty_Internal_Compile_Call extends Smarty_Internal_CompileBase {
         $_attr = $this->getAttributes($compiler, $args);
         // save possible attributes
         if (isset($_attr['assign'])) {
-            // output will be stored in a smarty variable instead of beind displayed
+            // output will be stored in a smarty variable instead of being displayed
             $_assign = $_attr['assign'];
         }
+        //$_name = trim($_attr['name'], "'\"");
         $_name = $_attr['name'];
-        if ($compiler->compiles_template_function) {
-            $compiler->called_functions[] = trim($_name, "'\"");
-        }
         unset($_attr['name'], $_attr['assign'], $_attr['nocache']);
         // set flag (compiled code of {function} must be included in cache file
-        if ($compiler->nocache || $compiler->tag_nocache) {
+        if (!$compiler->template->caching || $compiler->nocache || $compiler->tag_nocache) {
             $_nocache = 'true';
         } else {
             $_nocache = 'false';
@@ -75,56 +74,16 @@ class Smarty_Internal_Compile_Call extends Smarty_Internal_CompileBase {
                 $_paramsArray[] = "'$_key'=>$_value";
             }
         }
-        if (isset($compiler->template->properties['function'][$_name]['parameter'])) {
-            foreach ($compiler->template->properties['function'][$_name]['parameter'] as $_key => $_value) {
-                if (!isset($_attr[$_key])) {
-                    if (is_int($_key)) {
-                        $_paramsArray[] = "$_key=>$_value";
-                    } else {
-                        $_paramsArray[] = "'$_key'=>$_value";
-                    }
-                }
-            }
-        } elseif (isset($compiler->smarty->template_functions[$_name]['parameter'])) {
-            foreach ($compiler->smarty->template_functions[$_name]['parameter'] as $_key => $_value) {
-                if (!isset($_attr[$_key])) {
-                    if (is_int($_key)) {
-                        $_paramsArray[] = "$_key=>$_value";
-                    } else {
-                        $_paramsArray[] = "'$_key'=>$_value";
-                    }
-                }
-            }
-        }
-        //varibale name?
-        if (!(strpos($_name, '$') === false)) {
-            $call_cache = $_name;
-            $call_function = '$tmp = "smarty_template_function_".' . $_name . '; $tmp';
-        } else {
-            $_name = trim($_name, "'\"");
-            $call_cache = "'{$_name}'";
-            $call_function = 'smarty_template_function_' . $_name;
-        }
-
         $_params = 'array(' . implode(",", $_paramsArray) . ')';
-        $_hash = str_replace('-', '_', $compiler->template->properties['nocache_hash']);
+        //$compiler->suppressNocacheProcessing = true;
         // was there an assign attribute
         if (isset($_assign)) {
-            if ($compiler->template->caching) {
-                $_output = "<?php ob_start(); Smarty_Internal_Function_Call_Handler::call ({$call_cache},\$_smarty_tpl,{$_params},'{$_hash}',{$_nocache}); \$_smarty_tpl->assign({$_assign}, ob_get_clean());?>\n";
-            } else {
-                $_output = "<?php ob_start(); {$call_function}(\$_smarty_tpl,{$_params}); \$_smarty_tpl->assign({$_assign}, ob_get_clean());?>\n";
-            }
+            $_output =
+                "<?php ob_start();\n\$_smarty_tpl->smarty->ext->_tplFunction->callTemplateFunction(\$_smarty_tpl, {$_name}, {$_params}, {$_nocache});\n\$_smarty_tpl->assign({$_assign}, ob_get_clean());?>\n";
         } else {
-            if ($compiler->template->caching) {
-                $_output = "<?php Smarty_Internal_Function_Call_Handler::call ({$call_cache},\$_smarty_tpl,{$_params},'{$_hash}',{$_nocache});?>\n";
-            } else {
-                $_output = "<?php {$call_function}(\$_smarty_tpl,{$_params});?>\n";
-            }
+            $_output =
+                "<?php \$_smarty_tpl->smarty->ext->_tplFunction->callTemplateFunction(\$_smarty_tpl, {$_name}, {$_params}, {$_nocache});?>\n";
         }
         return $_output;
     }
-
 }
-
-?>
\ No newline at end of file
diff --git a/include/smarty/libs/sysplugins/smarty_internal_compile_capture.php b/include/smarty/libs/sysplugins/smarty_internal_compile_capture.php
index 9a5071ebe..95c75a4b1 100644
--- a/include/smarty/libs/sysplugins/smarty_internal_compile_capture.php
+++ b/include/smarty/libs/sysplugins/smarty_internal_compile_capture.php
@@ -1,22 +1,21 @@
 <?php
 /**
  * Smarty Internal Plugin Compile Capture
- *
  * Compiles the {capture} tag
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage Compiler
- * @author Uwe Tews
+ * @author     Uwe Tews
  */
 
 /**
  * Smarty Internal Plugin Compile Capture Class
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage Compiler
  */
-class Smarty_Internal_Compile_Capture extends Smarty_Internal_CompileBase {
-
+class Smarty_Internal_Compile_Capture extends Smarty_Internal_CompileBase
+{
     /**
      * Attribute definition: Overwrites base class.
      *
@@ -24,6 +23,7 @@ class Smarty_Internal_Compile_Capture extends Smarty_Internal_CompileBase {
      * @see Smarty_Internal_CompileBase
      */
     public $shorttag_order = array('name');
+
     /**
      * Attribute definition: Overwrites base class.
      *
@@ -35,11 +35,12 @@ class Smarty_Internal_Compile_Capture extends Smarty_Internal_CompileBase {
     /**
      * Compiles code for the {capture} tag
      *
-     * @param array  $args     array with attributes from parser
-     * @param object $compiler compiler object
+     * @param  array                                $args     array with attributes from parser
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object
+     *
      * @return string compiled code
      */
-    public function compile($args, $compiler)
+    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler)
     {
         // check and get attributes
         $_attr = $this->getAttributes($compiler, $args);
@@ -51,29 +52,50 @@ class Smarty_Internal_Compile_Capture extends Smarty_Internal_CompileBase {
         $compiler->_capture_stack[0][] = array($buffer, $assign, $append, $compiler->nocache);
         // maybe nocache because of nocache variables
         $compiler->nocache = $compiler->nocache | $compiler->tag_nocache;
-        $_output = "<?php \$_smarty_tpl->_capture_stack[0][] = array($buffer, $assign, $append); ob_start(); ?>";
+        $_output = "<?php \$_smarty_tpl->_cache['capture_stack'][] = array($buffer, $assign, $append); ob_start(); ?>";
 
         return $_output;
     }
 
+    /**
+     * Compiles code for the {$smarty.capture.xxx}
+     *
+     * @param  array                                $args      array with attributes from parser
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler  compiler object
+     * @param  array                                $parameter array with compilation parameter
+     *
+     * @return string compiled code
+     * @throws \SmartyCompilerException
+     */
+    public static function compileSpecialVariable($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter)
+    {
+        // make all lower case
+        $parameter = array_map('strtolower', $parameter);
+        $tag = trim($parameter[0], '"\'');
+        if (!isset($parameter[1]) || false === $name = $compiler->getId($parameter[1])) {
+            $compiler->trigger_template_error("missing or illegal \$smarty.{$tag} name attribute", null, true);
+        }
+        return "isset(\$_smarty_tpl->_cache['__smarty_capture']['{$name}']) ? \$_smarty_tpl->_cache['__smarty_capture']['{$name}'] : null";
+    }
 }
 
 /**
  * Smarty Internal Plugin Compile Captureclose Class
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage Compiler
  */
-class Smarty_Internal_Compile_CaptureClose extends Smarty_Internal_CompileBase {
-
+class Smarty_Internal_Compile_CaptureClose extends Smarty_Internal_CompileBase
+{
     /**
      * Compiles code for the {/capture} tag
      *
-     * @param array  $args     array with attributes from parser
-     * @param object $compiler compiler object
+     * @param  array                                $args     array with attributes from parser
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object
+     *
      * @return string compiled code
      */
-    public function compile($args, $compiler)
+    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler)
     {
         // check and get attributes
         $_attr = $this->getAttributes($compiler, $args);
@@ -84,15 +106,13 @@ class Smarty_Internal_Compile_CaptureClose extends Smarty_Internal_CompileBase {
 
         list($buffer, $assign, $append, $compiler->nocache) = array_pop($compiler->_capture_stack[0]);
 
-        $_output = "<?php list(\$_capture_buffer, \$_capture_assign, \$_capture_append) = array_pop(\$_smarty_tpl->_capture_stack[0]);\n";
+        $_output = "<?php list(\$_capture_buffer, \$_capture_assign, \$_capture_append) = array_pop(\$_smarty_tpl->_cache['capture_stack']);\n";
         $_output .= "if (!empty(\$_capture_buffer)) {\n";
         $_output .= " if (isset(\$_capture_assign)) \$_smarty_tpl->assign(\$_capture_assign, ob_get_contents());\n";
         $_output .= " if (isset( \$_capture_append)) \$_smarty_tpl->append( \$_capture_append, ob_get_contents());\n";
-        $_output .= " Smarty::\$_smarty_vars['capture'][\$_capture_buffer]=ob_get_clean();\n";
+        $_output .= "\$_smarty_tpl->_cache['__smarty_capture'][\$_capture_buffer]=ob_get_clean();\n";
         $_output .= "} else \$_smarty_tpl->capture_error();?>";
+
         return $_output;
     }
-
 }
-
-?>
\ No newline at end of file
diff --git a/include/smarty/libs/sysplugins/smarty_internal_compile_config_load.php b/include/smarty/libs/sysplugins/smarty_internal_compile_config_load.php
index deaa052c5..d2e50a08f 100644
--- a/include/smarty/libs/sysplugins/smarty_internal_compile_config_load.php
+++ b/include/smarty/libs/sysplugins/smarty_internal_compile_config_load.php
@@ -1,22 +1,21 @@
 <?php
 /**
  * Smarty Internal Plugin Compile Config Load
- *
  * Compiles the {config load} tag
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage Compiler
- * @author Uwe Tews
+ * @author     Uwe Tews
  */
 
 /**
  * Smarty Internal Plugin Compile Config Load Class
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage Compiler
  */
-class Smarty_Internal_Compile_Config_Load extends Smarty_Internal_CompileBase {
-
+class Smarty_Internal_Compile_Config_Load extends Smarty_Internal_CompileBase
+{
     /**
      * Attribute definition: Overwrites base class.
      *
@@ -24,62 +23,82 @@ class Smarty_Internal_Compile_Config_Load extends Smarty_Internal_CompileBase {
      * @see Smarty_Internal_CompileBase
      */
     public $required_attributes = array('file');
+
     /**
      * Attribute definition: Overwrites base class.
      *
      * @var array
      * @see Smarty_Internal_CompileBase
      */
-    public $shorttag_order = array('file','section');
+    public $shorttag_order = array('file', 'section');
+
     /**
      * Attribute definition: Overwrites base class.
      *
      * @var array
      * @see Smarty_Internal_CompileBase
      */
-    public $optional_attributes = array('section', 'scope');
+    public $optional_attributes = array('section', 'scope', 'bubble_up');
+
+    /**
+     * Valid scope names
+     * 
+     * @var array
+     */
+    public $valid_scopes = array('local'  => true, 'parent' => true, 'root' => true, 'global' => true,
+                                 'smarty' => true, 'tpl_root' => true);
 
     /**
      * Compiles code for the {config_load} tag
      *
-     * @param array  $args     array with attributes from parser
-     * @param object $compiler compiler object
+     * @param  array                                $args     array with attributes from parser
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object
+     *
      * @return string compiled code
+     * @throws \SmartyCompilerException
      */
-    public function compile($args, $compiler)
+    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler)
     {
-        static $_is_legal_scope = array('local' => true,'parent' => true,'root' => true,'global' => true);
         // check and get attributes
         $_attr = $this->getAttributes($compiler, $args);
 
         if ($_attr['nocache'] === true) {
-            $compiler->trigger_template_error('nocache option not allowed', $compiler->lex->taglineno);
+            $compiler->trigger_template_error('nocache option not allowed', null, true);
         }
 
-
-        // save posible attributes
+        // save possible attributes
         $conf_file = $_attr['file'];
         if (isset($_attr['section'])) {
             $section = $_attr['section'];
         } else {
             $section = 'null';
         }
-        $scope = 'local';
-        // scope setup
+        $_scope = Smarty::SCOPE_LOCAL;
         if (isset($_attr['scope'])) {
             $_attr['scope'] = trim($_attr['scope'], "'\"");
-            if (isset($_is_legal_scope[$_attr['scope']])) {
-                $scope = $_attr['scope'];
-           } else {
-                $compiler->trigger_template_error('illegal value for "scope" attribute', $compiler->lex->taglineno);
-           }
+            if (!isset($this->valid_scopes[$_attr['scope']])) {
+                $compiler->trigger_template_error("illegal value '{$_attr['scope']}' for \"scope\" attribute", null, true);
+            }
+            if ($_attr['scope'] != 'local') {
+                if ($_attr['scope'] == 'parent') {
+                    $_scope = Smarty::SCOPE_PARENT;
+                } elseif ($_attr['scope'] == 'root') {
+                    $_scope = Smarty::SCOPE_ROOT;
+                } elseif ($_attr['scope'] == 'global') {
+                    $_scope = Smarty::SCOPE_GLOBAL;
+                } elseif ($_attr['scope'] == 'smarty') {
+                    $_scope = Smarty::SCOPE_SMARTY;
+                } elseif ($_attr['scope'] == 'tpl_root') {
+                    $_scope = Smarty::SCOPE_TPL_ROOT;
+                }
+                $_scope += (isset($_attr['bubble_up']) && $_attr['bubble_up'] == 'false') ? 0 : Smarty::SCOPE_BUBBLE_UP;
+            }
         }
+
         // create config object
-        $_output = "<?php  \$_config = new Smarty_Internal_Config($conf_file, \$_smarty_tpl->smarty, \$_smarty_tpl);";
-        $_output .= "\$_config->loadConfigVars($section, '$scope'); ?>";
+        $_output =
+            "<?php\n\$_smarty_tpl->smarty->ext->configLoad->_loadConfigFile(\$_smarty_tpl, {$conf_file}, {$section}, {$_scope});\n?>\n";
+
         return $_output;
     }
-
 }
-
-?>
\ No newline at end of file
diff --git a/include/smarty/libs/sysplugins/smarty_internal_compile_continue.php b/include/smarty/libs/sysplugins/smarty_internal_compile_continue.php
index 72a5f8653..2ee04c94e 100644
--- a/include/smarty/libs/sysplugins/smarty_internal_compile_continue.php
+++ b/include/smarty/libs/sysplugins/smarty_internal_compile_continue.php
@@ -1,22 +1,21 @@
 <?php
 /**
  * Smarty Internal Plugin Compile Continue
- *
  * Compiles the {continue} tag
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage Compiler
- * @author Uwe Tews
+ * @author     Uwe Tews
  */
 
 /**
  * Smarty Internal Plugin Compile Continue Class
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage Compiler
  */
-class Smarty_Internal_Compile_Continue extends Smarty_Internal_CompileBase {
-
+class Smarty_Internal_Compile_Continue extends Smarty_Internal_CompileBase
+{
     /**
      * Attribute definition: Overwrites base class.
      *
@@ -24,6 +23,7 @@ class Smarty_Internal_Compile_Continue extends Smarty_Internal_CompileBase {
      * @see Smarty_Internal_CompileBase
      */
     public $optional_attributes = array('levels');
+
     /**
      * Attribute definition: Overwrites base class.
      *
@@ -35,24 +35,26 @@ class Smarty_Internal_Compile_Continue extends Smarty_Internal_CompileBase {
     /**
      * Compiles code for the {continue} 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 \Smarty_Internal_TemplateCompilerBase $compiler  compiler object
+     * @param  array                                $parameter array with compilation parameter
+     *
      * @return string compiled code
+     * @throws \SmartyCompilerException
      */
-    public function compile($args, $compiler, $parameter)
+    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter)
     {
         static $_is_loopy = array('for' => true, 'foreach' => true, 'while' => true, 'section' => true);
         // check and get attributes
         $_attr = $this->getAttributes($compiler, $args);
 
         if ($_attr['nocache'] === true) {
-            $compiler->trigger_template_error('nocache option not allowed', $compiler->lex->taglineno);
+            $compiler->trigger_template_error('nocache option not allowed', null, true);
         }
 
         if (isset($_attr['levels'])) {
             if (!is_numeric($_attr['levels'])) {
-                $compiler->trigger_template_error('level attribute must be a numeric constant', $compiler->lex->taglineno);
+                $compiler->trigger_template_error('level attribute must be a numeric constant', null, true);
             }
             $_levels = $_attr['levels'];
         } else {
@@ -62,17 +64,14 @@ class Smarty_Internal_Compile_Continue extends Smarty_Internal_CompileBase {
         $stack_count = count($compiler->_tag_stack) - 1;
         while ($level_count > 0 && $stack_count >= 0) {
             if (isset($_is_loopy[$compiler->_tag_stack[$stack_count][0]])) {
-                $level_count--;
+                $level_count --;
             }
-            $stack_count--;
+            $stack_count --;
         }
         if ($level_count != 0) {
-            $compiler->trigger_template_error("cannot continue {$_levels} level(s)", $compiler->lex->taglineno);
+            $compiler->trigger_template_error("cannot continue {$_levels} level(s)", null, true);
         }
-        $compiler->has_code = true;
-        return "<?php continue {$_levels}?>";
-    }
 
+        return "<?php continue {$_levels};?>";
+    }
 }
-
-?>
\ No newline at end of file
diff --git a/include/smarty/libs/sysplugins/smarty_internal_compile_debug.php b/include/smarty/libs/sysplugins/smarty_internal_compile_debug.php
index f50c7aee2..d73c81a10 100644
--- a/include/smarty/libs/sysplugins/smarty_internal_compile_debug.php
+++ b/include/smarty/libs/sysplugins/smarty_internal_compile_debug.php
@@ -1,28 +1,28 @@
 <?php
 /**
  * Smarty Internal Plugin Compile Debug
- *
  * Compiles the {debug} tag.
  * It opens a window the the Smarty Debugging Console.
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage Compiler
- * @author Uwe Tews
+ * @author     Uwe Tews
  */
 
 /**
  * Smarty Internal Plugin Compile Debug Class
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage Compiler
  */
-class Smarty_Internal_Compile_Debug extends Smarty_Internal_CompileBase {
-
+class Smarty_Internal_Compile_Debug extends Smarty_Internal_CompileBase
+{
     /**
      * Compiles code for the {debug} tag
      *
-     * @param array  $args     array with attributes from parser
-     * @param object $compiler compiler object
+     * @param  array  $args     array with attributes from parser
+     * @param  object $compiler compiler object
+     *
      * @return string compiled code
      */
     public function compile($args, $compiler)
@@ -34,10 +34,8 @@ class Smarty_Internal_Compile_Debug extends Smarty_Internal_CompileBase {
         $compiler->tag_nocache = true;
 
         // display debug template
-        $_output = "<?php \$_smarty_tpl->smarty->loadPlugin('Smarty_Internal_Debug'); Smarty_Internal_Debug::display_debug(\$_smarty_tpl); ?>";
+        $_output = "<?php \$_smarty_debug = new Smarty_Internal_Debug;\n \$_smarty_debug->display_debug(\$_smarty_tpl);\n";
+        $_output .= "unset(\$_smarty_debug);\n?>";
         return $_output;
     }
-
 }
-
-?>
\ No newline at end of file
diff --git a/include/smarty/libs/sysplugins/smarty_internal_compile_eval.php b/include/smarty/libs/sysplugins/smarty_internal_compile_eval.php
index 6cf481b50..407482f07 100644
--- a/include/smarty/libs/sysplugins/smarty_internal_compile_eval.php
+++ b/include/smarty/libs/sysplugins/smarty_internal_compile_eval.php
@@ -1,22 +1,21 @@
 <?php
 /**
  * Smarty Internal Plugin Compile Eval
- *
  * Compiles the {eval} tag.
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage Compiler
- * @author Uwe Tews
+ * @author     Uwe Tews
  */
 
 /**
  * Smarty Internal Plugin Compile Eval Class
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage Compiler
  */
-class Smarty_Internal_Compile_Eval extends Smarty_Internal_CompileBase {
-
+class Smarty_Internal_Compile_Eval extends Smarty_Internal_CompileBase
+{
     /**
      * Attribute definition: Overwrites base class.
      *
@@ -37,13 +36,14 @@ class Smarty_Internal_Compile_Eval extends Smarty_Internal_CompileBase {
      * @var array
      * @see Smarty_Internal_CompileBase
      */
-    public $shorttag_order = array('var','assign');
+    public $shorttag_order = array('var', 'assign');
 
     /**
      * Compiles code for the {eval} tag
      *
-     * @param array  $args     array with attributes from parser
-     * @param object $compiler compiler object
+     * @param  array  $args     array with attributes from parser
+     * @param  object $compiler compiler object
+     *
      * @return string compiled code
      */
     public function compile($args, $compiler)
@@ -53,21 +53,19 @@ class Smarty_Internal_Compile_Eval extends Smarty_Internal_CompileBase {
         // check and get attributes
         $_attr = $this->getAttributes($compiler, $args);
         if (isset($_attr['assign'])) {
-              // output will be stored in a smarty variable instead of beind displayed
+            // output will be stored in a smarty variable instead of being displayed
             $_assign = $_attr['assign'];
         }
 
         // create template object
-        $_output = "\$_template = new {$compiler->smarty->template_class}('eval:'.".$_attr['var'].", \$_smarty_tpl->smarty, \$_smarty_tpl);";
+        $_output = "\$_template = new {$compiler->smarty->template_class}('eval:'." . $_attr['var'] . ", \$_smarty_tpl->smarty, \$_smarty_tpl);";
         //was there an assign attribute?
         if (isset($_assign)) {
             $_output .= "\$_smarty_tpl->assign($_assign,\$_template->fetch());";
         } else {
             $_output .= "echo \$_template->fetch();";
         }
+
         return "<?php $_output ?>";
     }
-
 }
-
-?>
\ No newline at end of file
diff --git a/include/smarty/libs/sysplugins/smarty_internal_compile_extends.php b/include/smarty/libs/sysplugins/smarty_internal_compile_extends.php
index fe14a4081..7ce3dcf6f 100644
--- a/include/smarty/libs/sysplugins/smarty_internal_compile_extends.php
+++ b/include/smarty/libs/sysplugins/smarty_internal_compile_extends.php
@@ -1,133 +1,134 @@
 <?php
 
 /**
-* Smarty Internal Plugin Compile extend
-*
-* Compiles the {extends} tag
-*
-* @package Smarty
-* @subpackage Compiler
-* @author Uwe Tews
-*/
+ * Smarty Internal Plugin Compile extend
+ * Compiles the {extends} tag
+ *
+ * @package    Smarty
+ * @subpackage Compiler
+ * @author     Uwe Tews
+ */
 
 /**
-* Smarty Internal Plugin Compile extend Class
-*
-* @package Smarty
-* @subpackage Compiler
-*/
-class Smarty_Internal_Compile_Extends extends Smarty_Internal_CompileBase {
-
+ * Smarty Internal Plugin Compile extend Class
+ *
+ * @package    Smarty
+ * @subpackage Compiler
+ */
+class Smarty_Internal_Compile_Extends extends Smarty_Internal_Compile_Shared_Inheritance
+{
     /**
-    * Attribute definition: Overwrites base class.
-    *
-    * @var array
-    * @see Smarty_Internal_CompileBase
-    */
+     * Attribute definition: Overwrites base class.
+     *
+     * @var array
+     * @see Smarty_Internal_CompileBase
+     */
     public $required_attributes = array('file');
+
     /**
-    * Attribute definition: Overwrites base class.
-    *
-    * @var array
-    * @see Smarty_Internal_CompileBase
-    */
-    public $shorttag_order = array('file');
+     * Array of names of optional attribute required by tag
+     * use array('_any') if there is no restriction of attributes names
+     *
+     * @var array
+     */
+    public $optional_attributes = array('extends_resource');
+
     /**
-    * mbstring.overload flag
-    *
-    * @var int
-    */
-    public $mbstring_overload = 0;
+     * Attribute definition: Overwrites base class.
+     *
+     * @var array
+     * @see Smarty_Internal_CompileBase
+     */
+    public $shorttag_order = array('file');
 
     /**
-    * Compiles code for the {extends} tag
-    *
-    * @param array  $args     array with attributes from parser
-    * @param object $compiler compiler object
-    * @return string compiled code
-    */
-    public function compile($args, $compiler)
+     * Compiles code for the {extends} tag extends: resource
+     *
+     * @param array                                 $args     array with attributes from parser
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object
+     *
+     * @return string compiled code
+     * @throws \SmartyCompilerException
+     * @throws \SmartyException
+     */
+    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler)
     {
-        static $_is_stringy = array('string' => true, 'eval' => true);
-        $this->_rdl = preg_quote($compiler->smarty->right_delimiter);
-        $this->_ldl = preg_quote($compiler->smarty->left_delimiter);
-        if (!$compiler->smarty->auto_literal) {
-            $al = '\s*';
-        } else {
-            $al = '';
-        }
-        $filepath = $compiler->template->source->filepath;
-        $this->mbstring_overload = ini_get('mbstring.func_overload') & 2;
         // check and get attributes
         $_attr = $this->getAttributes($compiler, $args);
         if ($_attr['nocache'] === true) {
-            $compiler->trigger_template_error('nocache option not allowed', $compiler->lex->taglineno);
+            $compiler->trigger_template_error('nocache option not allowed', $compiler->parser->lex->line - 1);
         }
-
-        $_smarty_tpl = $compiler->template;
-        $include_file = null;
         if (strpos($_attr['file'], '$_tmp') !== false) {
-            $compiler->trigger_template_error('illegal value for file attribute', $compiler->lex->taglineno);
+            $compiler->trigger_template_error('illegal value for file attribute', $compiler->parser->lex->line - 1);
         }
-        eval('$include_file = ' . $_attr['file'] . ';');
-        // create template object
-        $_template = new $compiler->smarty->template_class($include_file, $compiler->smarty, $compiler->template);
-        // save file dependency
-        if (isset($_is_stringy[$_template->source->type])) {
-            $template_sha1 = sha1($include_file);
-        } else {
-            $template_sha1 = sha1($_template->source->filepath);
-        }
-        if (isset($compiler->template->properties['file_dependency'][$template_sha1])) {
-            $compiler->trigger_template_error("illegal recursive call of \"{$include_file}\"", $compiler->lex->line - 1);
-        }
-        $compiler->template->properties['file_dependency'][$template_sha1] = array($_template->source->filepath, $_template->source->timestamp, $_template->source->type);
-        $_content = ($this->mbstring_overload ? mb_substr($compiler->lex->data, $compiler->lex->counter - 1, 20000000, 'latin1') : substr($compiler->lex->data, $compiler->lex->counter - 1));
-        if (preg_match_all("!({$this->_ldl}{$al}block\s(.+?)\s*{$this->_rdl})!", $_content, $s) !=
-        preg_match_all("!({$this->_ldl}{$al}/block\s*{$this->_rdl})!", $_content, $c)) {
-            $compiler->trigger_template_error('unmatched {block} {/block} pairs');
-        }
-        preg_match_all("!{$this->_ldl}{$al}block\s(.+?)\s*{$this->_rdl}|{$this->_ldl}{$al}/block\s*{$this->_rdl}|{$this->_ldl}\*([\S\s]*?)\*{$this->_rdl}!", $_content, $_result, PREG_OFFSET_CAPTURE);
-        $_result_count = count($_result[0]);
-        $_start = 0;
-        while ($_start+1 < $_result_count) {
-            $_end = 0;
-            $_level = 1;
-            if (($this->mbstring_overload ? mb_substr($_result[0][$_start][0],0,mb_strlen($compiler->smarty->left_delimiter,'latin1')+1, 'latin1') : substr($_result[0][$_start][0],0,strlen($compiler->smarty->left_delimiter)+1)) == $compiler->smarty->left_delimiter.'*') {
-                $_start++;
-                continue;
-            }
-            while ($_level != 0) {
-                $_end++;
-                if (($this->mbstring_overload ? mb_substr($_result[0][$_start + $_end][0],0,mb_strlen($compiler->smarty->left_delimiter,'latin1')+1, 'latin1') : substr($_result[0][$_start + $_end][0],0,strlen($compiler->smarty->left_delimiter)+1)) == $compiler->smarty->left_delimiter.'*') {
-                    continue;
-                }
-                if (!strpos($_result[0][$_start + $_end][0], '/')) {
-                    $_level++;
+        // add code to initialize inheritance
+        $this->registerInit($compiler, true);
+        $file = trim($_attr['file'], '\'"');
+        if (strlen($file) > 8 && substr($file, 0, 8) == 'extends:') {
+            // generate code for each template
+            $files = array_reverse(explode('|', substr($file, 8)));
+            $i = 0;
+            foreach ($files as $file) {
+                if ($file[0] == '"') {
+                    $file = trim($file, '".');
                 } else {
-                    $_level--;
+                    $file = "'{$file}'";
                 }
+                $i ++;
+                if ($i == count($files) && isset($_attr['extends_resource'])) {
+                    $this->compileEndChild($compiler);
+                }
+                $this->compileInclude($compiler, $file);
             }
-            $_block_content = str_replace($compiler->smarty->left_delimiter . '$smarty.block.parent' . $compiler->smarty->right_delimiter, '%%%%SMARTY_PARENT%%%%',
-            ($this->mbstring_overload ? mb_substr($_content, $_result[0][$_start][1] + mb_strlen($_result[0][$_start][0], 'latin1'), $_result[0][$_start + $_end][1] - $_result[0][$_start][1] - + mb_strlen($_result[0][$_start][0], 'latin1'), 'latin1') : substr($_content, $_result[0][$_start][1] + strlen($_result[0][$_start][0]), $_result[0][$_start + $_end][1] - $_result[0][$_start][1] - + strlen($_result[0][$_start][0]))));
-            Smarty_Internal_Compile_Block::saveBlockData($_block_content, $_result[0][$_start][0], $compiler->template, $filepath);
-            $_start = $_start + $_end + 1;
-        }
-        if ($_template->source->type == 'extends') {
-            $_template->block_data = $compiler->template->block_data;
-        }
-        $compiler->template->source->content = $_template->source->content;
-        if ($_template->source->type == 'extends') {
-            $compiler->template->block_data = $_template->block_data;
-            foreach ($_template->source->components as $key => $component) {
-                $compiler->template->properties['file_dependency'][$key] = array($component->filepath, $component->timestamp, $component->type);
+            if (!isset($_attr['extends_resource'])) {
+                $this->compileEndChild($compiler);
             }
+        } else {
+            $this->compileEndChild($compiler);
+            $this->compileInclude($compiler, $_attr['file']);
         }
-        $compiler->template->source->filepath = $_template->source->filepath;
-        $compiler->abort_and_recompile = true;
+        $compiler->has_code = false;
         return '';
     }
 
-}
+    /**
+     * Add code for inheritance endChild() method to end of template
+     *
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler
+     */
+    private function compileEndChild(Smarty_Internal_TemplateCompilerBase $compiler)
+    {
+        $compiler->parser->template_postfix[] = new Smarty_Internal_ParseTree_Tag($compiler->parser,
+                                                                                  "<?php \$_smarty_tpl->ext->_inheritance->endChild(\$_smarty_tpl);\n?>\n");
+    }
 
-?>
\ No newline at end of file
+    /**
+     * Add code for including subtemplate to end of template
+     *
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler
+     * @param  string                               $file subtemplate name
+     */
+    private function compileInclude(Smarty_Internal_TemplateCompilerBase $compiler, $file)
+    {
+        $compiler->parser->template_postfix[] = new Smarty_Internal_ParseTree_Tag($compiler->parser,
+                                                                                  $compiler->compileTag('include',
+                                                                                                        array($file,
+                                                                                                              array('scope' => 'parent'))));
+    }
+
+    /**
+     * Create source code for {extends} from source components array
+     *
+     * @param []\Smarty_Internal_Template_Source $components
+     *
+     * @return string
+     */
+    public static function extendsSourceArrayCode($components)
+    {
+        $resources = array();
+        foreach ($components as $source) {
+            $resources[] = $source->resource;
+        }
+        return '{extends file=\'extends:' . join('|', $resources) . '\' extends_resource=true}';
+    }
+}
diff --git a/include/smarty/libs/sysplugins/smarty_internal_compile_for.php b/include/smarty/libs/sysplugins/smarty_internal_compile_for.php
index 057f4fb79..7b86d4859 100644
--- a/include/smarty/libs/sysplugins/smarty_internal_compile_for.php
+++ b/include/smarty/libs/sysplugins/smarty_internal_compile_for.php
@@ -1,43 +1,40 @@
 <?php
 /**
  * Smarty Internal Plugin Compile For
- *
  * Compiles the {for} {forelse} {/for} tags
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage Compiler
- * @author Uwe Tews
+ * @author     Uwe Tews
  */
 
 /**
  * Smarty Internal Plugin Compile For Class
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage Compiler
  */
-class Smarty_Internal_Compile_For extends Smarty_Internal_CompileBase {
-
+class Smarty_Internal_Compile_For extends Smarty_Internal_CompileBase
+{
     /**
      * Compiles code for the {for} tag
-     *
-     * Smarty 3 does implement two different sytaxes:
-     *
+     * Smarty 3 does implement two different syntax's:
      * - {for $var in $array}
      * For looping over arrays or iterators
-     *
      * - {for $x=0; $x<$y; $x++}
      * For general loops
+     * The parser is generating different sets of attribute by which this compiler can
+     * determine which syntax is used.
      *
-     * The parser is gereration different sets of attribute by which this compiler can
-     * determin which syntax is used.
+     * @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 $compiler  compiler object
-     * @param array  $parameter array with compilation parameter
      * @return string compiled code
      */
     public function compile($args, $compiler, $parameter)
     {
+        $compiler->loopNesting++;
         if ($parameter == 0) {
             $this->required_attributes = array('start', 'to');
             $this->optional_attributes = array('max', 'step');
@@ -48,30 +45,51 @@ class Smarty_Internal_Compile_For extends Smarty_Internal_CompileBase {
         // check and get attributes
         $_attr = $this->getAttributes($compiler, $args);
 
-        $output = "<?php ";
+        $output = "<?php\n";
         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;\n";
+                $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]) {\nfor (\$_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 (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;";
             if (isset($_attr['step'])) {
-                $output .= "\$_smarty_tpl->tpl_vars[$_statement[var]]->step = $_attr[step];";
+                $output .= "\$_smarty_tpl->tpl_vars[$var]->step = $_attr[step];";
             } else {
-                $output .= "\$_smarty_tpl->tpl_vars[$_statement[var]]->step = 1;";
+                $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 .= "?>";
 
@@ -81,55 +99,57 @@ class Smarty_Internal_Compile_For extends Smarty_Internal_CompileBase {
         // return compiled code
         return $output;
     }
-
 }
 
 /**
  * Smarty Internal Plugin Compile Forelse Class
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage Compiler
  */
-class Smarty_Internal_Compile_Forelse extends Smarty_Internal_CompileBase {
-
+class Smarty_Internal_Compile_Forelse extends Smarty_Internal_CompileBase
+{
     /**
      * Compiles code for the {forelse} 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 $compiler  compiler object
+     * @param  array  $parameter array with compilation parameter
+     *
      * @return string compiled code
      */
     public function compile($args, $compiler, $parameter)
     {
         // check and get attributes
-        $_attr  = $this->getAttributes($compiler, $args);
+        $_attr = $this->getAttributes($compiler, $args);
 
         list($openTag, $nocache) = $this->closeTag($compiler, array('for'));
         $this->openTag($compiler, 'forelse', array('forelse', $nocache));
+
         return "<?php }} else { ?>";
     }
-
 }
 
 /**
  * Smarty Internal Plugin Compile Forclose Class
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage Compiler
  */
-class Smarty_Internal_Compile_Forclose extends Smarty_Internal_CompileBase {
-
+class Smarty_Internal_Compile_Forclose extends Smarty_Internal_CompileBase
+{
     /**
      * Compiles code for the {/for} 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 $compiler  compiler object
+     * @param  array  $parameter array with compilation parameter
+     *
      * @return string compiled code
      */
     public function compile($args, $compiler, $parameter)
     {
+        $compiler->loopNesting--;
         // check and get attributes
         $_attr = $this->getAttributes($compiler, $args);
         // must endblock be nocache?
@@ -139,13 +159,11 @@ class Smarty_Internal_Compile_Forclose extends Smarty_Internal_CompileBase {
 
         list($openTag, $compiler->nocache) = $this->closeTag($compiler, array('for', 'forelse'));
 
-        if ($openTag == 'forelse') {
-            return "<?php }  ?>";
-        } else {
-            return "<?php }} ?>";
-        }
+        $output = "<?php }\n";
+        if ($openTag != 'forelse') {
+            $output .= "}\n";
+         }
+        $output .= "?>\n";
+        return $output;
     }
-
 }
-
-?>
\ No newline at end of file
diff --git a/include/smarty/libs/sysplugins/smarty_internal_compile_foreach.php b/include/smarty/libs/sysplugins/smarty_internal_compile_foreach.php
index 1354c89d5..876ed026a 100644
--- a/include/smarty/libs/sysplugins/smarty_internal_compile_foreach.php
+++ b/include/smarty/libs/sysplugins/smarty_internal_compile_foreach.php
@@ -1,21 +1,21 @@
 <?php
 /**
  * Smarty Internal Plugin Compile Foreach
- *
  * Compiles the {foreach} {foreachelse} {/foreach} tags
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage Compiler
- * @author Uwe Tews
+ * @author     Uwe Tews
  */
 
 /**
  * Smarty Internal Plugin Compile Foreach Class
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage Compiler
  */
-class Smarty_Internal_Compile_Foreach extends Smarty_Internal_CompileBase {
+class Smarty_Internal_Compile_Foreach extends Smarty_Internal_Compile_Private_ForeachSection
+{
     /**
      * Attribute definition: Overwrites base class.
      *
@@ -23,6 +23,7 @@ class Smarty_Internal_Compile_Foreach extends Smarty_Internal_CompileBase {
      * @see Smarty_Internal_CompileBase
      */
     public $required_attributes = array('from', 'item');
+
     /**
      * Attribute definition: Overwrites base class.
      *
@@ -30,137 +31,238 @@ class Smarty_Internal_Compile_Foreach extends Smarty_Internal_CompileBase {
      * @see Smarty_Internal_CompileBase
      */
     public $optional_attributes = array('name', 'key');
+
     /**
      * Attribute definition: Overwrites base class.
      *
      * @var array
      * @see Smarty_Internal_CompileBase
      */
-    public $shorttag_order = array('from','item','key','name');
+    public $shorttag_order = array('from', 'item', 'key', 'name');
+
+    /**
+     * counter
+     *
+     * @var int
+     */
+    public $counter = 0;
+
+    /**
+     * Name of this tag
+     *
+     * @var string
+     */
+    public $tagName = 'foreach';
+
+    /**
+     * Valid properties of $smarty.foreach.name.xxx variable
+     *
+     * @var array
+     */
+    public static $nameProperties = array('first', 'last', 'index', 'iteration', 'show', 'total');
+
+    /**
+     * Valid properties of $item@xxx variable
+     *
+     * @var array
+     */
+    public $itemProperties = array('first', 'last', 'index', 'iteration', 'show', 'total', 'key');
+
+    /**
+     * Flag if tag had name attribute
+     *
+     * @var bool
+     */
+    public $isNamed = false;
 
     /**
      * Compiles code for the {foreach} 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 \Smarty_Internal_TemplateCompilerBase $compiler  compiler object
+     * @param  array                                $parameter array with compilation parameter
+     *
      * @return string compiled code
+     * @throws \SmartyCompilerException
      */
-    public function compile($args, $compiler, $parameter)
+    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter)
     {
-        $tpl = $compiler->template;
+        $compiler->loopNesting ++;
+        // init
+        $this->isNamed = false;
         // check and get attributes
         $_attr = $this->getAttributes($compiler, $args);
-
         $from = $_attr['from'];
-        $item = $_attr['item'];
-        if (!strncmp("\$_smarty_tpl->tpl_vars[$item]", $from, strlen($item) + 24)) {
-            $compiler->trigger_template_error("item variable {$item} may not be the same variable as at 'from'", $compiler->lex->taglineno);
+        $item = $compiler->getId($_attr['item']);
+        if ($item === false) {
+            $item = $compiler->getVariableName($_attr['item']);
         }
-
+        $attributes = array('item' => $item);
         if (isset($_attr['key'])) {
-            $key = $_attr['key'];
-        } else {
-            $key = null;
+            $key = $compiler->getId($_attr['key']);
+            if ($key === false) {
+                $key = $compiler->getVariableName($_attr['key']);
+            }
+            $attributes['key'] = $key;
+        }
+        if (isset($_attr['name'])) {
+            $this->isNamed = true;
+            $attributes['name'] = $compiler->getId($_attr['name']);
+        }
+        foreach ($attributes as $a => $v) {
+            if ($v === false) {
+                $compiler->trigger_template_error("'{$a}' attribute/variable has illegal value", null, true);
+            }
+        }
+        $fromName = $compiler->getVariableName($_attr['from']);
+        if ($fromName) {
+            foreach (array('item', 'key') as $a) {
+                if (isset($attributes[$a]) && $attributes[$a] == $fromName) {
+                    $compiler->trigger_template_error("'{$a}' and 'from' may not have same variable name '{$fromName}'",
+                                                      null, true);
+                }
+            }
         }
 
-        $this->openTag($compiler, 'foreach', array('foreach', $compiler->nocache, $item, $key));
+        $itemVar = "\$_smarty_tpl->tpl_vars['{$item}']";
+        $local = '$__foreach_' . (isset($attributes['name']) ? $attributes['name'] : $attributes['item']) . '_' .
+            $this->counter ++ . '_';
+        $needIteration = false;
+        // search for used tag attributes
+        $itemAttr = array();
+        $namedAttr = array();
+        $this->scanForProperties($attributes, $compiler);
+        if (!empty($this->matchResults['item'])) {
+            $itemAttr = $this->matchResults['item'];
+        }
+        if (!empty($this->matchResults['named'])) {
+            $namedAttr = $this->matchResults['named'];
+        }
+        if (isset($itemAttr['last'])) {
+            $needIteration = true;
+        }
+        if (isset($namedAttr['last'])) {
+            $needIteration = true;
+        }
+
+        $keyTerm = '';
+        if (isset($itemAttr['key'])) {
+            $keyTerm = "{$itemVar}->key => ";
+        } elseif (isset($attributes['key'])) {
+            $keyTerm = "\$_smarty_tpl->tpl_vars['{$key}']->value => ";
+        }
+
+        $saveVars = array();
+        $restoreVars = array();
+        if ($this->isNamed) {
+            $foreachVar = "\$_smarty_tpl->tpl_vars['__smarty_foreach_{$attributes['name']}']";
+            if (!empty($namedAttr)) {
+                $saveVars['saved'] = "isset({$foreachVar}) ? {$foreachVar} : false;";
+                $restoreVars[] = "if ({$local}saved) {\n{$foreachVar} = {$local}saved;\n}\n";
+            }
+        }
+        foreach (array('item', 'key') as $a) {
+            if (isset($attributes[$a])) {
+                $saveVars['saved_' . $a] =
+                    "isset(\$_smarty_tpl->tpl_vars['{$attributes[$a]}']) ? \$_smarty_tpl->tpl_vars['{$attributes[$a]}'] : false;";
+                $restoreVars[] =
+                    "if ({$local}saved_{$a}) {\n\$_smarty_tpl->tpl_vars['{$attributes[$a]}'] = {$local}saved_{$a};\n}\n";
+            }
+        }
+        $this->openTag($compiler, 'foreach',
+                       array('foreach', $compiler->nocache, $local, $restoreVars, $itemVar, true));
         // maybe nocache because of nocache variables
         $compiler->nocache = $compiler->nocache | $compiler->tag_nocache;
 
-        if (isset($_attr['name'])) {
-            $name = $_attr['name'];
-            $has_name = true;
-            $SmartyVarName = '$smarty.foreach.' . trim($name, '\'"') . '.';
-        } else {
-            $name = null;
-            $has_name = false;
-        }
-        $ItemVarName = '$' . trim($item, '\'"') . '@';
-        // evaluates which Smarty variables and properties have to be computed
-        if ($has_name) {
-            $usesSmartyFirst = strpos($tpl->source->content, $SmartyVarName . 'first') !== false;
-            $usesSmartyLast = strpos($tpl->source->content, $SmartyVarName . 'last') !== false;
-            $usesSmartyIndex = strpos($tpl->source->content, $SmartyVarName . 'index') !== false;
-            $usesSmartyIteration = strpos($tpl->source->content, $SmartyVarName . 'iteration') !== false;
-            $usesSmartyShow = strpos($tpl->source->content, $SmartyVarName . 'show') !== false;
-            $usesSmartyTotal = strpos($tpl->source->content, $SmartyVarName . 'total') !== false;
-        } else {
-            $usesSmartyFirst = false;
-            $usesSmartyLast = false;
-            $usesSmartyTotal = false;
-            $usesSmartyShow = false;
-        }
-
-        $usesPropFirst = $usesSmartyFirst || strpos($tpl->source->content, $ItemVarName . 'first') !== false;
-        $usesPropLast = $usesSmartyLast || strpos($tpl->source->content, $ItemVarName . 'last') !== false;
-        $usesPropIndex = $usesPropFirst || strpos($tpl->source->content, $ItemVarName . 'index') !== false;
-        $usesPropIteration = $usesPropLast || strpos($tpl->source->content, $ItemVarName . 'iteration') !== false;
-        $usesPropShow = strpos($tpl->source->content, $ItemVarName . 'show') !== false;
-        $usesPropTotal = $usesSmartyTotal || $usesSmartyShow || $usesPropShow || $usesPropLast || strpos($tpl->source->content, $ItemVarName . 'total') !== false;
         // generate output code
-        $output = "<?php ";
-        $output .= " \$_smarty_tpl->tpl_vars[$item] = new Smarty_Variable; \$_smarty_tpl->tpl_vars[$item]->_loop = false;\n";
-        if ($key != null) {
-            $output .= " \$_smarty_tpl->tpl_vars[$key] = new Smarty_Variable;\n";
-        }
-        $output .= " \$_from = $from; if (!is_array(\$_from) && !is_object(\$_from)) { settype(\$_from, 'array');}\n";
-        if ($usesPropTotal) {
-            $output .= " \$_smarty_tpl->tpl_vars[$item]->total= \$_smarty_tpl->_count(\$_from);\n";
-        }
-        if ($usesPropIteration) {
-            $output .= " \$_smarty_tpl->tpl_vars[$item]->iteration=0;\n";
+        $output = "<?php\n";
+        $output .= "\$_from = $from;\n";
+        $output .= "if (!is_array(\$_from) && !is_object(\$_from)) {\n";
+        $output .= "settype(\$_from, 'array');\n";
+        $output .= "}\n";
+        foreach ($saveVars as $k => $code) {
+            $output .= "{$local}{$k} = {$code}\n";
         }
-        if ($usesPropIndex) {
-            $output .= " \$_smarty_tpl->tpl_vars[$item]->index=-1;\n";
+        $output .= "{$itemVar} = new Smarty_Variable();\n";
+        $output .= "{$local}total = \$_smarty_tpl->smarty->ext->_foreach->count(\$_from);\n";
+        if (isset($itemAttr['show'])) {
+            $output .= "{$itemVar}->show = ({$local}total > 0);\n";
         }
-        if ($usesPropShow) {
-            $output .= " \$_smarty_tpl->tpl_vars[$item]->show = (\$_smarty_tpl->tpl_vars[$item]->total > 0);\n";
+        if (isset($itemAttr['total'])) {
+            $output .= "{$itemVar}->total= {$local}total;\n";
         }
-        if ($has_name) {
-            if ($usesSmartyTotal) {
-                $output .= " \$_smarty_tpl->tpl_vars['smarty']->value['foreach'][$name]['total'] = \$_smarty_tpl->tpl_vars[$item]->total;\n";
+        if ($this->isNamed) {
+            $prop = array();
+            if (isset($namedAttr['total'])) {
+                $prop['total'] = "'total' => {$local}total";
             }
-            if ($usesSmartyIteration) {
-                $output .= " \$_smarty_tpl->tpl_vars['smarty']->value['foreach'][$name]['iteration']=0;\n";
+            if (isset($namedAttr['iteration'])) {
+                $prop['iteration'] = "'iteration' => 0";
             }
-            if ($usesSmartyIndex) {
-                $output .= " \$_smarty_tpl->tpl_vars['smarty']->value['foreach'][$name]['index']=-1;\n";
+            if (isset($namedAttr['index'])) {
+                $prop['index'] = "'index' => -1";
             }
-            if ($usesSmartyShow) {
-                $output .= " \$_smarty_tpl->tpl_vars['smarty']->value['foreach'][$name]['show']=(\$_smarty_tpl->tpl_vars[$item]->total > 0);\n";
+            if (isset($namedAttr['show'])) {
+                $prop['show'] = "'show' => ({$local}total > 0)";
             }
+            if (!empty($namedAttr)) {
+                $_vars = 'array(' . join(', ', $prop) . ')';
+                $output .= "{$foreachVar} = new Smarty_Variable({$_vars});\n";
+            }
+        }
+        $output .= "if ({$local}total) {\n";
+        if (isset($attributes['key'])) {
+            $output .= "\$_smarty_tpl->tpl_vars['{$key}'] = new Smarty_Variable();\n";
+        }
+        if (isset($namedAttr['first']) || isset($itemAttr['first'])) {
+            $output .= "{$local}first = true;\n";
+        }
+        if (isset($itemAttr['iteration'])) {
+            $output .= "{$itemVar}->iteration=0;\n";
+        }
+        if (isset($itemAttr['index'])) {
+            $output .= "{$itemVar}->index=-1;\n";
+        }
+        if ($needIteration) {
+            $output .= "{$local}iteration=0;\n";
         }
-        $output .= "foreach (\$_from as \$_smarty_tpl->tpl_vars[$item]->key => \$_smarty_tpl->tpl_vars[$item]->value){\n\$_smarty_tpl->tpl_vars[$item]->_loop = true;\n";
-        if ($key != null) {
-            $output .= " \$_smarty_tpl->tpl_vars[$key]->value = \$_smarty_tpl->tpl_vars[$item]->key;\n";
+        $output .= "foreach (\$_from as {$keyTerm}{$itemVar}->value) {\n";
+        if (isset($attributes['key']) && isset($itemAttr['key'])) {
+            $output .= "\$_smarty_tpl->tpl_vars['{$key}']->value = {$itemVar}->key;\n";
         }
-        if ($usesPropIteration) {
-            $output .= " \$_smarty_tpl->tpl_vars[$item]->iteration++;\n";
+        if (isset($itemAttr['iteration'])) {
+            $output .= "{$itemVar}->iteration++;\n";
         }
-        if ($usesPropIndex) {
-            $output .= " \$_smarty_tpl->tpl_vars[$item]->index++;\n";
+        if (isset($itemAttr['index'])) {
+            $output .= "{$itemVar}->index++;\n";
         }
-        if ($usesPropFirst) {
-            $output .= " \$_smarty_tpl->tpl_vars[$item]->first = \$_smarty_tpl->tpl_vars[$item]->index === 0;\n";
+        if ($needIteration) {
+            $output .= "{$local}iteration++;\n";
         }
-        if ($usesPropLast) {
-            $output .= " \$_smarty_tpl->tpl_vars[$item]->last = \$_smarty_tpl->tpl_vars[$item]->iteration === \$_smarty_tpl->tpl_vars[$item]->total;\n";
+        if (isset($itemAttr['first'])) {
+            $output .= "{$itemVar}->first = {$local}first;\n";
         }
-        if ($has_name) {
-            if ($usesSmartyFirst) {
-                $output .= " \$_smarty_tpl->tpl_vars['smarty']->value['foreach'][$name]['first'] = \$_smarty_tpl->tpl_vars[$item]->first;\n";
+        if (isset($itemAttr['last'])) {
+            $output .= "{$itemVar}->last = {$local}iteration == {$local}total;\n";
+        }
+        if ($this->isNamed) {
+            if (isset($namedAttr['iteration'])) {
+                $output .= "{$foreachVar}->value['iteration']++;\n";
             }
-            if ($usesSmartyIteration) {
-                $output .= " \$_smarty_tpl->tpl_vars['smarty']->value['foreach'][$name]['iteration']++;\n";
+            if (isset($namedAttr['index'])) {
+                $output .= "{$foreachVar}->value['index']++;\n";
             }
-            if ($usesSmartyIndex) {
-                $output .= " \$_smarty_tpl->tpl_vars['smarty']->value['foreach'][$name]['index']++;\n";
+            if (isset($namedAttr['first'])) {
+                $output .= "{$foreachVar}->value['first'] = {$local}first;\n";
             }
-            if ($usesSmartyLast) {
-                $output .= " \$_smarty_tpl->tpl_vars['smarty']->value['foreach'][$name]['last'] = \$_smarty_tpl->tpl_vars[$item]->last;\n";
+            if (isset($namedAttr['last'])) {
+                $output .= "{$foreachVar}->value['last'] = {$local}iteration == {$local}total;\n";
             }
         }
+        if (isset($namedAttr['first']) || isset($itemAttr['first'])) {
+            $output .= "{$local}first = false;\n";
+        }
+        $output .= "{$local}saved_local_item = {$itemVar};\n";
         $output .= "?>";
 
         return $output;
@@ -170,62 +272,74 @@ class Smarty_Internal_Compile_Foreach extends Smarty_Internal_CompileBase {
 /**
  * Smarty Internal Plugin Compile Foreachelse Class
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage Compiler
  */
-class Smarty_Internal_Compile_Foreachelse extends Smarty_Internal_CompileBase {
-
+class Smarty_Internal_Compile_Foreachelse extends Smarty_Internal_CompileBase
+{
     /**
      * Compiles code for the {foreachelse} 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 \Smarty_Internal_TemplateCompilerBase $compiler  compiler object
+     * @param  array                                $parameter array with compilation parameter
+     *
      * @return string compiled code
      */
-    public function compile($args, $compiler, $parameter)
+    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter)
     {
         // check and get attributes
         $_attr = $this->getAttributes($compiler, $args);
 
-        list($openTag, $nocache, $item, $key) = $this->closeTag($compiler, array('foreach'));
-        $this->openTag($compiler, 'foreachelse', array('foreachelse', $nocache, $item, $key));
-
-        return "<?php }\nif (!\$_smarty_tpl->tpl_vars[$item]->_loop) {\n?>";
+        list($openTag, $nocache, $local, $restoreVars, $itemVar, $foo) = $this->closeTag($compiler, array('foreach'));
+        $this->openTag($compiler, 'foreachelse', array('foreachelse', $nocache, $local, $restoreVars, $itemVar, false));
+        $output = "<?php\n";
+        $output .= "{$itemVar} = {$local}saved_local_item;\n";
+        $output .= "}\n";
+        $output .= "} else {\n?>";
+        return $output;
     }
-
 }
 
 /**
  * Smarty Internal Plugin Compile Foreachclose Class
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage Compiler
  */
-class Smarty_Internal_Compile_Foreachclose extends Smarty_Internal_CompileBase {
-
+class Smarty_Internal_Compile_Foreachclose extends Smarty_Internal_CompileBase
+{
     /**
      * Compiles code for the {/foreach} 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 \Smarty_Internal_TemplateCompilerBase $compiler  compiler object
+     * @param  array                                $parameter array with compilation parameter
+     *
      * @return string compiled code
      */
-    public function compile($args, $compiler, $parameter)
+    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter)
     {
-        // check and get attributes
-        $_attr = $this->getAttributes($compiler, $args);
+        $compiler->loopNesting --;
         // must endblock be nocache?
         if ($compiler->nocache) {
             $compiler->tag_nocache = true;
         }
 
-        list($openTag, $compiler->nocache, $item, $key) = $this->closeTag($compiler, array('foreach', 'foreachelse'));
+        list($openTag, $compiler->nocache, $local, $restoreVars, $itemVar, $restore) =
+            $this->closeTag($compiler, array('foreach', 'foreachelse'));
+        $output = "<?php\n";
 
-        return "<?php } ?>";
-    }
+        if ($restore) {
+            $output .= "{$itemVar} = {$local}saved_local_item;\n";
+            $output .= "}\n";
+        }
+        $output .= "}\n";
+        foreach ($restoreVars as $restore) {
+            $output .= $restore;
+        }
+        $output .= "?>";
 
+        return $output;
+    }
 }
-
-?>
\ No newline at end of file
diff --git a/include/smarty/libs/sysplugins/smarty_internal_compile_function.php b/include/smarty/libs/sysplugins/smarty_internal_compile_function.php
index 7821d2038..28f335949 100644
--- a/include/smarty/libs/sysplugins/smarty_internal_compile_function.php
+++ b/include/smarty/libs/sysplugins/smarty_internal_compile_function.php
@@ -1,21 +1,21 @@
 <?php
 /**
  * Smarty Internal Plugin Compile Function
- *
  * Compiles the {function} {/function} tags
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage Compiler
- * @author Uwe Tews
+ * @author     Uwe Tews
  */
 
 /**
  * Smarty Internal Plugin Compile Function Class
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage Compiler
  */
-class Smarty_Internal_Compile_Function extends Smarty_Internal_CompileBase {
+class Smarty_Internal_Compile_Function extends Smarty_Internal_CompileBase
+{
 
     /**
      * Attribute definition: Overwrites base class.
@@ -24,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.
      *
@@ -31,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.
      *
@@ -42,125 +44,167 @@ class Smarty_Internal_Compile_Function 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
-     * @return boolean true
+     * @param  array                                $args      array with attributes from parser
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler  compiler object
+     * @param  array                                $parameter array with compilation parameter
+     *
+     * @return bool true
+     * @throws \SmartyCompilerException
      */
-    public function compile($args, $compiler, $parameter)
+    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter)
     {
+        $compiler->loopNesting++;
         // check and get attributes
         $_attr = $this->getAttributes($compiler, $args);
 
         if ($_attr['nocache'] === true) {
-            $compiler->trigger_template_error('nocache option not allowed', $compiler->lex->taglineno);
+            $compiler->trigger_template_error('nocache option not allowed', null, true);
         }
         unset($_attr['nocache']);
-        $save = array($_attr, $compiler->parser->current_buffer,
-            $compiler->template->has_nocache_code, $compiler->template->required_plugins);
-        $this->openTag($compiler, 'function', $save);
         $_name = trim($_attr['name'], "'\"");
-        unset($_attr['name']);
-        // set flag that we are compiling a template function
-        $compiler->compiles_template_function = true;
-        $compiler->template->properties['function'][$_name]['parameter'] = array();
-        $_smarty_tpl = $compiler->template;
-        foreach ($_attr as $_key => $_data) {
-            eval ('$tmp='.$_data.';');
-            $compiler->template->properties['function'][$_name]['parameter'][$_key] = $tmp;
-        }
-        $compiler->smarty->template_functions[$_name]['parameter'] = $compiler->template->properties['function'][$_name]['parameter'];
-        if ($compiler->template->caching) {
-            $output = '';
-        } else {
-            $output = "<?php if (!function_exists('smarty_template_function_{$_name}')) {
-    function smarty_template_function_{$_name}(\$_smarty_tpl,\$params) {
-    \$saved_tpl_vars = \$_smarty_tpl->tpl_vars;
-    foreach (\$_smarty_tpl->smarty->template_functions['{$_name}']['parameter'] as \$key => \$value) {\$_smarty_tpl->tpl_vars[\$key] = new Smarty_variable(\$value);};
-    foreach (\$params as \$key => \$value) {\$_smarty_tpl->tpl_vars[\$key] = new Smarty_variable(\$value);}?>";
-        }
-        // Init temporay context
-        $compiler->template->required_plugins = array('compiled' => array(), 'nocache' => array());
-        $compiler->parser->current_buffer = new _smarty_template_buffer($compiler->parser);
-        $compiler->parser->current_buffer->append_subtree(new _smarty_tag($compiler->parser, $output));
-        $compiler->template->has_nocache_code = false;
-        $compiler->has_code = false;
-        $compiler->template->properties['function'][$_name]['compiled'] = '';
+        $compiler->parent_compiler->tpl_function[$_name] = $compiler->parent_compiler->template->tpl_function[$_name] = array();
+        $save = array($_attr, $compiler->parser->current_buffer, $compiler->template->compiled->has_nocache_code,
+                      $compiler->template->caching);
+        $this->openTag($compiler, 'function', $save);
+        // Init temporary context
+        $compiler->parser->current_buffer = new Smarty_Internal_ParseTree_Template();
+        $compiler->template->compiled->has_nocache_code = false;
         return true;
     }
-
 }
 
 /**
  * Smarty Internal Plugin Compile Functionclose Class
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage Compiler
  */
-class Smarty_Internal_Compile_Functionclose extends Smarty_Internal_CompileBase {
+class Smarty_Internal_Compile_Functionclose extends Smarty_Internal_CompileBase
+{
+
+    /**
+     * Compiler object
+     *
+     * @var object
+     */
+    private $compiler = null;
 
     /**
      * 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
-     * @return boolean true
+     * @param  array                                       $args      array with attributes from parser
+     * @param object|\Smarty_Internal_TemplateCompilerBase $compiler  compiler object
+     * @param  array                                       $parameter array with compilation parameter
+     *
+     * @return bool true
      */
-    public function compile($args, $compiler, $parameter)
+    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter)
     {
-        $_attr = $this->getAttributes($compiler, $args);
+        $compiler->loopNesting--;
+        $this->compiler = $compiler;
         $saved_data = $this->closeTag($compiler, array('function'));
-        $_name = trim($saved_data[0]['name'], "'\"");
-        // build plugin include code
-        $plugins_string = '';
-        if (!empty($compiler->template->required_plugins['compiled'])) {
-            $plugins_string = '<?php ';
-            foreach($compiler->template->required_plugins['compiled'] as $tmp) {
-                foreach($tmp as $data) {
-                    $plugins_string .= "if (!is_callable('{$data['function']}')) include '{$data['file']}';\n";
-                }
+        $_attr = $saved_data[0];
+        $_name = trim($_attr['name'], "'\"");
+        $compiler->parent_compiler->tpl_function[$_name]['called_functions'] = $compiler->parent_compiler->template->tpl_function[$_name]['called_functions'] = $compiler->called_functions;
+        $compiler->parent_compiler->tpl_function[$_name]['compiled_filepath'] = $compiler->parent_compiler->template->tpl_function[$_name]['compiled_filepath'] = $compiler->parent_compiler->template->compiled->filepath;
+        $compiler->parent_compiler->tpl_function[$_name]['uid'] = $compiler->parent_compiler->template->tpl_function[$_name]['uid'] = $compiler->template->source->uid;
+        $compiler->called_functions = array();
+        $_parameter = $_attr;
+        unset($_parameter['name']);
+        // default parameter
+        $_paramsArray = array();
+        foreach ($_parameter as $_key => $_value) {
+            if (is_int($_key)) {
+                $_paramsArray[] = "$_key=>$_value";
+            } else {
+                $_paramsArray[] = "'$_key'=>$_value";
             }
-            $plugins_string .= '?>';
         }
-        if (!empty($compiler->template->required_plugins['nocache'])) {
-            $plugins_string .= "<?php echo '/*%%SmartyNocache:{$compiler->template->properties['nocache_hash']}%%*/<?php ";
-            foreach($compiler->template->required_plugins['nocache'] as $tmp) {
-                foreach($tmp as $data) {
-                    $plugins_string .= "if (!is_callable(\'{$data['function']}\')) include \'{$data['file']}\';\n";
+        if (!empty($_paramsArray)) {
+            $_params = 'array(' . implode(",", $_paramsArray) . ')';
+            $_paramsCode = "\$params = array_merge($_params, \$params);\n";
+        } else {
+            $_paramsCode = '';
+        }
+        $_functionCode = $compiler->parser->current_buffer;
+        // setup buffer for template function code
+        $compiler->parser->current_buffer = new Smarty_Internal_ParseTree_Template();
+
+        $_funcName = "smarty_template_function_{$_name}_{$compiler->template->compiled->nocache_hash}";
+        $_funcNameCaching = $_funcName . '_nocache';
+        if ($compiler->template->compiled->has_nocache_code) {
+            $compiler->parent_compiler->tpl_function[$_name]['call_name_caching'] = $compiler->parent_compiler->template->tpl_function[$_name]['call_name_caching'] = $_funcNameCaching;
+            $output = "<?php\n";
+            $output .= "/* {$_funcNameCaching} */\n";
+            $output .= "if (!function_exists('{$_funcNameCaching}')) {\n";
+            $output .= "function {$_funcNameCaching} (\$_smarty_tpl,\$params) {\n";
+            $output .= "ob_start();\n";
+            $output .= "\$_smarty_tpl->compiled->has_nocache_code = true;\n";
+            $output .= $_paramsCode;
+            $output .= "\$_smarty_tpl->_cache['saved_tpl_vars'][] = \$_smarty_tpl->tpl_vars;\n";
+            $output .= "foreach (\$params as \$key => \$value) {\n\$_smarty_tpl->tpl_vars[\$key] = new Smarty_Variable(\$value);\n}";
+            $output .= "\$params = var_export(\$params, true);\n";
+            $output .= "echo \"/*%%SmartyNocache:{$compiler->template->compiled->nocache_hash}%%*/<?php ";
+            $output .= "\\\$saved_tpl_vars = \\\$_smarty_tpl->tpl_vars;\nforeach (\$params as \\\$key => \\\$value) {\n\\\$_smarty_tpl->tpl_vars[\\\$key] = new Smarty_Variable(\\\$value);\n}\n?>";
+            $output .= "/*/%%SmartyNocache:{$compiler->template->compiled->nocache_hash}%%*/\n\";?>";
+            $compiler->parser->current_buffer->append_subtree($compiler->parser, new Smarty_Internal_ParseTree_Tag($compiler->parser, $output));
+            $compiler->parser->current_buffer->append_subtree($compiler->parser, $_functionCode);
+            $output = "<?php echo \"/*%%SmartyNocache:{$compiler->template->compiled->nocache_hash}%%*/<?php ";
+            $output .= "foreach (Smarty::\\\$global_tpl_vars as \\\$key => \\\$value){\n";
+            $output .= "if (!isset(\\\$_smarty_tpl->tpl_vars[\\\$key]) || \\\$_smarty_tpl->tpl_vars[\\\$key] === \\\$value) \\\$saved_tpl_vars[\\\$key] = \\\$value;\n}\n";
+            $output .= "\\\$_smarty_tpl->tpl_vars = \\\$saved_tpl_vars;?>\n";
+            $output .= "/*/%%SmartyNocache:{$compiler->template->compiled->nocache_hash}%%*/\";\n?>";
+            $output .= "<?php echo str_replace('{$compiler->template->compiled->nocache_hash}', \$_smarty_tpl->compiled->nocache_hash, ob_get_clean());\n";
+            $output .= "\$_smarty_tpl->tpl_vars = array_pop(\$_smarty_tpl->_cache['saved_tpl_vars']);\n}\n}\n";
+            $output .= "/*/ {$_funcName}_nocache */\n\n";
+            $output .= "?>\n";
+            $compiler->parser->current_buffer->append_subtree($compiler->parser, new Smarty_Internal_ParseTree_Tag($compiler->parser, $output));
+            $_functionCode = new Smarty_Internal_ParseTree_Tag($compiler->parser, preg_replace_callback("/((<\?php )?echo '\/\*%%SmartyNocache:{$compiler->template->compiled->nocache_hash}%%\*\/([\S\s]*?)\/\*\/%%SmartyNocache:{$compiler->template->compiled->nocache_hash}%%\*\/';(\?>\n)?)/", array($this,
+                                                                                                                                                                                                                                                                                                          'removeNocache'), $_functionCode->to_smarty_php($compiler->parser)));
+        }
+        $compiler->parent_compiler->tpl_function[$_name]['call_name'] = $compiler->parent_compiler->template->tpl_function[$_name]['call_name'] = $_funcName;
+        $output = "<?php\n";
+        $output .= "/* {$_funcName} */\n";
+        $output .= "if (!function_exists('{$_funcName}')) {\n";
+        $output .= "function {$_funcName}(\$_smarty_tpl,\$params) {\n";
+        $output .= "\$saved_tpl_vars = \$_smarty_tpl->tpl_vars;\n";
+        $output .= $_paramsCode;
+        $output .= "foreach (\$params as \$key => \$value) {\n\$_smarty_tpl->tpl_vars[\$key] = new Smarty_Variable(\$value);\n}?>";
+        $compiler->parser->current_buffer->append_subtree($compiler->parser, new Smarty_Internal_ParseTree_Tag($compiler->parser, $output));
+        $compiler->parser->current_buffer->append_subtree($compiler->parser, $_functionCode);
+        $output = "<?php foreach (Smarty::\$global_tpl_vars as \$key => \$value){\n";
+        $output .= "if (!isset(\$_smarty_tpl->tpl_vars[\$key]) || \$_smarty_tpl->tpl_vars[\$key] === \$value) \$saved_tpl_vars[\$key] = \$value;\n}\n";
+        $output .= "\$_smarty_tpl->tpl_vars = \$saved_tpl_vars;\n}\n}\n";
+        $output .= "/*/ {$_funcName} */\n\n";
+        $output .= "?>\n";
+        $compiler->parser->current_buffer->append_subtree($compiler->parser, new Smarty_Internal_ParseTree_Tag($compiler->parser, $output));
+        $compiler->parent_compiler->blockOrFunctionCode .= $compiler->parser->current_buffer->to_smarty_php($compiler->parser);
+        // nocache plugins must be copied
+        if (!empty($compiler->template->compiled->required_plugins['nocache'])) {
+            foreach ($compiler->template->compiled->required_plugins['nocache'] as $plugin => $tmp) {
+                foreach ($tmp as $type => $data) {
+                    $compiler->parent_compiler->template->compiled->required_plugins['compiled'][$plugin][$type] = $data;
                 }
             }
-            $plugins_string .= "?>/*/%%SmartyNocache:{$compiler->template->properties['nocache_hash']}%%*/';?>\n";
-        }
-         // remove last line break from function definition
-         $last = count($compiler->parser->current_buffer->subtrees) - 1;
-         if ($compiler->parser->current_buffer->subtrees[$last] instanceof _smarty_linebreak) {
-             unset($compiler->parser->current_buffer->subtrees[$last]);
-         }
-        // if caching save template function for possible nocache call
-        if ($compiler->template->caching) {
-            $compiler->template->properties['function'][$_name]['compiled'] .= $plugins_string
-             . $compiler->parser->current_buffer->to_smarty_php();
-            $compiler->template->properties['function'][$_name]['nocache_hash'] = $compiler->template->properties['nocache_hash'];
-            $compiler->template->properties['function'][$_name]['has_nocache_code'] = $compiler->template->has_nocache_code;
-            $compiler->template->properties['function'][$_name]['called_functions'] = $compiler->called_functions;
-            $compiler->called_functions = array();
-            $compiler->smarty->template_functions[$_name] = $compiler->template->properties['function'][$_name];
-            $compiler->has_code = false;
-            $output = true;
-        } else {
-            $output = $plugins_string . $compiler->parser->current_buffer->to_smarty_php() . "<?php \$_smarty_tpl->tpl_vars = \$saved_tpl_vars;
-foreach (Smarty::\$global_tpl_vars as \$key => \$value) if(!isset(\$_smarty_tpl->tpl_vars[\$key])) \$_smarty_tpl->tpl_vars[\$key] = \$value;}}?>\n";
         }
-        // reset flag that we are compiling a template function
-        $compiler->compiles_template_function = false;
-        // restore old compiler status
+        // restore old buffer
+
         $compiler->parser->current_buffer = $saved_data[1];
-        $compiler->template->has_nocache_code = $compiler->template->has_nocache_code | $saved_data[2];
-        $compiler->template->required_plugins = $saved_data[3];
-        return $output;
+        // restore old status
+        $compiler->template->compiled->has_nocache_code = $saved_data[2];
+        $compiler->template->caching = $saved_data[3];
+        return true;
     }
 
+    /**
+     * @param $match
+     *
+     * @return mixed
+     */
+    function removeNocache($match)
+    {
+        $code = preg_replace("/((<\?php )?echo '\/\*%%SmartyNocache:{$this->compiler->template->compiled->nocache_hash}%%\*\/)|(\/\*\/%%SmartyNocache:{$this->compiler->template->compiled->nocache_hash}%%\*\/';(\?>\n)?)/", '', $match[0]);
+        $code = str_replace(array('\\\'', '\\\\\''), array('\'', '\\\''), $code);
+        return $code;
+    }
 }
-
-?>
\ No newline at end of file
diff --git a/include/smarty/libs/sysplugins/smarty_internal_compile_if.php b/include/smarty/libs/sysplugins/smarty_internal_compile_if.php
index 8794b014b..541e21816 100644
--- a/include/smarty/libs/sysplugins/smarty_internal_compile_if.php
+++ b/include/smarty/libs/sysplugins/smarty_internal_compile_if.php
@@ -1,31 +1,32 @@
 <?php
 /**
-* Smarty Internal Plugin Compile If
-*
-* Compiles the {if} {else} {elseif} {/if} tags
-*
-* @package Smarty
-* @subpackage Compiler
-* @author Uwe Tews
-*/
+ * Smarty Internal Plugin Compile If
+ * Compiles the {if} {else} {elseif} {/if} tags
+ *
+ * @package    Smarty
+ * @subpackage Compiler
+ * @author     Uwe Tews
+ */
 
 /**
-* Smarty Internal Plugin Compile If Class
-*
-* @package Smarty
-* @subpackage Compiler
-*/
-class Smarty_Internal_Compile_If extends Smarty_Internal_CompileBase {
-
+ * Smarty Internal Plugin Compile If Class
+ *
+ * @package    Smarty
+ * @subpackage Compiler
+ */
+class Smarty_Internal_Compile_If extends Smarty_Internal_CompileBase
+{
     /**
-    * Compiles code for the {if} tag
-    *
-    * @param array  $args       array with attributes from parser
-    * @param object $compiler   compiler object
-    * @param array  $parameter  array with compilation parameter
-    * @return string compiled code
-    */
-    public function compile($args, $compiler, $parameter)
+     * Compiles code for the {if} tag
+     *
+     * @param array                                 $args      array with attributes from parser
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler  compiler object
+     * @param array                                 $parameter array with compilation parameter
+     *
+     * @return string compiled code
+     * @throws \SmartyCompilerException
+     */
+    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter)
     {
         // check and get attributes
         $_attr = $this->getAttributes($compiler, $args);
@@ -33,8 +34,8 @@ class Smarty_Internal_Compile_If extends Smarty_Internal_CompileBase {
         // must whole block be nocache ?
         $compiler->nocache = $compiler->nocache | $compiler->tag_nocache;
 
-        if (!array_key_exists("if condition",$parameter)) {
-            $compiler->trigger_template_error("missing if condition", $compiler->lex->taglineno);
+        if (!array_key_exists("if condition", $parameter)) {
+            $compiler->trigger_template_error("missing if condition", null, true);
         }
 
         if (is_array($parameter['if condition'])) {
@@ -42,79 +43,94 @@ 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 {
+                    $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[trim($parameter['if condition']['var'], "'")] = new Smarty_variable(null, true);
+                    $compiler->template->tpl_vars[$var] = new Smarty_Variable(null, true);
                 }
             } else {
                 $_nocache = '';
             }
             if (is_array($parameter['if condition']['var'])) {
-                $_output = "<?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']."){?>";
+                $_output = "<?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->smarty->ext->_var->createLocalArrayVariable(\$_smarty_tpl, " . $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 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']."){?>";
+                $_output = "<?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 if ({$parameter['if condition']}){?>";
+            return "<?php if ({$parameter['if condition']}) {?>";
         }
     }
-
 }
 
 /**
-* Smarty Internal Plugin Compile Else Class
-*
-* @package Smarty
-* @subpackage Compiler
-*/
-class Smarty_Internal_Compile_Else extends Smarty_Internal_CompileBase {
-
+ * Smarty Internal Plugin Compile Else Class
+ *
+ * @package    Smarty
+ * @subpackage Compiler
+ */
+class Smarty_Internal_Compile_Else extends Smarty_Internal_CompileBase
+{
     /**
-    * Compiles code for the {else} tag
-    *
-    * @param array  $args       array with attributes from parser
-    * @param object $compiler   compiler object
-    * @param array  $parameter  array with compilation parameter
-    * @return string compiled code
-    */
-    public function compile($args, $compiler, $parameter)
+     * Compiles code for the {else} tag
+     *
+     * @param array                                 $args      array with attributes from parser
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler  compiler object
+     * @param array                                 $parameter array with compilation parameter
+     *
+     * @return string compiled code
+     */
+    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter)
     {
         list($nesting, $compiler->tag_nocache) = $this->closeTag($compiler, array('if', 'elseif'));
         $this->openTag($compiler, 'else', array($nesting, $compiler->tag_nocache));
 
-        return "<?php }else{ ?>";
+        return "<?php } else { ?>";
     }
-
 }
 
 /**
-* Smarty Internal Plugin Compile ElseIf Class
-*
-* @package Smarty
-* @subpackage Compiler
-*/
-class Smarty_Internal_Compile_Elseif extends Smarty_Internal_CompileBase {
-
+ * Smarty Internal Plugin Compile ElseIf Class
+ *
+ * @package    Smarty
+ * @subpackage Compiler
+ */
+class Smarty_Internal_Compile_Elseif extends Smarty_Internal_CompileBase
+{
     /**
-    * Compiles code for the {elseif} tag
-    *
-    * @param array  $args       array with attributes from parser
-    * @param object $compiler   compiler object
-    * @param array  $parameter  array with compilation parameter
-    * @return string compiled code
-    */
-    public function compile($args, $compiler, $parameter)
+     * Compiles code for the {elseif} tag
+     *
+     * @param array                                 $args      array with attributes from parser
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler  compiler object
+     * @param array                                 $parameter array with compilation parameter
+     *
+     * @return string compiled code
+     * @throws \SmartyCompilerException
+     */
+    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter)
     {
         // check and get attributes
         $_attr = $this->getAttributes($compiler, $args);
 
         list($nesting, $compiler->tag_nocache) = $this->closeTag($compiler, array('if', 'elseif'));
 
-        if (!array_key_exists("if condition",$parameter)) {
-            $compiler->trigger_template_error("missing elseif condition", $compiler->lex->taglineno);
+        if (!array_key_exists("if condition", $parameter)) {
+            $compiler->trigger_template_error("missing elseif condition", null, true);
         }
 
         if (is_array($parameter['if condition'])) {
@@ -123,9 +139,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 {
+                    $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[trim($parameter['if condition']['var'], "'")] = new Smarty_variable(null, true);
+                    $compiler->template->tpl_vars[$var] = new Smarty_Variable(null, true);
                 }
             } else {
                 $_nocache = '';
@@ -138,57 +159,83 @@ class Smarty_Internal_Compile_Elseif extends Smarty_Internal_CompileBase {
             if ($condition_by_assign) {
                 $this->openTag($compiler, 'elseif', array($nesting + 1, $compiler->tag_nocache));
                 if (is_array($parameter['if condition']['var'])) {
-                    $_output = "<?php }else{ 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'] . "){?>";
+                    $_output = "<?php } else { 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->smarty->ext->_var->createLocalArrayVariable(\$_smarty_tpl, " .
+                        $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{ 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'] . "){?>";
+                    $_output = "<?php  } else { 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 {
                 $this->openTag($compiler, 'elseif', array($nesting, $compiler->tag_nocache));
-                return "<?php }elseif({$parameter['if condition']}){?>";
+
+                return "<?php } elseif ({$parameter['if condition']}) {?>";
             }
         } else {
             $tmp = '';
-            foreach ($compiler->prefix_code as $code)
-            $tmp .= $code;
+            foreach ($compiler->prefix_code as $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 .= "if (\$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var']['var'] . "]->value" . $parameter['if condition']['var']['smarty_internal_index'] . " = " . $parameter['if condition']['value'] . "){?>";
+                    $_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->smarty->ext->_var->createLocalArrayVariable(\$_smarty_tpl, " .
+                                                         $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 .= "if (\$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var'] . "]->value = " . $parameter['if condition']['value'] . "){?>";
+                    $_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']}) {?>");
             }
         }
     }
-
 }
 
 /**
-* Smarty Internal Plugin Compile Ifclose Class
-*
-* @package Smarty
-* @subpackage Compiler
-*/
-class Smarty_Internal_Compile_Ifclose extends Smarty_Internal_CompileBase {
-
+ * Smarty Internal Plugin Compile Ifclose Class
+ *
+ * @package    Smarty
+ * @subpackage Compiler
+ */
+class Smarty_Internal_Compile_Ifclose extends Smarty_Internal_CompileBase
+{
     /**
-    * Compiles code for the {/if} tag
-    *
-    * @param array  $args       array with attributes from parser
-    * @param object $compiler   compiler object
-    * @param array  $parameter  array with compilation parameter
-    * @return string compiled code
-    */
-    public function compile($args, $compiler, $parameter)
+     * Compiles code for the {/if} tag
+     *
+     * @param array                                 $args      array with attributes from parser
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler  compiler object
+     * @param array                                 $parameter array with compilation parameter
+     *
+     * @return string compiled code
+     */
+    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter)
     {
         // must endblock be nocache?
         if ($compiler->nocache) {
@@ -196,12 +243,10 @@ class Smarty_Internal_Compile_Ifclose extends Smarty_Internal_CompileBase {
         }
         list($nesting, $compiler->nocache) = $this->closeTag($compiler, array('if', 'else', 'elseif'));
         $tmp = '';
-        for ($i = 0; $i < $nesting; $i++) {
+        for ($i = 0; $i < $nesting; $i ++) {
             $tmp .= '}';
         }
+
         return "<?php {$tmp}?>";
     }
-
 }
-
-?>
\ No newline at end of file
diff --git a/include/smarty/libs/sysplugins/smarty_internal_compile_include.php b/include/smarty/libs/sysplugins/smarty_internal_compile_include.php
index 43a144f94..09fa11d6c 100644
--- a/include/smarty/libs/sysplugins/smarty_internal_compile_include.php
+++ b/include/smarty/libs/sysplugins/smarty_internal_compile_include.php
@@ -1,110 +1,213 @@
 <?php
 /**
-* Smarty Internal Plugin Compile Include
-*
-* Compiles the {include} tag
-*
-* @package Smarty
-* @subpackage Compiler
-* @author Uwe Tews
-*/
+ * Smarty Internal Plugin Compile Include
+ * Compiles the {include} tag
+ *
+ * @package    Smarty
+ * @subpackage Compiler
+ * @author     Uwe Tews
+ */
 
 /**
-* Smarty Internal Plugin Compile Include Class
-*
-* @package Smarty
-* @subpackage Compiler
-*/
-class Smarty_Internal_Compile_Include extends Smarty_Internal_CompileBase {
-
+ * Smarty Internal Plugin Compile Include Class
+ *
+ * @package    Smarty
+ * @subpackage Compiler
+ */
+class Smarty_Internal_Compile_Include extends Smarty_Internal_CompileBase
+{
     /**
-    * caching mode to create nocache code but no cache file
-    */
+     * caching mode to create nocache code but no cache file
+     */
     const CACHING_NOCACHE_CODE = 9999;
+
     /**
-    * Attribute definition: Overwrites base class.
-    *
-    * @var array
-    * @see Smarty_Internal_CompileBase
-    */
+     * Attribute definition: Overwrites base class.
+     *
+     * @var array
+     * @see Smarty_Internal_CompileBase
+     */
     public $required_attributes = array('file');
+
     /**
-    * Attribute definition: Overwrites base class.
-    *
-    * @var array
-    * @see Smarty_Internal_CompileBase
-    */
+     * Attribute definition: Overwrites base class.
+     *
+     * @var array
+     * @see Smarty_Internal_CompileBase
+     */
     public $shorttag_order = array('file');
+
     /**
-    * Attribute definition: Overwrites base class.
-    *
-    * @var array
-    * @see Smarty_Internal_CompileBase
-    */
-    public $option_flags = array('nocache', 'inline', 'caching');
+     * Attribute definition: Overwrites base class.
+     *
+     * @var array
+     * @see Smarty_Internal_CompileBase
+     */
+    public $option_flags = array('nocache', 'inline', 'caching', 'bubble_up');
+
     /**
-    * Attribute definition: Overwrites base class.
-    *
-    * @var array
-    * @see Smarty_Internal_CompileBase
-    */
+     * Attribute definition: Overwrites base class.
+     *
+     * @var array
+     * @see Smarty_Internal_CompileBase
+     */
     public $optional_attributes = array('_any');
 
     /**
-    * Compiles code for the {include} tag
-    *
-     * @param array $args array with attributes from parser
-     * @param object $compiler compiler object
-     * @param array $parameter array with compilation parameter
+     * Valid scope names
+     *
+     * @var array
+     */
+    public $valid_scopes = array('local'  => true, 'parent' => true, 'root' => true, 'global' => true,
+                                 'smarty' => true, 'tpl_root' => true);
+
+    /**
+     * Compiles code for the {include} tag
+     *
+     * @param  array                                  $args      array with attributes from parser
+     * @param  Smarty_Internal_SmartyTemplateCompiler $compiler  compiler object
+     * @param  array                                  $parameter array with compilation parameter
+     *
+     * @throws SmartyCompilerException
      * @return string compiled code
      */
-    public function compile($args, $compiler, $parameter)
+    public function compile($args, Smarty_Internal_SmartyTemplateCompiler $compiler, $parameter)
     {
         // check and get attributes
         $_attr = $this->getAttributes($compiler, $args);
-        // save posible attributes
-        $include_file = $_attr['file'];
+
+        $hashResourceName = $fullResourceName = $source_resource = $_attr['file'];
+        $variable_template = false;
+        $cache_tpl = false;
+        // parse resource_name
+        if (preg_match('/^([\'"])(([A-Za-z0-9_\-]{2,})[:])?(([^$()]+)|(.+))\1$/', $source_resource, $match)) {
+            $type = !empty($match[3]) ? $match[3] : $compiler->template->smarty->default_resource_type;
+            $name = !empty($match[5]) ? $match[5] : $match[6];
+            $handler = Smarty_Resource::load($compiler->smarty, $type);
+            if ($handler->recompiled || $handler->uncompiled) {
+                $variable_template = true;
+            }
+            if (!$variable_template) {
+                if ($type != 'string') {
+                    $fullResourceName = "{$type}:{$name}";
+                    $compiled = $compiler->parent_compiler->template->compiled;
+                    if (isset($compiled->includes[$fullResourceName])) {
+                        $compiled->includes[$fullResourceName] ++;
+                        $cache_tpl = true;
+                    } else {
+                        $compiled->includes[$fullResourceName] = 1;
+                    }
+                    $fullResourceName = '"' . $fullResourceName . '"';
+                }
+            }
+            if (empty($match[5])) {
+                $variable_template = true;
+            }
+        } else {
+            $variable_template = true;
+        }
 
         if (isset($_attr['assign'])) {
-            // output will be stored in a smarty variable instead of beind displayed
+            // output will be stored in a smarty variable instead of being displayed
             $_assign = $_attr['assign'];
         }
 
-        $_parent_scope = Smarty::SCOPE_LOCAL;
+        // scope setup
+        $_scope = Smarty::SCOPE_LOCAL;
         if (isset($_attr['scope'])) {
             $_attr['scope'] = trim($_attr['scope'], "'\"");
-            if ($_attr['scope'] == 'parent') {
-                $_parent_scope = Smarty::SCOPE_PARENT;
-            } elseif ($_attr['scope'] == 'root') {
-                $_parent_scope = Smarty::SCOPE_ROOT;
-            } elseif ($_attr['scope'] == 'global') {
-                $_parent_scope = Smarty::SCOPE_GLOBAL;
+            if (!isset($this->valid_scopes[$_attr['scope']])) {
+                $compiler->trigger_template_error("illegal value '{$_attr['scope']}' for \"scope\" attribute", null, true);
+            }
+            if ($_attr['scope'] != 'local') {
+                if ($_attr['scope'] == 'parent') {
+                    $_scope = Smarty::SCOPE_PARENT;
+                } elseif ($_attr['scope'] == 'root') {
+                    $_scope = Smarty::SCOPE_ROOT;
+                } elseif ($_attr['scope'] == 'global') {
+                    $_scope = Smarty::SCOPE_GLOBAL;
+                } elseif ($_attr['scope'] == 'smarty') {
+                    $_scope = Smarty::SCOPE_SMARTY;
+                } elseif ($_attr['scope'] == 'tpl_root') {
+                    $_scope = Smarty::SCOPE_TPL_ROOT;
+                }
+                if ($_attr['bubble_up'] === true) {
+                    $_scope = $_scope + Smarty::SCOPE_BUBBLE_UP;
+                }
             }
         }
-        $_caching = 'null';
-        if ($compiler->nocache || $compiler->tag_nocache) {
-            $_caching = Smarty::CACHING_OFF;
+
+        // set flag to cache subtemplate object when called within loop or template name is variable.
+        if ($cache_tpl || $variable_template || $compiler->loopNesting > 0) {
+            $_cache_tpl = 'true';
+        } else {
+            $_cache_tpl = 'false';
         }
-        // default for included templates
+        // assume caching is off
+        $_caching = Smarty::CACHING_OFF;
+
+        if ($_attr['nocache'] === true) {
+            $compiler->tag_nocache = true;
+        }
+
+        $call_nocache = $compiler->tag_nocache || $compiler->nocache;
+
+        // caching was on and {include} is not in nocache mode
         if ($compiler->template->caching && !$compiler->nocache && !$compiler->tag_nocache) {
             $_caching = self::CACHING_NOCACHE_CODE;
         }
+
+        // flag if included template code should be merged into caller
+        $merge_compiled_includes = ($compiler->smarty->merge_compiled_includes || $_attr['inline'] === true) &&
+            !$compiler->template->source->handler->recompiled;
+
+        if ($merge_compiled_includes && $_attr['inline'] !== true) {
+            // variable template name ?
+            if ($variable_template) {
+                $merge_compiled_includes = false;
+                if ($compiler->template->caching) {
+                    // must use individual cache file
+                    //$_attr['caching'] = 1;
+                }
+            }
+            // variable compile_id?
+            if (isset($_attr['compile_id'])) {
+                if (!((substr_count($_attr['compile_id'], '"') == 2 || substr_count($_attr['compile_id'], "'") == 2 ||
+                        is_numeric($_attr['compile_id']))) || substr_count($_attr['compile_id'], '(') != 0 ||
+                    substr_count($_attr['compile_id'], '$_smarty_tpl->') != 0
+                ) {
+                    $merge_compiled_includes = false;
+                    if ($compiler->template->caching) {
+                        // must use individual cache file
+                        //$_attr['caching'] = 1;
+                    }
+                }
+            }
+        }
+
         /*
-        * if the {include} tag provides individual parameter for caching
-        * it will not be included into the common cache file and treated like
-        * a nocache section
+        * if the {include} tag provides individual parameter for caching or compile_id
+        * the subtemplate must not be included into the common cache file and is treated like
+        * a call in nocache mode.
+        *
         */
+        if ($_attr['nocache'] !== true && $_attr['caching']) {
+            $_caching = $_new_caching = (int) $_attr['caching'];
+            $call_nocache = true;
+        } else {
+            $_new_caching = Smarty::CACHING_LIFETIME_CURRENT;
+        }
         if (isset($_attr['cache_lifetime'])) {
             $_cache_lifetime = $_attr['cache_lifetime'];
-            $compiler->tag_nocache = true;
-            $_caching = Smarty::CACHING_LIFETIME_CURRENT;
+            $call_nocache = true;
+            $_caching = $_new_caching;
         } else {
-            $_cache_lifetime = 'null';
+            $_cache_lifetime = '$_smarty_tpl->cache_lifetime';
         }
         if (isset($_attr['cache_id'])) {
             $_cache_id = $_attr['cache_id'];
-            $compiler->tag_nocache = true;
-            $_caching = Smarty::CACHING_LIFETIME_CURRENT;
+            $call_nocache = true;
+            $_caching = $_new_caching;
         } else {
             $_cache_id = '$_smarty_tpl->cache_id';
         }
@@ -113,103 +216,151 @@ class Smarty_Internal_Compile_Include extends Smarty_Internal_CompileBase {
         } else {
             $_compile_id = '$_smarty_tpl->compile_id';
         }
-        if ($_attr['caching'] === true) {
-            $_caching = Smarty::CACHING_LIFETIME_CURRENT;
-        }
-        if ($_attr['nocache'] === true) {
-            $compiler->tag_nocache = true;
-            $_caching = Smarty::CACHING_OFF;
+
+        // if subtemplate will be called in nocache mode do not merge
+        if ($compiler->template->caching && $call_nocache) {
+            $merge_compiled_includes = false;
         }
 
         $has_compiled_template = false;
-        if (($compiler->smarty->merge_compiled_includes || $_attr['inline'] === true) && !$compiler->template->source->recompiled
-            && !($compiler->template->caching && ($compiler->tag_nocache || $compiler->nocache)) && $_caching != Smarty::CACHING_LIFETIME_CURRENT) {
-            // check if compiled code can be merged (contains no variable part)
-            if (!$compiler->has_variable_string && (substr_count($include_file, '"') == 2 or substr_count($include_file, "'") == 2)
-               and substr_count($include_file, '(') == 0 and substr_count($include_file, '$_smarty_tpl->') == 0) {
-                $tpl_name = null;
-                eval("\$tpl_name = $include_file;");
-                if (!isset($compiler->smarty->merged_templates_func[$tpl_name]) || $compiler->inheritance) {
-                    $tpl = new $compiler->smarty->template_class ($tpl_name, $compiler->smarty, $compiler->template, $compiler->template->cache_id, $compiler->template->compile_id);
-                    // save unique function name
-                    $compiler->smarty->merged_templates_func[$tpl_name]['func'] = $tpl->properties['unifunc'] = 'content_'. str_replace('.', '_', uniqid('', true));
-                    // use current nocache hash for inlined code
-                    $compiler->smarty->merged_templates_func[$tpl_name]['nocache_hash'] = $tpl->properties['nocache_hash'] = $compiler->template->properties['nocache_hash'];
-                    if ($compiler->template->caching) {
-                        // needs code for cached page but no cache file
-                        $tpl->caching = self::CACHING_NOCACHE_CODE;
-                    }
-                    // make sure whole chain gest compiled
-                    $tpl->mustCompile = true;
-                    if (!($tpl->source->uncompiled) && $tpl->source->exists) {
-                        // get compiled code
-                        $compiled_code = $tpl->compiler->compileTemplate($tpl);
-                        // release compiler object to free memory
-                        unset($tpl->compiler);
-                        // merge compiled code for {function} tags
-                        $compiler->template->properties['function'] = array_merge($compiler->template->properties['function'], $tpl->properties['function']);
-                        // merge filedependency
-                        $tpl->properties['file_dependency'][$tpl->source->uid] = array($tpl->source->filepath, $tpl->source->timestamp,$tpl->source->type);
-                        $compiler->template->properties['file_dependency'] = array_merge($compiler->template->properties['file_dependency'], $tpl->properties['file_dependency']);
-                        // remove header code
-                        $compiled_code = preg_replace("/(<\?php \/\*%%SmartyHeaderCode:{$tpl->properties['nocache_hash']}%%\*\/(.+?)\/\*\/%%SmartyHeaderCode%%\*\/\?>\n)/s", '', $compiled_code);
-                        if ($tpl->has_nocache_code) {
-                            // replace nocache_hash
-                            $compiled_code = str_replace("{$tpl->properties['nocache_hash']}", $compiler->template->properties['nocache_hash'], $compiled_code);
-                            $compiler->template->has_nocache_code = true;
-                        }
-                        $compiler->merged_templates[$tpl->properties['unifunc']] = $compiled_code;
-                        $has_compiled_template = true;
-                    }
-                } else {
-                    $has_compiled_template = true;
-                }
+        if ($merge_compiled_includes) {
+            $c_id = isset($_attr['compile_id']) ? $_attr['compile_id'] : $compiler->template->compile_id;
+            // we must observe different compile_id and caching
+            $t_hash = sha1($c_id . ($_caching ? '--caching' : '--nocaching'));
+            if (!isset($compiler->parent_compiler->mergedSubTemplatesData[$hashResourceName][$t_hash])) {
+                $has_compiled_template =
+                    $this->compileInlineTemplate($compiler, $fullResourceName, $_caching, $hashResourceName, $t_hash,
+                                                 $c_id);
+            } else {
+                $has_compiled_template = true;
             }
         }
         // delete {include} standard attributes
-        unset($_attr['file'], $_attr['assign'], $_attr['cache_id'], $_attr['compile_id'], $_attr['cache_lifetime'], $_attr['nocache'], $_attr['caching'], $_attr['scope'], $_attr['inline']);
+        unset($_attr['file'], $_attr['assign'], $_attr['cache_id'], $_attr['compile_id'], $_attr['cache_lifetime'], $_attr['nocache'], $_attr['caching'], $_attr['scope'], $_attr['inline'], $_attr['bubble_up']);
         // remaining attributes must be assigned as smarty variable
+        $_vars_nc = '';
         if (!empty($_attr)) {
-            if ($_parent_scope == Smarty::SCOPE_LOCAL) {
+            if ($_scope == Smarty::SCOPE_LOCAL) {
+                $_pairs = array();
                 // create variables
                 foreach ($_attr as $key => $value) {
                     $_pairs[] = "'$key'=>$value";
+                    $_vars_nc .= "\$_smarty_tpl->tpl_vars['$key'] =  new Smarty_Variable($value);\n";
                 }
-                $_vars = 'array('.join(',',$_pairs).')';
-                $_has_vars = true;
+                $_vars = 'array(' . join(',', $_pairs) . ')';
             } else {
-                $compiler->trigger_template_error('variable passing not allowed in parent/global scope', $compiler->lex->taglineno);
+                $compiler->trigger_template_error('variable passing not allowed in parent/global scope', null, true);
             }
         } else {
             $_vars = 'array()';
-            $_has_vars = false;
         }
-        if ($has_compiled_template) {
-            $_hash = $compiler->smarty->merged_templates_func[$tpl_name]['nocache_hash'];
-            $_output = "<?php /*  Call merged included template \"" . $tpl_name . "\" */\n";
-            $_output .= "\$_tpl_stack[] = \$_smarty_tpl;\n";
-            $_output .= " \$_smarty_tpl = \$_smarty_tpl->setupInlineSubTemplate($include_file, $_cache_id, $_compile_id, $_caching, $_cache_lifetime, $_vars, $_parent_scope, '$_hash');\n";
+        $update_compile_id = $compiler->template->caching && !$compiler->tag_nocache && !$compiler->nocache &&
+            $_compile_id != '$_smarty_tpl->compile_id';
+        if ($has_compiled_template && !$call_nocache) {
+            $_output = "<?php\n";
+            if ($update_compile_id) {
+                $_output .= $compiler->makeNocacheCode("\$_compile_id_save[] = \$_smarty_tpl->compile_id;\n\$_smarty_tpl->compile_id = {$_compile_id};\n");
+            }
+            if (!empty($_vars_nc) && $_caching == 9999 && $compiler->template->caching) {
+                //$compiler->suppressNocacheProcessing = false;
+                $_output .= substr($compiler->processNocacheCode('<?php ' . $_vars_nc . "?>\n", true), 6, - 3);
+                //$compiler->suppressNocacheProcessing = true;
+            }
             if (isset($_assign)) {
-                $_output .= 'ob_start(); ';
+                $_output .= "ob_start();\n";
             }
-            $_output .= $compiler->smarty->merged_templates_func[$tpl_name]['func']. "(\$_smarty_tpl);\n";
-            $_output .= "\$_smarty_tpl = array_pop(\$_tpl_stack); ";
+            $_output .= "\$_smarty_tpl->smarty->ext->_subtemplate->render(\$_smarty_tpl, {$fullResourceName}, {$_cache_id}, {$_compile_id}, {$_caching}, {$_cache_lifetime}, {$_vars}, {$_scope}, {$_cache_tpl}, '{$compiler->parent_compiler->mergedSubTemplatesData[$hashResourceName][$t_hash]['uid']}', '{$compiler->parent_compiler->mergedSubTemplatesData[$hashResourceName][$t_hash]['func']}');\n";
             if (isset($_assign)) {
-                $_output .= " \$_smarty_tpl->tpl_vars[$_assign] = new Smarty_variable(ob_get_clean());";
+                $_output .= "\$_smarty_tpl->assign({$_assign}, ob_get_clean());\n";
             }
-            $_output .= "/*  End of included template \"" . $tpl_name . "\" */?>";
+            if ($update_compile_id) {
+                $_output .= $compiler->makeNocacheCode("\$_smarty_tpl->compile_id = array_pop(\$_compile_id_save);\n");
+            }
+            $_output .= "?>\n";
+
             return $_output;
         }
 
+        if ($call_nocache) {
+            $compiler->tag_nocache = true;
+        }
+        $_output = "<?php ";
+        if ($update_compile_id) {
+            $_output .= "\$_compile_id_save[] = \$_smarty_tpl->compile_id;\n\$_smarty_tpl->compile_id = {$_compile_id};\n";
+        }
         // was there an assign attribute
         if (isset($_assign)) {
-            $_output = "<?php \$_smarty_tpl->tpl_vars[$_assign] = new Smarty_variable(\$_smarty_tpl->getSubTemplate ($include_file, $_cache_id, $_compile_id, $_caching, $_cache_lifetime, $_vars, $_parent_scope));?>\n";;
-        } else {
-            $_output = "<?php echo \$_smarty_tpl->getSubTemplate ($include_file, $_cache_id, $_compile_id, $_caching, $_cache_lifetime, $_vars, $_parent_scope);?>\n";
+            $_output .= "ob_start();\n";
+        }
+        $_output .= "\$_smarty_tpl->smarty->ext->_subtemplate->render(\$_smarty_tpl, {$fullResourceName}, $_cache_id, $_compile_id, $_caching, $_cache_lifetime, $_vars, $_scope, {$_cache_tpl});\n";
+        if (isset($_assign)) {
+            $_output .= "\$_smarty_tpl->assign({$_assign}, ob_get_clean());\n";
+        }
+        if ($update_compile_id) {
+            $_output .= "\$_smarty_tpl->compile_id = array_pop(\$_compile_id_save);\n";
         }
+        $_output .= "?>\n";
         return $_output;
     }
 
+    /**
+     * Compile inline sub template
+     *
+     * @param \Smarty_Internal_SmartyTemplateCompiler $compiler
+     * @param                                         $fullResourceName
+     * @param                                         $_caching
+     * @param                                         $hashResourceName
+     * @param                                         $t_hash
+     * @param                                         $c_id
+     *
+     * @return bool
+     */
+    public function compileInlineTemplate(Smarty_Internal_SmartyTemplateCompiler $compiler, $fullResourceName,
+                                          $_caching, $hashResourceName, $t_hash, $c_id)
+    {
+        $compiler->smarty->allow_ambiguous_resources = true;
+        /* @var Smarty_Internal_Template $tpl */
+        $tpl =
+            new $compiler->smarty->template_class (trim($fullResourceName, '"\''), $compiler->smarty, $compiler->template,
+                                                   $compiler->template->cache_id, $c_id, $_caching);
+        if (!($tpl->source->handler->uncompiled) && $tpl->source->exists) {
+            $compiler->parent_compiler->mergedSubTemplatesData[$hashResourceName][$t_hash]['uid'] = $tpl->source->uid;
+            if (isset($compiler->template->_inheritance)) {
+                $tpl->_inheritance = clone $compiler->template->_inheritance;
+            }
+            $tpl->compiled = new Smarty_Template_Compiled();
+            $tpl->compiled->nocache_hash = $compiler->parent_compiler->template->compiled->nocache_hash;
+            $tpl->loadCompiler();
+            // save unique function name
+            $compiler->parent_compiler->mergedSubTemplatesData[$hashResourceName][$t_hash]['func'] =
+            $tpl->compiled->unifunc = 'content_' . str_replace(array('.', ','), '_', uniqid('', true));
+            // make sure whole chain gets compiled
+            $tpl->mustCompile = true;
+            $compiler->parent_compiler->mergedSubTemplatesData[$hashResourceName][$t_hash]['nocache_hash'] =
+                $tpl->compiled->nocache_hash;
+            // get compiled code
+            $compiled_code = "<?php\n\n";
+            $compiled_code .= "/* Start inline template \"{$tpl->source->type}:{$tpl->source->name}\" =============================*/\n";
+            $compiled_code .= "function {$tpl->compiled->unifunc} (\$_smarty_tpl) {\n";
+            $compiled_code .= "?>\n" . $tpl->compiler->compileTemplateSource($tpl, null, $compiler->parent_compiler);
+            $compiled_code .= "<?php\n";
+            $compiled_code .= "}\n?>\n";
+            $compiled_code .= $tpl->compiler->postFilter($tpl->compiler->blockOrFunctionCode);
+            $compiled_code .= "<?php\n\n";
+            $compiled_code .= "/* End inline template \"{$tpl->source->type}:{$tpl->source->name}\" =============================*/\n";
+            $compiled_code .= "?>";
+            unset($tpl->compiler);
+            if ($tpl->compiled->has_nocache_code) {
+                // replace nocache_hash
+                $compiled_code =
+                    str_replace("{$tpl->compiled->nocache_hash}", $compiler->template->compiled->nocache_hash,
+                                $compiled_code);
+                $compiler->template->compiled->has_nocache_code = true;
+            }
+            $compiler->parent_compiler->mergedSubTemplatesCode[$tpl->compiled->unifunc] = $compiled_code;
+            return true;
+        } else {
+            return false;
+        }
+    }
 }
-
-?>
\ No newline at end of file
diff --git a/include/smarty/libs/sysplugins/smarty_internal_compile_include_php.php b/include/smarty/libs/sysplugins/smarty_internal_compile_include_php.php
index d52712368..e7e62997c 100644
--- a/include/smarty/libs/sysplugins/smarty_internal_compile_include_php.php
+++ b/include/smarty/libs/sysplugins/smarty_internal_compile_include_php.php
@@ -1,22 +1,21 @@
 <?php
 /**
  * Smarty Internal Plugin Compile Include PHP
- *
  * Compiles the {include_php} tag
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage Compiler
- * @author Uwe Tews
+ * @author     Uwe Tews
  */
 
 /**
  * Smarty Internal Plugin Compile Insert Class
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage Compiler
  */
-class Smarty_Internal_Compile_Include_Php extends Smarty_Internal_CompileBase {
-
+class Smarty_Internal_Compile_Include_Php extends Smarty_Internal_CompileBase
+{
     /**
      * Attribute definition: Overwrites base class.
      *
@@ -24,6 +23,7 @@ class Smarty_Internal_Compile_Include_Php extends Smarty_Internal_CompileBase {
      * @see Smarty_Internal_CompileBase
      */
     public $required_attributes = array('file');
+
     /**
      * Attribute definition: Overwrites base class.
      *
@@ -31,6 +31,7 @@ class Smarty_Internal_Compile_Include_Php extends Smarty_Internal_CompileBase {
      * @see Smarty_Internal_CompileBase
      */
     public $shorttag_order = array('file');
+
     /**
      * Attribute definition: Overwrites base class.
      *
@@ -42,11 +43,14 @@ class Smarty_Internal_Compile_Include_Php extends Smarty_Internal_CompileBase {
     /**
      * Compiles code for the {include_php} tag
      *
-     * @param array  $args     array with attributes from parser
-     * @param object $compiler compiler object
-     * @return string compiled code
+     * @param  array                                $args     array with attributes from parser
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object
+     *
+     * @return string
+     * @throws \SmartyCompilerException
+     * @throws \SmartyException
      */
-    public function compile($args, $compiler)
+    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler)
     {
         if (!($compiler->smarty instanceof SmartyBC)) {
             throw new SmartyException("{include_php} is deprecated, use SmartyBC class to enable");
@@ -54,13 +58,15 @@ class Smarty_Internal_Compile_Include_Php extends Smarty_Internal_CompileBase {
         // check and get attributes
         $_attr = $this->getAttributes($compiler, $args);
 
-        $_output = '<?php ';
-
+        /** @var Smarty_Internal_Template $_smarty_tpl
+         * used in evaluated code
+         */
         $_smarty_tpl = $compiler->template;
         $_filepath = false;
-        eval('$_file = ' . $_attr['file'] . ';');
+        $_file = null;
+        eval('$_file = @' . $_attr['file'] . ';');
         if (!isset($compiler->smarty->security_policy) && file_exists($_file)) {
-            $_filepath = $_file;
+            $_filepath = $compiler->smarty->_realpath($_file, true);
         } else {
             if (isset($compiler->smarty->security_policy)) {
                 $_dir = $compiler->smarty->security_policy->trusted_dir;
@@ -68,17 +74,17 @@ class Smarty_Internal_Compile_Include_Php extends Smarty_Internal_CompileBase {
                 $_dir = $compiler->smarty->trusted_dir;
             }
             if (!empty($_dir)) {
-                foreach((array)$_dir as $_script_dir) {
-                    $_script_dir = rtrim($_script_dir, '/\\') . DS;
-                    if (file_exists($_script_dir . $_file)) {
-                        $_filepath = $_script_dir .  $_file;
+                foreach ((array) $_dir as $_script_dir) {
+                    $_path = $compiler->smarty->_realpath($_script_dir . DS . $_file, true);
+                    if (file_exists($_path)) {
+                        $_filepath = $_path;
                         break;
                     }
                 }
             }
         }
         if ($_filepath == false) {
-            $compiler->trigger_template_error("{include_php} file '{$_file}' is not readable", $compiler->lex->taglineno);
+            $compiler->trigger_template_error("{include_php} file '{$_file}' is not readable", null, true);
         }
 
         if (isset($compiler->smarty->security_policy)) {
@@ -97,12 +103,9 @@ class Smarty_Internal_Compile_Include_Php extends Smarty_Internal_CompileBase {
         }
 
         if (isset($_assign)) {
-            return "<?php ob_start(); include{$_once} ('{$_filepath}'); \$_smarty_tpl->assign({$_assign},ob_get_contents()); ob_end_clean();?>";
+            return "<?php ob_start();\ninclude{$_once} ('{$_filepath}');\n\$_smarty_tpl->assign({$_assign},ob_get_clean());\n?>";
         } else {
             return "<?php include{$_once} ('{$_filepath}');?>\n";
         }
     }
-
 }
-
-?>
\ No newline at end of file
diff --git a/include/smarty/libs/sysplugins/smarty_internal_compile_insert.php b/include/smarty/libs/sysplugins/smarty_internal_compile_insert.php
index e4d3f9355..2ebde1661 100644
--- a/include/smarty/libs/sysplugins/smarty_internal_compile_insert.php
+++ b/include/smarty/libs/sysplugins/smarty_internal_compile_insert.php
@@ -2,22 +2,21 @@
 
 /**
  * Smarty Internal Plugin Compile Insert
- *
  * Compiles the {insert} tag
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage Compiler
- * @author Uwe Tews
+ * @author     Uwe Tews
  */
 
 /**
  * Smarty Internal Plugin Compile Insert Class
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage Compiler
  */
-class Smarty_Internal_Compile_Insert extends Smarty_Internal_CompileBase {
-
+class Smarty_Internal_Compile_Insert extends Smarty_Internal_CompileBase
+{
     /**
      * Attribute definition: Overwrites base class.
      *
@@ -25,6 +24,7 @@ class Smarty_Internal_Compile_Insert extends Smarty_Internal_CompileBase {
      * @see Smarty_Internal_CompileBase
      */
     public $required_attributes = array('name');
+
     /**
      * Attribute definition: Overwrites base class.
      *
@@ -32,6 +32,7 @@ class Smarty_Internal_Compile_Insert extends Smarty_Internal_CompileBase {
      * @see Smarty_Internal_CompileBase
      */
     public $shorttag_order = array('name');
+
     /**
      * Attribute definition: Overwrites base class.
      *
@@ -43,36 +44,46 @@ class Smarty_Internal_Compile_Insert extends Smarty_Internal_CompileBase {
     /**
      * Compiles code for the {insert} tag
      *
-     * @param array  $args     array with attributes from parser
-     * @param object $compiler compiler object
+     * @param  array                                $args     array with attributes from parser
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object
+     *
      * @return string compiled code
+     * @throws \SmartyCompilerException
      */
-    public function compile($args, $compiler)
+    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler)
     {
         // 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;
         $_script = null;
 
         $_output = '<?php ';
-        // save posible attributes
-        eval('$_name = ' . $_attr['name'] . ';');
+        // save possible attributes
+        eval('$_name = @' . $_attr['name'] . ';');
         if (isset($_attr['assign'])) {
             // output will be stored in a smarty variable instead of being displayed
             $_assign = $_attr['assign'];
-            // create variable to make shure that the compiler knows about its nocache status
-            $compiler->template->tpl_vars[trim($_attr['assign'], "'")] = new Smarty_Variable(null, true);
+            // create variable to make sure that the compiler knows about its nocache status
+            $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
             $_function = "smarty_insert_{$_name}";
             $_smarty_tpl = $compiler->template;
             $_filepath = false;
-            eval('$_script = ' . $_attr['script'] . ';');
+            eval('$_script = @' . $_attr['script'] . ';');
             if (!isset($compiler->smarty->security_policy) && file_exists($_script)) {
                 $_filepath = $_script;
             } else {
@@ -82,7 +93,7 @@ class Smarty_Internal_Compile_Insert extends Smarty_Internal_CompileBase {
                     $_dir = $compiler->smarty->trusted_dir;
                 }
                 if (!empty($_dir)) {
-                    foreach((array)$_dir as $_script_dir) {
+                    foreach ((array) $_dir as $_script_dir) {
                         $_script_dir = rtrim($_script_dir, '/\\') . DS;
                         if (file_exists($_script_dir . $_script)) {
                             $_filepath = $_script_dir . $_script;
@@ -92,13 +103,13 @@ class Smarty_Internal_Compile_Insert extends Smarty_Internal_CompileBase {
                 }
             }
             if ($_filepath == false) {
-                $compiler->trigger_template_error("{insert} missing script file '{$_script}'", $compiler->lex->taglineno);
+                $compiler->trigger_template_error("{insert} missing script file '{$_script}'", null, true);
             }
             // code for script file loading
             $_output .= "require_once '{$_filepath}' ;";
             require_once $_filepath;
             if (!is_callable($_function)) {
-                $compiler->trigger_template_error(" {insert} function '{$_function}' is not callable in script file '{$_script}'", $compiler->lex->taglineno);
+                $compiler->trigger_template_error(" {insert} function '{$_function}' is not callable in script file '{$_script}'", null, true);
             }
         } else {
             $_filepath = 'null';
@@ -107,7 +118,7 @@ class Smarty_Internal_Compile_Insert extends Smarty_Internal_CompileBase {
             if (!is_callable($_function)) {
                 // try plugin
                 if (!$_function = $compiler->getPlugin($_name, 'insert')) {
-                    $compiler->trigger_template_error("{insert} no function or plugin found for '{$_name}'", $compiler->lex->taglineno);
+                    $compiler->trigger_template_error("{insert} no function or plugin found for '{$_name}'", null, true);
                 }
             }
         }
@@ -121,22 +132,20 @@ class Smarty_Internal_Compile_Insert extends Smarty_Internal_CompileBase {
         $_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);?>";
             }
         }
+
         return $_output;
     }
-
 }
-
-?>
\ No newline at end of file
diff --git a/include/smarty/libs/sysplugins/smarty_internal_compile_ldelim.php b/include/smarty/libs/sysplugins/smarty_internal_compile_ldelim.php
index 990632590..8c6b701e1 100644
--- a/include/smarty/libs/sysplugins/smarty_internal_compile_ldelim.php
+++ b/include/smarty/libs/sysplugins/smarty_internal_compile_ldelim.php
@@ -1,41 +1,40 @@
 <?php
 /**
  * Smarty Internal Plugin Compile Ldelim
- *
  * Compiles the {ldelim} tag
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage Compiler
- * @author Uwe Tews
+ * @author     Uwe Tews
  */
 
 /**
  * Smarty Internal Plugin Compile Ldelim Class
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage Compiler
  */
-class Smarty_Internal_Compile_Ldelim extends Smarty_Internal_CompileBase {
-
+class Smarty_Internal_Compile_Ldelim extends Smarty_Internal_CompileBase
+{
     /**
      * Compiles code for the {ldelim} tag
-     *
      * This tag does output the left delimiter
-     * @param array  $args     array with attributes from parser
-     * @param object $compiler compiler object
+     *
+     * @param  array                                $args     array with attributes from parser
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object
+     *
      * @return string compiled code
+     * @throws \SmartyCompilerException
      */
-    public function compile($args, $compiler)
+    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler)
     {
         $_attr = $this->getAttributes($compiler, $args);
         if ($_attr['nocache'] === true) {
-            $compiler->trigger_template_error('nocache option not allowed', $compiler->lex->taglineno);
+            $compiler->trigger_template_error('nocache option not allowed', null, true);
         }
         // this tag does not return compiled code
         $compiler->has_code = true;
+
         return $compiler->smarty->left_delimiter;
     }
-
 }
-
-?>
diff --git a/include/smarty/libs/sysplugins/smarty_internal_compile_nocache.php b/include/smarty/libs/sysplugins/smarty_internal_compile_nocache.php
index 5fb71b71d..b29a993aa 100644
--- a/include/smarty/libs/sysplugins/smarty_internal_compile_nocache.php
+++ b/include/smarty/libs/sysplugins/smarty_internal_compile_nocache.php
@@ -1,73 +1,75 @@
 <?php
 /**
  * Smarty Internal Plugin Compile Nocache
- *
  * Compiles the {nocache} {/nocache} tags.
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage Compiler
- * @author Uwe Tews
+ * @author     Uwe Tews
  */
 
 /**
- * Smarty Internal Plugin Compile Nocache Classv
+ * Smarty Internal Plugin Compile Nocache Class
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage Compiler
  */
-class Smarty_Internal_Compile_Nocache extends Smarty_Internal_CompileBase {
+class Smarty_Internal_Compile_Nocache extends Smarty_Internal_CompileBase
+{
+    /**
+     * Array of names of valid option flags
+     *
+     * @var array
+     */
+    public $option_flags = array();
 
     /**
      * Compiles code for the {nocache} tag
-     *
      * This tag does not generate compiled output. It only sets a compiler flag.
      *
-     * @param array  $args     array with attributes from parser
-     * @param object $compiler compiler object
+     * @param  array                                $args     array with attributes from parser
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object
+     *
      * @return bool
      */
-    public function compile($args, $compiler)
+    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler)
     {
         $_attr = $this->getAttributes($compiler, $args);
-        if ($_attr['nocache'] === true) {
-            $compiler->trigger_template_error('nocache option not allowed', $compiler->lex->taglineno);
-        }
+        $this->openTag($compiler, 'nocache', array($compiler->nocache));
         // enter nocache mode
         $compiler->nocache = true;
         // this tag does not return compiled code
         $compiler->has_code = false;
+
         return true;
     }
-
 }
 
 /**
  * Smarty Internal Plugin Compile Nocacheclose Class
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage Compiler
  */
-class Smarty_Internal_Compile_Nocacheclose extends Smarty_Internal_CompileBase {
-
+class Smarty_Internal_Compile_Nocacheclose extends Smarty_Internal_CompileBase
+{
     /**
      * Compiles code for the {/nocache} tag
-     *
      * This tag does not generate compiled output. It only sets a compiler flag.
      *
-     * @param array  $args     array with attributes from parser
-     * @param object $compiler compiler object
+     * @param  array                                $args     array with attributes from parser
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object
+     *
      * @return bool
      */
-    public function compile($args, $compiler)
+    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler)
     {
         $_attr = $this->getAttributes($compiler, $args);
         // leave nocache mode
-        $compiler->nocache = false;
+        list($compiler->nocache) = $this->closeTag($compiler, array('nocache'));
         // this tag does not return compiled code
         $compiler->has_code = false;
+
         return true;
     }
-
 }
-
-?>
\ No newline at end of file
diff --git a/include/smarty/libs/sysplugins/smarty_internal_compile_private_block_plugin.php b/include/smarty/libs/sysplugins/smarty_internal_compile_private_block_plugin.php
index 5288f4560..9e2eea233 100644
--- a/include/smarty/libs/sysplugins/smarty_internal_compile_private_block_plugin.php
+++ b/include/smarty/libs/sysplugins/smarty_internal_compile_private_block_plugin.php
@@ -1,22 +1,21 @@
 <?php
 /**
  * Smarty Internal Plugin Compile Block Plugin
- *
  * Compiles code for the execution of block plugin
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage Compiler
- * @author Uwe Tews
+ * @author     Uwe Tews
  */
 
 /**
  * Smarty Internal Plugin Compile Block Plugin Class
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage Compiler
  */
-class Smarty_Internal_Compile_Private_Block_Plugin extends Smarty_Internal_CompileBase {
-
+class Smarty_Internal_Compile_Private_Block_Plugin extends Smarty_Internal_CompileBase
+{
     /**
      * Attribute definition: Overwrites base class.
      *
@@ -28,23 +27,24 @@ class Smarty_Internal_Compile_Private_Block_Plugin extends Smarty_Internal_Compi
     /**
      * Compiles code for the execution of block plugin
      *
-     * @param array  $args      array with attributes from parser
-     * @param object $compiler  compiler object
-     * @param array  $parameter array with compilation parameter
-     * @param string $tag       name of block plugin
-     * @param string $function  PHP function name
+     * @param  array                                $args      array with attributes from parser
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler  compiler object
+     * @param  array                                $parameter array with compilation parameter
+     * @param  string                               $tag       name of block plugin
+     * @param  string                               $function  PHP function name
+     *
      * @return string compiled code
      */
-    public function compile($args, $compiler, $parameter, $tag, $function)
+    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter, $tag, $function)
     {
-        if (!isset($tag[5]) || substr($tag, -5) != 'close') {
+        if (!isset($tag[5]) || substr($tag, - 5) != 'close') {
             // opening tag of block plugin
             // check and get attributes
             $_attr = $this->getAttributes($compiler, $args);
             if ($_attr['nocache'] === true) {
                 $compiler->tag_nocache = true;
             }
-               unset($_attr['nocache']);
+            unset($_attr['nocache']);
             // convert attributes into parameter array string
             $_paramsArray = array();
             foreach ($_attr as $_key => $_value) {
@@ -60,28 +60,30 @@ class Smarty_Internal_Compile_Private_Block_Plugin extends Smarty_Internal_Compi
             // maybe nocache because of nocache variables or nocache plugin
             $compiler->nocache = $compiler->nocache | $compiler->tag_nocache;
             // compile code
-            $output = "<?php \$_smarty_tpl->smarty->_tag_stack[] = array('{$tag}', {$_params}); \$_block_repeat=true; echo {$function}({$_params}, null, \$_smarty_tpl, \$_block_repeat);while (\$_block_repeat) { ob_start();?>";
+            $output = "<?php \$_smarty_tpl->smarty->_cache['tag_stack'][] = array('{$tag}', {$_params}); \$_block_repeat=true; echo {$function}({$_params}, null, \$_smarty_tpl, \$_block_repeat);while (\$_block_repeat) { ob_start();?>";
         } else {
             // must endblock be nocache?
             if ($compiler->nocache) {
                 $compiler->tag_nocache = true;
             }
             // closing tag of block plugin, restore nocache
-            list($_params, $compiler->nocache) = $this->closeTag($compiler, substr($tag, 0, -5));
+            list($_params, $compiler->nocache) = $this->closeTag($compiler, substr($tag, 0, - 5));
             // This tag does create output
             $compiler->has_output = true;
             // compile code
             if (!isset($parameter['modifier_list'])) {
-                $mod_pre = $mod_post ='';
+                $mod_pre = $mod_post = '';
             } else {
                 $mod_pre = ' ob_start(); ';
-                $mod_post = 'echo '.$compiler->compileTag('private_modifier',array(),array('modifierlist'=>$parameter['modifier_list'],'value'=>'ob_get_clean()')).';';
+                $mod_post = 'echo ' .
+                    $compiler->compileTag('private_modifier', array(), array('modifierlist' => $parameter['modifier_list'],
+                                                                             'value'        => 'ob_get_clean()')) . ';';
             }
-            $output = "<?php \$_block_content = ob_get_clean(); \$_block_repeat=false;".$mod_pre." echo {$function}({$_params}, \$_block_content, \$_smarty_tpl, \$_block_repeat); ".$mod_post." } array_pop(\$_smarty_tpl->smarty->_tag_stack);?>";
+            $output = "<?php \$_block_content = ob_get_clean(); \$_block_repeat=false;" . $mod_pre .
+                " echo {$function}({$_params}, \$_block_content, \$_smarty_tpl, \$_block_repeat); " . $mod_post .
+                " } array_pop(\$_smarty_tpl->smarty->_cache['tag_stack']);?>";
         }
+
         return $output . "\n";
     }
-
 }
-
-?>
\ No newline at end of file
diff --git a/include/smarty/libs/sysplugins/smarty_internal_compile_private_foreachsection.php b/include/smarty/libs/sysplugins/smarty_internal_compile_private_foreachsection.php
new file mode 100644
index 000000000..50c25bdb6
--- /dev/null
+++ b/include/smarty/libs/sysplugins/smarty_internal_compile_private_foreachsection.php
@@ -0,0 +1,223 @@
+<?php
+/**
+ * Smarty Internal Plugin Compile ForeachSection
+ * Shared methods for {foreach} {section} tags
+ *
+ * @package    Smarty
+ * @subpackage Compiler
+ * @author     Uwe Tews
+ */
+
+/**
+ * Smarty Internal Plugin Compile ForeachSection Class
+ *
+ * @package    Smarty
+ * @subpackage Compiler
+ */
+class Smarty_Internal_Compile_Private_ForeachSection extends Smarty_Internal_CompileBase
+{
+
+    /**
+     * Preg search pattern
+     *
+     * @var string
+     */
+    private $propertyPreg = '';
+
+    /**
+     * Offsets in preg match result
+     *
+     * @var array
+     */
+    private $resultOffsets = array();
+
+    /**
+     * Start offset
+     *
+     * @var int
+     */
+    private $startOffset = 0;
+
+    /**
+     * Name of this tag
+     *
+     * @var string
+     */
+    public $tagName = '';
+
+    /**
+     * Valid properties of $smarty.xxx variable
+     *
+     * @var array
+     */
+    public static $nameProperties = array();
+
+    /**
+     * {section} tag has no item properties
+     *
+     * @var array
+     */
+    public $itemProperties = null;
+
+    /**
+     * {section} tag has always name attribute
+     *
+     * @var bool
+     */
+    public $isNamed = true;
+
+    /**
+     * @var array
+     */
+    public $matchResults = array();
+
+    /**
+     * Scan sources for used tag attributes
+     *
+     * @param  array                                $attributes
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler
+     */
+    public function scanForProperties($attributes, Smarty_Internal_TemplateCompilerBase $compiler)
+    {
+        $this->propertyPreg = '~(';
+        $this->startOffset = 0;
+        $this->resultOffsets = array();
+        $this->matchResults = array('named' => array(), 'item' => array());
+        if ($this->isNamed) {
+            $this->buildPropertyPreg(true, $attributes);
+        }
+        if (isset($this->itemProperties)) {
+            if ($this->isNamed) {
+                $this->propertyPreg .= '|';
+            }
+            $this->buildPropertyPreg(false, $attributes);
+        }
+        $this->propertyPreg .= ')\W~i';
+        // Template source
+        $this->matchTemplateSource($compiler);
+        // Parent template source
+        $this->matchParentTemplateSource($compiler);
+        // {block} source
+        $this->matchBlockSource($compiler);
+    }
+
+    /**
+     * Build property preg string
+     *
+     * @param bool  $named
+     * @param array $attributes
+     */
+    public function buildPropertyPreg($named, $attributes)
+    {
+        if ($named) {
+            $this->resultOffsets['named'] = $this->startOffset + 3;
+            $this->propertyPreg .= "([\$]smarty[.]{$this->tagName}[.]{$attributes['name']}[.](";
+            $className = get_class($this);
+            $properties = $className::$nameProperties;
+        } else {
+            $this->resultOffsets['item'] = $this->startOffset + 3;
+            $this->propertyPreg .= "([\$]{$attributes['item']}[@](";
+            $properties = $this->itemProperties;
+        }
+        $this->startOffset += count($properties) + 2;
+        $propName = reset($properties);
+        while ($propName) {
+            $this->propertyPreg .= "({$propName})";
+            $propName = next($properties);
+            if ($propName) {
+                $this->propertyPreg .= '|';
+            }
+        }
+        $this->propertyPreg .= '))';
+    }
+
+    /**
+     * Find matches in source string
+     *
+     * @param string $source
+     */
+    public function matchProperty($source)
+    {
+        preg_match_all($this->propertyPreg, $source, $match, PREG_SET_ORDER);
+        foreach ($this->resultOffsets as $key => $offset) {
+            foreach ($match as $m) {
+                if (isset($m[$offset]) && !empty($m[$offset])) {
+                    $this->matchResults[$key][strtolower($m[$offset])] = true;
+                }
+            }
+        }
+    }
+
+    /**
+     * Find matches in template source
+     *
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler
+     */
+    public function matchTemplateSource(Smarty_Internal_TemplateCompilerBase $compiler)
+    {
+        $this->matchProperty($compiler->parser->lex->data);
+    }
+
+    /**
+     * Find matches in all parent template source
+     *
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler
+     */
+    public function matchParentTemplateSource(Smarty_Internal_TemplateCompilerBase $compiler)
+    {
+        // search parent compiler template source
+        $nextCompiler = $compiler;
+        while ($nextCompiler !== $nextCompiler->parent_compiler) {
+            $nextCompiler = $nextCompiler->parent_compiler;
+            if ($compiler !== $nextCompiler) {
+                // get template source
+                $_content = $nextCompiler->template->source->getContent();
+                if ($_content != '') {
+                    // run pre filter if required
+                    if ((isset($nextCompiler->smarty->autoload_filters['pre']) ||
+                            isset($nextCompiler->smarty->registered_filters['pre']))) {
+                        $_content = $nextCompiler->smarty->ext->_filter_Handler->runFilter('pre', $_content, $nextCompiler->template);
+                    }
+                    $this->matchProperty($_content);
+                }
+            }
+        }
+    }
+
+    /**
+     * Find matches in {block} tag source
+     *
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler
+     */
+    public function matchBlockSource(Smarty_Internal_TemplateCompilerBase $compiler)
+    {
+
+    }
+
+    /**
+     * Compiles code for the {$smarty.foreach.xxx} or {$smarty.section.xxx}tag
+     *
+     * @param  array                                $args      array with attributes from parser
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler  compiler object
+     * @param  array                                $parameter array with compilation parameter
+     *
+     * @return string compiled code
+     * @throws \SmartyCompilerException
+     */
+    public static function compileSpecialVariable($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter)
+    {
+        $tag = strtolower(trim($parameter[ 0 ], '"\''));
+        $name = isset($parameter[ 1 ]) ? $compiler->getId($parameter[ 1 ]) : false;
+        if (!$name) {
+            $compiler->trigger_template_error("missing or illegal \$smarty.{$tag} name attribute", null, true);
+        }
+        /* @var Smarty_Internal_Compile_Foreach|Smarty_Internal_Compile_Section $className */
+        $className = 'Smarty_Internal_Compile_' . ucfirst($tag);
+        $property = isset($parameter[ 2 ]) ? strtolower($compiler->getId($parameter[ 2 ])) : false;
+        if (!$property || !in_array($property, $className::$nameProperties)) {
+            $compiler->trigger_template_error("missing or illegal \$smarty.{$tag} property attribute", null, true);
+        }
+        $tagVar = "'__smarty_{$tag}_{$name}'";
+        return "(isset(\$_smarty_tpl->tpl_vars[{$tagVar}]->value['{$property}']) ? \$_smarty_tpl->tpl_vars[{$tagVar}]->value['{$property}'] : null)";
+    }
+}
\ No newline at end of file
diff --git a/include/smarty/libs/sysplugins/smarty_internal_compile_private_function_plugin.php b/include/smarty/libs/sysplugins/smarty_internal_compile_private_function_plugin.php
index 70e764318..0d0ab8138 100644
--- a/include/smarty/libs/sysplugins/smarty_internal_compile_private_function_plugin.php
+++ b/include/smarty/libs/sysplugins/smarty_internal_compile_private_function_plugin.php
@@ -1,22 +1,21 @@
 <?php
 /**
  * Smarty Internal Plugin Compile Function Plugin
- *
  * Compiles code for the execution of function plugin
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage Compiler
- * @author Uwe Tews
+ * @author     Uwe Tews
  */
 
 /**
  * Smarty Internal Plugin Compile Function Plugin Class
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage Compiler
  */
-class Smarty_Internal_Compile_Private_Function_Plugin extends Smarty_Internal_CompileBase {
-
+class Smarty_Internal_Compile_Private_Function_Plugin extends Smarty_Internal_CompileBase
+{
     /**
      * Attribute definition: Overwrites base class.
      *
@@ -24,6 +23,7 @@ class Smarty_Internal_Compile_Private_Function_Plugin extends Smarty_Internal_Co
      * @see Smarty_Internal_CompileBase
      */
     public $required_attributes = array();
+
     /**
      * Attribute definition: Overwrites base class.
      *
@@ -35,14 +35,15 @@ class Smarty_Internal_Compile_Private_Function_Plugin extends Smarty_Internal_Co
     /**
      * Compiles code for the execution of function plugin
      *
-     * @param array $args array with attributes from parser
-     * @param object $compiler compiler object
-     * @param array $parameter array with compilation parameter
-     * @param string $tag name of function plugin
-     * @param string $function PHP function name
+     * @param  array                                $args     array with attributes from parser
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object
+     * @param  array  $parameter array with compilation parameter
+     * @param  string $tag       name of function plugin
+     * @param  string                               $function PHP function name
+     *
      * @return string compiled code
      */
-    public function compile($args, $compiler, $parameter, $tag, $function)
+    public function compile($args, Smarty_Internal_TemplateCompilerBase  $compiler, $parameter, $tag, $function)
     {
         // This tag does create output
         $compiler->has_output = true;
@@ -65,9 +66,7 @@ class Smarty_Internal_Compile_Private_Function_Plugin extends Smarty_Internal_Co
         $_params = 'array(' . implode(",", $_paramsArray) . ')';
         // compile code
         $output = "<?php echo {$function}({$_params},\$_smarty_tpl);?>\n";
+
         return $output;
     }
-
 }
-
-?>
\ No newline at end of file
diff --git a/include/smarty/libs/sysplugins/smarty_internal_compile_private_modifier.php b/include/smarty/libs/sysplugins/smarty_internal_compile_private_modifier.php
index a33109cc0..9594d2ae7 100644
--- a/include/smarty/libs/sysplugins/smarty_internal_compile_private_modifier.php
+++ b/include/smarty/libs/sysplugins/smarty_internal_compile_private_modifier.php
@@ -2,31 +2,33 @@
 
 /**
  * Smarty Internal Plugin Compile Modifier
- *
  * Compiles code for modifier execution
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage Compiler
- * @author Uwe Tews
+ * @author     Uwe Tews
  */
 
 /**
  * Smarty Internal Plugin Compile Modifier Class
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage Compiler
  */
-class Smarty_Internal_Compile_Private_Modifier extends Smarty_Internal_CompileBase {
-
+class Smarty_Internal_Compile_Private_Modifier extends Smarty_Internal_CompileBase
+{
     /**
      * Compiles code for modifier execution
      *
-     * @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 \Smarty_Internal_TemplateCompilerBase $compiler  compiler object
+     * @param  array                                $parameter array with compilation parameter
+     *
      * @return string compiled code
+     * @throws \SmartyCompilerException
      */
-    public function compile($args, $compiler, $parameter) {
+    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter)
+    {
         // check and get attributes
         $_attr = $this->getAttributes($compiler, $args);
         $output = $parameter['value'];
@@ -51,7 +53,8 @@ class Smarty_Internal_Compile_Private_Modifier extends Smarty_Internal_CompileBa
                                 $output = "{$function}({$params})";
                             } else {
                                 if (is_object($function[0])) {
-                                    $output = '$_smarty_tpl->smarty->registered_plugins[Smarty::PLUGIN_MODIFIER][\'' . $modifier . '\'][0][0]->' . $function[1] . '(' . $params . ')';
+                                    $output = '$_smarty_tpl->smarty->registered_plugins[Smarty::PLUGIN_MODIFIER][\'' .
+                                        $modifier . '\'][0][0]->' . $function[1] . '(' . $params . ')';
                                 } else {
                                     $output = $function[0] . '::' . $function[1] . '(' . $params . ')';
                                 }
@@ -72,7 +75,9 @@ class Smarty_Internal_Compile_Private_Modifier extends Smarty_Internal_CompileBa
                         // modifiercompiler plugin
                         if ($compiler->smarty->loadPlugin('smarty_modifiercompiler_' . $modifier)) {
                             // check if modifier allowed
-                            if (!is_object($compiler->smarty->security_policy) || $compiler->smarty->security_policy->isTrustedModifier($modifier, $compiler)) {
+                            if (!is_object($compiler->smarty->security_policy) ||
+                                $compiler->smarty->security_policy->isTrustedModifier($modifier, $compiler)
+                            ) {
                                 $plugin = 'smarty_modifiercompiler_' . $modifier;
                                 $output = $plugin($single_modifier, $compiler);
                             }
@@ -84,7 +89,9 @@ class Smarty_Internal_Compile_Private_Modifier extends Smarty_Internal_CompileBa
                         // modifier plugin
                         if ($function = $compiler->getPlugin($modifier, Smarty::PLUGIN_MODIFIER)) {
                             // check if modifier allowed
-                            if (!is_object($compiler->smarty->security_policy) || $compiler->smarty->security_policy->isTrustedModifier($modifier, $compiler)) {
+                            if (!is_object($compiler->smarty->security_policy) ||
+                                $compiler->smarty->security_policy->isTrustedModifier($modifier, $compiler)
+                            ) {
                                 $output = "{$function}({$params})";
                             }
                             $compiler->known_modifier_type[$modifier] = $type;
@@ -95,7 +102,9 @@ class Smarty_Internal_Compile_Private_Modifier extends Smarty_Internal_CompileBa
                         // PHP function
                         if (is_callable($modifier)) {
                             // check if modifier allowed
-                            if (!is_object($compiler->smarty->security_policy) || $compiler->smarty->security_policy->isTrustedPhpModifier($modifier, $compiler)) {
+                            if (!is_object($compiler->smarty->security_policy) ||
+                                $compiler->smarty->security_policy->isTrustedPhpModifier($modifier, $compiler)
+                            ) {
                                 $output = "{$modifier}({$params})";
                             }
                             $compiler->known_modifier_type[$modifier] = $type;
@@ -104,21 +113,29 @@ class Smarty_Internal_Compile_Private_Modifier extends Smarty_Internal_CompileBa
                         break;
                     case 6:
                         // default plugin handler
-                        if (isset($compiler->default_handler_plugins[Smarty::PLUGIN_MODIFIER][$modifier]) || (is_callable($compiler->smarty->default_plugin_handler_func) && $compiler->getPluginFromDefaultHandler($modifier, Smarty::PLUGIN_MODIFIER))) {
+                        if (isset($compiler->default_handler_plugins[Smarty::PLUGIN_MODIFIER][$modifier]) ||
+                            (is_callable($compiler->smarty->default_plugin_handler_func) &&
+                                $compiler->getPluginFromDefaultHandler($modifier, Smarty::PLUGIN_MODIFIER))
+                        ) {
                             $function = $compiler->default_handler_plugins[Smarty::PLUGIN_MODIFIER][$modifier][0];
                             // check if modifier allowed
-                            if (!is_object($compiler->smarty->security_policy) || $compiler->smarty->security_policy->isTrustedModifier($modifier, $compiler)) {
+                            if (!is_object($compiler->smarty->security_policy) ||
+                                $compiler->smarty->security_policy->isTrustedModifier($modifier, $compiler)
+                            ) {
                                 if (!is_array($function)) {
                                     $output = "{$function}({$params})";
                                 } else {
                                     if (is_object($function[0])) {
-                                        $output = '$_smarty_tpl->smarty->registered_plugins[Smarty::PLUGIN_MODIFIER][\'' . $modifier . '\'][0][0]->' . $function[1] . '(' . $params . ')';
+                                        $output = '$_smarty_tpl->smarty->registered_plugins[Smarty::PLUGIN_MODIFIER][\'' .
+                                            $modifier . '\'][0][0]->' . $function[1] . '(' . $params . ')';
                                     } else {
                                         $output = $function[0] . '::' . $function[1] . '(' . $params . ')';
                                     }
                                 }
                             }
-                            if (isset($compiler->template->required_plugins['nocache'][$modifier][Smarty::PLUGIN_MODIFIER]['file']) || isset($compiler->template->required_plugins['compiled'][$modifier][Smarty::PLUGIN_MODIFIER]['file'])) {
+                            if (isset($compiler->parent_compiler->template->compiled->required_plugins['nocache'][$modifier][Smarty::PLUGIN_MODIFIER]['file']) ||
+                                isset($compiler->parent_compiler->template->compiled->required_plugins['compiled'][$modifier][Smarty::PLUGIN_MODIFIER]['file'])
+                            ) {
                                 // was a plugin
                                 $compiler->known_modifier_type[$modifier] = 4;
                             } else {
@@ -129,12 +146,10 @@ class Smarty_Internal_Compile_Private_Modifier extends Smarty_Internal_CompileBa
                 }
             }
             if (!isset($compiler->known_modifier_type[$modifier])) {
-                $compiler->trigger_template_error("unknown modifier \"" . $modifier . "\"", $compiler->lex->taglineno);
+                $compiler->trigger_template_error("unknown modifier \"" . $modifier . "\"", null, true);
             }
         }
+
         return $output;
     }
-
 }
-
-?>
\ No newline at end of file
diff --git a/include/smarty/libs/sysplugins/smarty_internal_compile_private_object_block_function.php b/include/smarty/libs/sysplugins/smarty_internal_compile_private_object_block_function.php
index cca924d10..d2bc5d60c 100644
--- a/include/smarty/libs/sysplugins/smarty_internal_compile_private_object_block_function.php
+++ b/include/smarty/libs/sysplugins/smarty_internal_compile_private_object_block_function.php
@@ -1,22 +1,21 @@
 <?php
 /**
  * Smarty Internal Plugin Compile Object Block Function
- *
  * Compiles code for registered objects as block function
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage Compiler
- * @author Uwe Tews
+ * @author     Uwe Tews
  */
 
 /**
  * Smarty Internal Plugin Compile Object Block Function Class
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage Compiler
  */
-class Smarty_Internal_Compile_Private_Object_Block_Function extends Smarty_Internal_CompileBase {
-
+class Smarty_Internal_Compile_Private_Object_Block_Function extends Smarty_Internal_CompileBase
+{
     /**
      * Attribute definition: Overwrites base class.
      *
@@ -28,16 +27,17 @@ class Smarty_Internal_Compile_Private_Object_Block_Function extends Smarty_Inter
     /**
      * Compiles code for the execution of block plugin
      *
-     * @param array  $args      array with attributes from parser
-     * @param object $compiler  compiler object
-     * @param array  $parameter array with compilation parameter
-     * @param string $tag       name of block object
-     * @param string $method    name of method to call
+     * @param  array                                $args      array with attributes from parser
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler  compiler object
+     * @param  array                                $parameter array with compilation parameter
+     * @param  string                               $tag       name of block object
+     * @param  string                               $method    name of method to call
+     *
      * @return string compiled code
      */
-    public function compile($args, $compiler, $parameter, $tag, $method)
+    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter, $tag, $method)
     {
-        if (!isset($tag[5]) || substr($tag, -5) != 'close') {
+        if (!isset($tag[5]) || substr($tag, - 5) != 'close') {
             // opening tag of block plugin
             // check and get attributes
             $_attr = $this->getAttributes($compiler, $args);
@@ -60,9 +60,10 @@ class Smarty_Internal_Compile_Private_Object_Block_Function extends Smarty_Inter
             // maybe nocache because of nocache variables or nocache plugin
             $compiler->nocache = $compiler->nocache | $compiler->tag_nocache;
             // compile code
-            $output = "<?php \$_smarty_tpl->smarty->_tag_stack[] = array('{$tag}->{$method}', {$_params}); \$_block_repeat=true; echo \$_smarty_tpl->smarty->registered_objects['{$tag}'][0]->{$method}({$_params}, null, \$_smarty_tpl, \$_block_repeat);while (\$_block_repeat) { ob_start();?>";
+            $output =
+                "<?php \$_smarty_tpl->smarty->_cache['tag_stack'][] = array('{$tag}->{$method}', {$_params}); \$_block_repeat=true; echo \$_smarty_tpl->smarty->registered_objects['{$tag}'][0]->{$method}({$_params}, null, \$_smarty_tpl, \$_block_repeat);while (\$_block_repeat) { ob_start();?>";
         } else {
-            $base_tag = substr($tag, 0, -5);
+            $base_tag = substr($tag, 0, - 5);
             // must endblock be nocache?
             if ($compiler->nocache) {
                 $compiler->tag_nocache = true;
@@ -76,13 +77,15 @@ class Smarty_Internal_Compile_Private_Object_Block_Function extends Smarty_Inter
                 $mod_pre = $mod_post = '';
             } else {
                 $mod_pre = ' ob_start(); ';
-                $mod_post = 'echo ' . $compiler->compileTag('private_modifier', array(), array('modifierlist' => $parameter['modifier_list'], 'value' => 'ob_get_clean()')) . ';';
+                $mod_post = 'echo ' . $compiler->compileTag('private_modifier', array(),
+                                                            array('modifierlist' => $parameter['modifier_list'],
+                                                                  'value'        => 'ob_get_clean()')) . ';';
             }
-            $output = "<?php \$_block_content = ob_get_contents(); ob_end_clean(); \$_block_repeat=false;" . $mod_pre . " echo \$_smarty_tpl->smarty->registered_objects['{$base_tag}'][0]->{$method}({$_params}, \$_block_content, \$_smarty_tpl, \$_block_repeat); " . $mod_post . "  } array_pop(\$_smarty_tpl->smarty->_tag_stack);?>";
+            $output = "<?php \$_block_content = ob_get_clean(); \$_block_repeat=false;" . $mod_pre .
+                " echo \$_smarty_tpl->smarty->registered_objects['{$base_tag}'][0]->{$method}({$_params}, \$_block_content, \$_smarty_tpl, \$_block_repeat); " .
+                $mod_post . "  } array_pop(\$_smarty_tpl->smarty->_cache['tag_stack']);?>";
         }
+
         return $output . "\n";
     }
-
 }
-
-?>
\ No newline at end of file
diff --git a/include/smarty/libs/sysplugins/smarty_internal_compile_private_object_function.php b/include/smarty/libs/sysplugins/smarty_internal_compile_private_object_function.php
index f649084c3..e306e0f6d 100644
--- a/include/smarty/libs/sysplugins/smarty_internal_compile_private_object_function.php
+++ b/include/smarty/libs/sysplugins/smarty_internal_compile_private_object_function.php
@@ -1,22 +1,21 @@
 <?php
 /**
- * Smarty Internal Plugin Compile Object Funtion
- *
+ * Smarty Internal Plugin Compile Object Function
  * Compiles code for registered objects as function
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage Compiler
- * @author Uwe Tews
+ * @author     Uwe Tews
  */
 
 /**
  * Smarty Internal Plugin Compile Object Function Class
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage Compiler
  */
-class Smarty_Internal_Compile_Private_Object_Function extends Smarty_Internal_CompileBase {
-
+class Smarty_Internal_Compile_Private_Object_Function extends Smarty_Internal_CompileBase
+{
     /**
      * Attribute definition: Overwrites base class.
      *
@@ -28,14 +27,15 @@ class Smarty_Internal_Compile_Private_Object_Function extends Smarty_Internal_Co
     /**
      * Compiles code for the execution of function plugin
      *
-     * @param array  $args      array with attributes from parser
-     * @param object $compiler  compiler object
-     * @param array  $parameter array with compilation parameter
-     * @param string $tag       name of function
-     * @param string $method    name of method to call
+     * @param  array                                       $args      array with attributes from parser
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler  compiler object
+     * @param  array                                       $parameter array with compilation parameter
+     * @param  string                                      $tag       name of function
+     * @param  string                                      $method    name of method to call
+     *
      * @return string compiled code
      */
-    public function compile($args, $compiler, $parameter, $tag, $method)
+    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter, $tag, $method)
     {
         // check and get attributes
         $_attr = $this->getAttributes($compiler, $args);
@@ -48,22 +48,29 @@ class Smarty_Internal_Compile_Private_Object_Function extends Smarty_Internal_Co
             $_assign = $_attr['assign'];
             unset($_attr['assign']);
         }
-        // convert attributes into parameter array string
-        if ($compiler->smarty->registered_objects[$tag][2]) {
-            $_paramsArray = array();
-            foreach ($_attr as $_key => $_value) {
-                if (is_int($_key)) {
-                    $_paramsArray[] = "$_key=>$_value";
-                } else {
-                    $_paramsArray[] = "'$_key'=>$_value";
+        // method or property ?
+        if (method_exists($compiler->smarty->registered_objects[$tag][0], $method)) {
+            // convert attributes into parameter array string
+            if ($compiler->smarty->registered_objects[$tag][2]) {
+                $_paramsArray = array();
+                foreach ($_attr as $_key => $_value) {
+                    if (is_int($_key)) {
+                        $_paramsArray[] = "$_key=>$_value";
+                    } else {
+                        $_paramsArray[] = "'$_key'=>$_value";
+                    }
                 }
+                $_params = 'array(' . implode(",", $_paramsArray) . ')';
+                $return = "\$_smarty_tpl->smarty->registered_objects['{$tag}'][0]->{$method}({$_params},\$_smarty_tpl)";
+            } else {
+                $_params = implode(",", $_attr);
+                $return = "\$_smarty_tpl->smarty->registered_objects['{$tag}'][0]->{$method}({$_params})";
             }
-            $_params = 'array(' . implode(",", $_paramsArray) . ')';
-            $return = "\$_smarty_tpl->smarty->registered_objects['{$tag}'][0]->{$method}({$_params},\$_smarty_tpl)";
         } else {
-            $_params = implode(",", $_attr);
-            $return = "\$_smarty_tpl->smarty->registered_objects['{$tag}'][0]->{$method}({$_params})";
+            // object property
+            $return = "\$_smarty_tpl->smarty->registered_objects['{$tag}'][0]->{$method}";
         }
+
         if (empty($_assign)) {
             // This tag does create output
             $compiler->has_output = true;
@@ -71,9 +78,7 @@ class Smarty_Internal_Compile_Private_Object_Function extends Smarty_Internal_Co
         } else {
             $output = "<?php \$_smarty_tpl->assign({$_assign},{$return});?>\n";
         }
+
         return $output;
     }
-
 }
-
-?>
\ No newline at end of file
diff --git a/include/smarty/libs/sysplugins/smarty_internal_compile_private_php.php b/include/smarty/libs/sysplugins/smarty_internal_compile_private_php.php
new file mode 100644
index 000000000..3ca63a548
--- /dev/null
+++ b/include/smarty/libs/sysplugins/smarty_internal_compile_private_php.php
@@ -0,0 +1,209 @@
+<?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->compiled->has_nocache_code;
+            $output = addcslashes($_attr['code'], "'\\");
+            $compiler->parser->current_buffer->append_subtree($compiler->parser, new Smarty_Internal_ParseTree_Tag($compiler->parser, $compiler->processNocacheCode("<?php echo '" .
+                                                                                                                                                                    $output .
+                                                                                                                                                                    "';?>", $compiler, true)));
+            $compiler->template->compiled->has_nocache_code = $save;
+            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($compiler->parser, new Smarty_Internal_ParseTree_Text($output));
+                return '';
+            } elseif ($compiler->php_handling == Smarty::PHP_PASSTHRU || $_attr['type'] == 'unmatched') {
+                $compiler->tag_nocache = true;
+                $save = $compiler->template->compiled->has_nocache_code;
+                $output = addcslashes($_attr['code'], "'\\");
+                $compiler->parser->current_buffer->append_subtree($compiler->parser, new Smarty_Internal_ParseTree_Tag($compiler->parser, $compiler->processNocacheCode("<?php echo '" .
+                                                                                                                                                                        $output .
+                                                                                                                                                                        "';?>", $compiler, true)));
+                $compiler->template->compiled->has_nocache_code = $save;
+                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', null, true);
+                }
+                $compiler->has_code = true;
+                return $_attr['code'];
+            } else {
+                $compiler->trigger_template_error('Illegal $smarty->php_handling value', null, true);
+            }
+        } else {
+            $compiler->has_code = true;
+            if (!($compiler->smarty instanceof SmartyBC)) {
+                $compiler->trigger_template_error('{php}{/php} tags not allowed. Use SmartyBC to enable them', null, true);
+            }
+            $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]}\"", null, true);
+                }
+            }
+            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)
+    {
+        $lex->token = Smarty_Internal_Templateparser::TP_PHP;
+        $close = 0;
+        $lex->taglineno = $lex->line;
+        $closeTag = '?>';
+        if (strpos($lex->value, '<?xml') === 0) {
+            $lex->is_xml = true;
+            $lex->token = Smarty_Internal_Templateparser::TP_NOCACHE;
+            return;
+        } 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) {
+            if ($lex->is_xml) {
+                $lex->is_xml = false;
+                $lex->token = Smarty_Internal_Templateparser::TP_NOCACHE;
+                return;
+            }
+            $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
+     *
+     */
+    /**
+     * @param $match
+     *
+     * @return string
+     */
+    private function quote($match)
+    {
+        return htmlspecialchars($match[0], ENT_QUOTES);
+    }
+}
diff --git a/include/smarty/libs/sysplugins/smarty_internal_compile_private_print_expression.php b/include/smarty/libs/sysplugins/smarty_internal_compile_private_print_expression.php
index a37119547..c0c089bff 100644
--- a/include/smarty/libs/sysplugins/smarty_internal_compile_private_print_expression.php
+++ b/include/smarty/libs/sysplugins/smarty_internal_compile_private_print_expression.php
@@ -1,46 +1,48 @@
 <?php
 /**
-* Smarty Internal Plugin Compile Print Expression
-*
-* Compiles any tag which will output an expression or variable
-*
-* @package Smarty
-* @subpackage Compiler
-* @author Uwe Tews
-*/
+ * Smarty Internal Plugin Compile Print Expression
+ * Compiles any tag which will output an expression or variable
+ *
+ * @package    Smarty
+ * @subpackage Compiler
+ * @author     Uwe Tews
+ */
 
 /**
-* Smarty Internal Plugin Compile Print Expression Class
-*
-* @package Smarty
-* @subpackage Compiler
-*/
-class Smarty_Internal_Compile_Private_Print_Expression extends Smarty_Internal_CompileBase {
-
+ * Smarty Internal Plugin Compile Print Expression Class
+ *
+ * @package    Smarty
+ * @subpackage Compiler
+ */
+class Smarty_Internal_Compile_Private_Print_Expression extends Smarty_Internal_CompileBase
+{
     /**
-    * Attribute definition: Overwrites base class.
-    *
-    * @var array
-    * @see Smarty_Internal_CompileBase
-    */
+     * Attribute definition: Overwrites base class.
+     *
+     * @var array
+     * @see Smarty_Internal_CompileBase
+     */
     public $optional_attributes = array('assign');
+
     /**
-    * Attribute definition: Overwrites base class.
-    *
-    * @var array
-    * @see Smarty_Internal_CompileBase
-    */
+     * Attribute definition: Overwrites base class.
+     *
+     * @var array
+     * @see Smarty_Internal_CompileBase
+     */
     public $option_flags = array('nocache', 'nofilter');
 
     /**
-    * Compiles code for gererting output from any expression
-    *
-    * @param array  $args      array with attributes from parser
-    * @param object $compiler  compiler object
-    * @param array  $parameter array with compilation parameter
-    * @return string compiled code
-    */
-    public function compile($args, $compiler, $parameter)
+     * 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);
@@ -48,12 +50,6 @@ class Smarty_Internal_Compile_Private_Print_Expression extends Smarty_Internal_C
         if ($_attr['nocache'] === true) {
             $compiler->tag_nocache = true;
         }
-        // filter handling
-        if ($_attr['nofilter'] === true) {
-            $_filter = 'false';
-        } else {
-            $_filter = 'true';
-        }
         if (isset($_attr['assign'])) {
             // assign output to variable
             $output = "<?php \$_smarty_tpl->assign({$_attr['assign']},{$parameter['value']});?>";
@@ -62,7 +58,8 @@ class Smarty_Internal_Compile_Private_Print_Expression extends Smarty_Internal_C
             $output = $parameter['value'];
             // tag modifier
             if (!empty($parameter['modifierlist'])) {
-                $output = $compiler->compileTag('private_modifier', array(), array('modifierlist' => $parameter['modifierlist'], 'value' => $output));
+                $output = $compiler->compileTag('private_modifier', array(), array('modifierlist' => $parameter['modifierlist'],
+                                                                                   'value'        => $output));
             }
             if (!$_attr['nofilter']) {
                 // default modifier
@@ -71,27 +68,29 @@ class Smarty_Internal_Compile_Private_Print_Expression extends Smarty_Internal_C
                         $modifierlist = array();
                         foreach ($compiler->smarty->default_modifiers as $key => $single_default_modifier) {
                             preg_match_all('/(\'[^\'\\\\]*(?:\\\\.[^\'\\\\]*)*\'|"[^"\\\\]*(?:\\\\.[^"\\\\]*)*"|:|[^:]+)/', $single_default_modifier, $mod_array);
-                            for ($i = 0, $count = count($mod_array[0]);$i < $count;$i++) {
+                            for ($i = 0, $count = count($mod_array[0]); $i < $count; $i ++) {
                                 if ($mod_array[0][$i] != ':') {
                                     $modifierlist[$key][] = $mod_array[0][$i];
                                 }
                             }
                         }
-                        $compiler->default_modifier_list  = $modifierlist;
+                        $compiler->default_modifier_list = $modifierlist;
                     }
-                    $output = $compiler->compileTag('private_modifier', array(), array('modifierlist' => $compiler->default_modifier_list, 'value' => $output));
+                    $output = $compiler->compileTag('private_modifier', array(), array('modifierlist' => $compiler->default_modifier_list,
+                                                                                       'value'        => $output));
                 }
                 // autoescape html
                 if ($compiler->template->smarty->escape_html) {
                     $output = "htmlspecialchars({$output}, ENT_QUOTES, '" . addslashes(Smarty::$_CHARSET) . "')";
                 }
-                // loop over registerd filters
+                // loop over registered filters
                 if (!empty($compiler->template->smarty->registered_filters[Smarty::FILTER_VARIABLE])) {
-                    foreach ($compiler->template->smarty->registered_filters[Smarty::FILTER_VARIABLE] as $key => $function) {
+                    foreach ($compiler->template->smarty->registered_filters[Smarty::FILTER_VARIABLE] as $key =>
+                             $function) {
                         if (!is_array($function)) {
                             $output = "{$function}({$output},\$_smarty_tpl)";
-                        } else if (is_object($function[0])) {
-                            $output = "\$_smarty_tpl->smarty->registered_filters[Smarty::FILTER_VARIABLE][{$key}][0]->{$function[1]}({$output},\$_smarty_tpl)";
+                        } elseif (is_object($function[0])) {
+                            $output = "\$_smarty_tpl->smarty->registered_filters[Smarty::FILTER_VARIABLE]['{$key}'][0]->{$function[1]}({$output},\$_smarty_tpl)";
                         } else {
                             $output = "{$function[0]}::{$function[1]}({$output},\$_smarty_tpl)";
                         }
@@ -99,7 +98,7 @@ class Smarty_Internal_Compile_Private_Print_Expression extends Smarty_Internal_C
                 }
                 // auto loaded filters
                 if (isset($compiler->smarty->autoload_filters[Smarty::FILTER_VARIABLE])) {
-                    foreach ((array)$compiler->template->smarty->autoload_filters[Smarty::FILTER_VARIABLE] as $name) {
+                    foreach ((array) $compiler->template->smarty->autoload_filters[Smarty::FILTER_VARIABLE] as $name) {
                         $result = $this->compile_output_filter($compiler, $name, $output);
                         if ($result !== false) {
                             $output = $result;
@@ -109,13 +108,14 @@ class Smarty_Internal_Compile_Private_Print_Expression extends Smarty_Internal_C
                         }
                     }
                 }
-                if (isset($compiler->template->variable_filters)) {
-                    foreach ($compiler->template->variable_filters as $filter) {
-                        if (count($filter) == 1 && ($result = $this->compile_output_filter($compiler, $filter[0], $output)) !== false) {
-                            $output = $result;
-                        } else {
-                            $output = $compiler->compileTag('private_modifier', array(), array('modifierlist' => array($filter), 'value' => $output));
-                        }
+                foreach ($compiler->variable_filters as $filter) {
+                    if (count($filter) == 1 &&
+                        ($result = $this->compile_output_filter($compiler, $filter[0], $output)) !== false
+                    ) {
+                        $output = $result;
+                    } else {
+                        $output = $compiler->compileTag('private_modifier', array(), array('modifierlist' => array($filter),
+                                                                                           'value'        => $output));
                     }
                 }
             }
@@ -123,34 +123,34 @@ class Smarty_Internal_Compile_Private_Print_Expression extends Smarty_Internal_C
             $compiler->has_output = true;
             $output = "<?php echo {$output};?>";
         }
+
         return $output;
     }
 
     /**
-    * @param object $compiler compiler object
-    * @param string $name     name of variable filter
-    * @param type   $output   embedded output
-    * @return string
-    */
-    private function compile_output_filter($compiler, $name, $output)
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object
+     * @param string                                $name     name of variable filter
+     * @param string                                $output   embedded output
+     *
+     * @return string
+     */
+    private function compile_output_filter(Smarty_Internal_TemplateCompilerBase $compiler, $name, $output)
     {
         $plugin_name = "smarty_variablefilter_{$name}";
         $path = $compiler->smarty->loadPlugin($plugin_name, false);
         if ($path) {
             if ($compiler->template->caching) {
-                $compiler->template->required_plugins['nocache'][$name][Smarty::FILTER_VARIABLE]['file'] = $path;
-                $compiler->template->required_plugins['nocache'][$name][Smarty::FILTER_VARIABLE]['function'] = $plugin_name;
+                $compiler->parent_compiler->template->compiled->required_plugins['nocache'][$name][Smarty::FILTER_VARIABLE]['file'] = $path;
+                $compiler->parent_compiler->template->compiled->required_plugins['nocache'][$name][Smarty::FILTER_VARIABLE]['function'] = $plugin_name;
             } else {
-                $compiler->template->required_plugins['compiled'][$name][Smarty::FILTER_VARIABLE]['file'] = $path;
-                $compiler->template->required_plugins['compiled'][$name][Smarty::FILTER_VARIABLE]['function'] = $plugin_name;
+                $compiler->parent_compiler->template->compiled->required_plugins['compiled'][$name][Smarty::FILTER_VARIABLE]['file'] = $path;
+                $compiler->parent_compiler->template->compiled->required_plugins['compiled'][$name][Smarty::FILTER_VARIABLE]['function'] = $plugin_name;
             }
         } else {
             // not found
             return false;
         }
+
         return "{$plugin_name}({$output},\$_smarty_tpl)";
     }
-
 }
-
-?>
\ No newline at end of file
diff --git a/include/smarty/libs/sysplugins/smarty_internal_compile_private_registered_block.php b/include/smarty/libs/sysplugins/smarty_internal_compile_private_registered_block.php
index f104853a8..78d95f720 100644
--- a/include/smarty/libs/sysplugins/smarty_internal_compile_private_registered_block.php
+++ b/include/smarty/libs/sysplugins/smarty_internal_compile_private_registered_block.php
@@ -1,22 +1,21 @@
 <?php
 /**
  * Smarty Internal Plugin Compile Registered Block
- *
  * Compiles code for the execution of a registered block function
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage Compiler
- * @author Uwe Tews
+ * @author     Uwe Tews
  */
 
 /**
  * Smarty Internal Plugin Compile Registered Block Class
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage Compiler
  */
-class Smarty_Internal_Compile_Private_Registered_Block extends Smarty_Internal_CompileBase {
-
+class Smarty_Internal_Compile_Private_Registered_Block extends Smarty_Internal_CompileBase
+{
     /**
      * Attribute definition: Overwrites base class.
      *
@@ -28,34 +27,35 @@ class Smarty_Internal_Compile_Private_Registered_Block extends Smarty_Internal_C
     /**
      * Compiles code for the execution of a block function
      *
-     * @param array  $args      array with attributes from parser
-     * @param object $compiler  compiler object
-     * @param array  $parameter array with compilation parameter
-     * @param string $tag       name of block function
+     * @param  array                                       $args      array with attributes from parser
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler  compiler object
+     * @param  array                                       $parameter array with compilation parameter
+     * @param  string                                      $tag       name of block function
+     *
      * @return string compiled code
      */
-    public function compile($args, $compiler, $parameter, $tag)
+    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter, $tag)
     {
-        if (!isset($tag[5]) || substr($tag,-5) != 'close') {
+        if (!isset($tag[5]) || substr($tag, - 5) != 'close') {
             // opening tag of block plugin
             // check and get attributes
             $_attr = $this->getAttributes($compiler, $args);
             if ($_attr['nocache']) {
                 $compiler->tag_nocache = true;
             }
-               unset($_attr['nocache']);
-               if (isset($compiler->smarty->registered_plugins[Smarty::PLUGIN_BLOCK][$tag])) {
-                   $tag_info = $compiler->smarty->registered_plugins[Smarty::PLUGIN_BLOCK][$tag];
-               } else {
-                   $tag_info = $compiler->default_handler_plugins[Smarty::PLUGIN_BLOCK][$tag];
-               }
+            unset($_attr['nocache']);
+            if (isset($compiler->smarty->registered_plugins[Smarty::PLUGIN_BLOCK][$tag])) {
+                $tag_info = $compiler->smarty->registered_plugins[Smarty::PLUGIN_BLOCK][$tag];
+            } else {
+                $tag_info = $compiler->default_handler_plugins[Smarty::PLUGIN_BLOCK][$tag];
+            }
             // convert attributes into parameter array string
             $_paramsArray = array();
             foreach ($_attr as $_key => $_value) {
                 if (is_int($_key)) {
                     $_paramsArray[] = "$_key=>$_value";
-                } elseif ($compiler->template->caching && in_array($_key,$tag_info[2])) {
-                    $_value = str_replace("'","^#^",$_value);
+                } elseif ($compiler->template->caching && in_array($_key, $tag_info[2])) {
+                    $_value = str_replace("'", "^#^", $_value);
                     $_paramsArray[] = "'$_key'=>^#^.var_export($_value,true).^#^";
                 } else {
                     $_paramsArray[] = "'$_key'=>$_value";
@@ -69,45 +69,51 @@ class Smarty_Internal_Compile_Private_Registered_Block extends Smarty_Internal_C
             $function = $tag_info[0];
             // compile code
             if (!is_array($function)) {
-                $output = "<?php \$_smarty_tpl->smarty->_tag_stack[] = array('{$tag}', {$_params}); \$_block_repeat=true; echo {$function}({$_params}, null, \$_smarty_tpl, \$_block_repeat);while (\$_block_repeat) { ob_start();?>";
-            } else if (is_object($function[0])) {
-                $output = "<?php \$_smarty_tpl->smarty->_tag_stack[] = array('{$tag}', {$_params}); \$_block_repeat=true; echo \$_smarty_tpl->smarty->registered_plugins['block']['{$tag}'][0][0]->{$function[1]}({$_params}, null, \$_smarty_tpl, \$_block_repeat);while (\$_block_repeat) { ob_start();?>";
+                $output = "<?php \$_smarty_tpl->smarty->_cache['tag_stack'][] = array('{$tag}', {$_params}); \$_block_repeat=true; echo {$function}({$_params}, null, \$_smarty_tpl, \$_block_repeat);while (\$_block_repeat) { ob_start();?>";
+            } elseif (is_object($function[0])) {
+                $output = "<?php \$_smarty_tpl->smarty->_cache['tag_stack'][] = array('{$tag}', {$_params}); \$_block_repeat=true; echo \$_smarty_tpl->smarty->registered_plugins['block']['{$tag}'][0][0]->{$function[1]}({$_params}, null, \$_smarty_tpl, \$_block_repeat);while (\$_block_repeat) { ob_start();?>";
             } else {
-                $output = "<?php \$_smarty_tpl->smarty->_tag_stack[] = array('{$tag}', {$_params}); \$_block_repeat=true; echo {$function[0]}::{$function[1]}({$_params}, null, \$_smarty_tpl, \$_block_repeat);while (\$_block_repeat) { ob_start();?>";
+                $output = "<?php \$_smarty_tpl->smarty->_cache['tag_stack'][] = array('{$tag}', {$_params}); \$_block_repeat=true; echo {$function[0]}::{$function[1]}({$_params}, null, \$_smarty_tpl, \$_block_repeat);while (\$_block_repeat) { ob_start();?>";
             }
         } else {
             // must endblock be nocache?
             if ($compiler->nocache) {
                 $compiler->tag_nocache = true;
             }
-            $base_tag = substr($tag, 0, -5);
+            $base_tag = substr($tag, 0, - 5);
             // closing tag of block plugin, restore nocache
             list($_params, $compiler->nocache) = $this->closeTag($compiler, $base_tag);
             // This tag does create output
             $compiler->has_output = true;
-               if (isset($compiler->smarty->registered_plugins[Smarty::PLUGIN_BLOCK][$base_tag])) {
-                   $function = $compiler->smarty->registered_plugins[Smarty::PLUGIN_BLOCK][$base_tag][0];
-               } else {
-                   $function = $compiler->default_handler_plugins[Smarty::PLUGIN_BLOCK][$base_tag][0];
-               }
+            if (isset($compiler->smarty->registered_plugins[Smarty::PLUGIN_BLOCK][$base_tag])) {
+                $function = $compiler->smarty->registered_plugins[Smarty::PLUGIN_BLOCK][$base_tag][0];
+            } else {
+                $function = $compiler->default_handler_plugins[Smarty::PLUGIN_BLOCK][$base_tag][0];
+            }
             // compile code
             if (!isset($parameter['modifier_list'])) {
-                $mod_pre = $mod_post ='';
+                $mod_pre = $mod_post = '';
             } else {
                 $mod_pre = ' ob_start(); ';
-                $mod_post = 'echo '.$compiler->compileTag('private_modifier',array(),array('modifierlist'=>$parameter['modifier_list'],'value'=>'ob_get_clean()')).';';
+                $mod_post = 'echo ' .
+                    $compiler->compileTag('private_modifier', array(), array('modifierlist' => $parameter['modifier_list'],
+                                                                             'value'        => 'ob_get_clean()')) . ';';
             }
             if (!is_array($function)) {
-                $output = "<?php \$_block_content = ob_get_clean(); \$_block_repeat=false;".$mod_pre." echo {$function}({$_params}, \$_block_content, \$_smarty_tpl, \$_block_repeat);".$mod_post." } array_pop(\$_smarty_tpl->smarty->_tag_stack);?>";
-            } else if (is_object($function[0])) {
-                $output = "<?php \$_block_content = ob_get_clean(); \$_block_repeat=false;".$mod_pre." echo \$_smarty_tpl->smarty->registered_plugins['block']['{$base_tag}'][0][0]->{$function[1]}({$_params}, \$_block_content, \$_smarty_tpl, \$_block_repeat); ".$mod_post."} array_pop(\$_smarty_tpl->smarty->_tag_stack);?>";
+                $output = "<?php \$_block_content = ob_get_clean(); \$_block_repeat=false;" . $mod_pre .
+                    " echo {$function}({$_params}, \$_block_content, \$_smarty_tpl, \$_block_repeat);" . $mod_post .
+                    " } array_pop(\$_smarty_tpl->smarty->_cache['tag_stack']);?>";
+            } elseif (is_object($function[0])) {
+                $output = "<?php \$_block_content = ob_get_clean(); \$_block_repeat=false;" . $mod_pre .
+                    " echo \$_smarty_tpl->smarty->registered_plugins['block']['{$base_tag}'][0][0]->{$function[1]}({$_params}, \$_block_content, \$_smarty_tpl, \$_block_repeat); " .
+                    $mod_post . "} array_pop(\$_smarty_tpl->smarty->_cache['tag_stack']);?>";
             } else {
-                $output = "<?php \$_block_content = ob_get_clean(); \$_block_repeat=false;".$mod_pre." echo {$function[0]}::{$function[1]}({$_params}, \$_block_content, \$_smarty_tpl, \$_block_repeat); ".$mod_post."} array_pop(\$_smarty_tpl->smarty->_tag_stack);?>";
+                $output = "<?php \$_block_content = ob_get_clean(); \$_block_repeat=false;" . $mod_pre .
+                    " echo {$function[0]}::{$function[1]}({$_params}, \$_block_content, \$_smarty_tpl, \$_block_repeat); " .
+                    $mod_post . "} array_pop(\$_smarty_tpl->smarty->_cache['tag_stack']);?>";
             }
         }
+
         return $output . "\n";
     }
-
 }
-
-?>
\ No newline at end of file
diff --git a/include/smarty/libs/sysplugins/smarty_internal_compile_private_registered_function.php b/include/smarty/libs/sysplugins/smarty_internal_compile_private_registered_function.php
index e68a0244d..6bddc7529 100644
--- a/include/smarty/libs/sysplugins/smarty_internal_compile_private_registered_function.php
+++ b/include/smarty/libs/sysplugins/smarty_internal_compile_private_registered_function.php
@@ -1,22 +1,21 @@
 <?php
 /**
  * Smarty Internal Plugin Compile Registered Function
- *
  * Compiles code for the execution of a registered function
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage Compiler
- * @author Uwe Tews
+ * @author     Uwe Tews
  */
 
 /**
  * Smarty Internal Plugin Compile Registered Function Class
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage Compiler
  */
-class Smarty_Internal_Compile_Private_Registered_Function extends Smarty_Internal_CompileBase {
-
+class Smarty_Internal_Compile_Private_Registered_Function extends Smarty_Internal_CompileBase
+{
     /**
      * Attribute definition: Overwrites base class.
      *
@@ -28,13 +27,14 @@ class Smarty_Internal_Compile_Private_Registered_Function extends Smarty_Interna
     /**
      * Compiles code for the execution of a registered function
      *
-     * @param array  $args      array with attributes from parser
-     * @param object $compiler  compiler object
-     * @param array  $parameter array with compilation parameter
-     * @param string $tag       name of function
+     * @param  array                                       $args      array with attributes from parser
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler  compiler object
+     * @param  array                                       $parameter array with compilation parameter
+     * @param  string                                      $tag       name of function
+     *
      * @return string compiled code
      */
-    public function compile($args, $compiler, $parameter, $tag)
+    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter, $tag)
     {
         // This tag does create output
         $compiler->has_output = true;
@@ -44,20 +44,20 @@ class Smarty_Internal_Compile_Private_Registered_Function extends Smarty_Interna
             $compiler->tag_nocache = true;
         }
         unset($_attr['nocache']);
-               if (isset($compiler->smarty->registered_plugins[Smarty::PLUGIN_FUNCTION][$tag])) {
-                   $tag_info = $compiler->smarty->registered_plugins[Smarty::PLUGIN_FUNCTION][$tag];
-               } else {
-                   $tag_info = $compiler->default_handler_plugins[Smarty::PLUGIN_FUNCTION][$tag];
-               }
+        if (isset($compiler->smarty->registered_plugins[Smarty::PLUGIN_FUNCTION][$tag])) {
+            $tag_info = $compiler->smarty->registered_plugins[Smarty::PLUGIN_FUNCTION][$tag];
+        } else {
+            $tag_info = $compiler->default_handler_plugins[Smarty::PLUGIN_FUNCTION][$tag];
+        }
         // not cachable?
-        $compiler->tag_nocache =  $compiler->tag_nocache || !$tag_info[1];
+        $compiler->tag_nocache = $compiler->tag_nocache || !$tag_info[1];
         // convert attributes into parameter array string
         $_paramsArray = array();
         foreach ($_attr as $_key => $_value) {
             if (is_int($_key)) {
                 $_paramsArray[] = "$_key=>$_value";
-            } elseif ($compiler->template->caching && in_array($_key,$tag_info[2])) {
-                $_value = str_replace("'","^#^",$_value);
+            } elseif ($compiler->template->caching && in_array($_key, $tag_info[2])) {
+                $_value = str_replace("'", "^#^", $_value);
                 $_paramsArray[] = "'$_key'=>^#^.var_export($_value,true).^#^";
             } else {
                 $_paramsArray[] = "'$_key'=>$_value";
@@ -68,14 +68,12 @@ class Smarty_Internal_Compile_Private_Registered_Function extends Smarty_Interna
         // compile code
         if (!is_array($function)) {
             $output = "<?php echo {$function}({$_params},\$_smarty_tpl);?>\n";
-        } else if (is_object($function[0])) {
+        } elseif (is_object($function[0])) {
             $output = "<?php echo \$_smarty_tpl->smarty->registered_plugins[Smarty::PLUGIN_FUNCTION]['{$tag}'][0][0]->{$function[1]}({$_params},\$_smarty_tpl);?>\n";
         } else {
             $output = "<?php echo {$function[0]}::{$function[1]}({$_params},\$_smarty_tpl);?>\n";
         }
+
         return $output;
     }
-
 }
-
-?>
\ No newline at end of file
diff --git a/include/smarty/libs/sysplugins/smarty_internal_compile_private_special_variable.php b/include/smarty/libs/sysplugins/smarty_internal_compile_private_special_variable.php
index af8fcd372..5a8c54faa 100644
--- a/include/smarty/libs/sysplugins/smarty_internal_compile_private_special_variable.php
+++ b/include/smarty/libs/sysplugins/smarty_internal_compile_private_special_variable.php
@@ -1,111 +1,129 @@
 <?php
 /**
  * Smarty Internal Plugin Compile Special Smarty Variable
- *
  * Compiles the special $smarty variables
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage Compiler
- * @author Uwe Tews
+ * @author     Uwe Tews
  */
 
 /**
  * Smarty Internal Plugin Compile special Smarty Variable Class
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage Compiler
  */
-class Smarty_Internal_Compile_Private_Special_Variable extends Smarty_Internal_CompileBase {
-
+class Smarty_Internal_Compile_Private_Special_Variable extends Smarty_Internal_CompileBase
+{
     /**
-     * Compiles code for the speical $smarty variables
+     * Compiles code for the special $smarty variables
+     *
+     * @param  array                                       $args     array with attributes from parser
+     * @param \Smarty_Internal_TemplateCompilerBase        $compiler compiler object
+     * @param                                              $parameter
      *
-     * @param array  $args     array with attributes from parser
-     * @param object $compiler compiler object
      * @return string compiled code
+     * @throws \SmartyCompilerException
      */
-    public function compile($args, $compiler, $parameter)
+    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter)
     {
-        $_index = preg_split("/\]\[/",substr($parameter, 1, strlen($parameter)-2));
-        $compiled_ref = ' ';
-        $variable = trim($_index[0], "'");
-        switch ($variable) {
-            case 'foreach':
-                return "\$_smarty_tpl->getVariable('smarty')->value$parameter";
-            case 'section':
-                return "\$_smarty_tpl->getVariable('smarty')->value$parameter";
-            case 'capture':
-                return "Smarty::\$_smarty_vars$parameter";
-            case 'now':
-                return 'time()';
-            case 'cookies':
-                if (isset($compiler->smarty->security_policy) && !$compiler->smarty->security_policy->allow_super_globals) {
-                    $compiler->trigger_template_error("(secure mode) super globals not permitted");
+        $_index = preg_split("/\]\[/", substr($parameter, 1, strlen($parameter) - 2));
+        $variable = strtolower($compiler->getId($_index[0]));
+        if ($variable === false) {
+            $compiler->trigger_template_error("special \$Smarty variable name index can not be variable", null, true);
+        }
+        if (!isset($compiler->smarty->security_policy) ||
+            $compiler->smarty->security_policy->isTrustedSpecialSmartyVar($variable, $compiler)
+        ) {
+            switch ($variable) {
+                case 'foreach':
+                case 'section':
+                    return Smarty_Internal_Compile_Private_ForeachSection::compileSpecialVariable(array(), $compiler, $_index);
+                case 'capture':
+                    if (class_exists('Smarty_Internal_Compile_Capture')) {
+                        return Smarty_Internal_Compile_Capture::compileSpecialVariable(array(), $compiler, $_index);
+                    }
+                    return '';
+                case 'now':
+                    return 'time()';
+                case 'cookies':
+                    if (isset($compiler->smarty->security_policy) &&
+                        !$compiler->smarty->security_policy->allow_super_globals
+                    ) {
+                        $compiler->trigger_template_error("(secure mode) super globals not permitted");
+                        break;
+                    }
+                    return '$_COOKIE';
+                case 'get':
+                case 'post':
+                case 'env':
+                case 'server':
+                case 'session':
+                case 'request':
+                    if (isset($compiler->smarty->security_policy) &&
+                        !$compiler->smarty->security_policy->allow_super_globals
+                    ) {
+                        $compiler->trigger_template_error("(secure mode) super globals not permitted");
+                        break;
+                    }
+                    $compiled_ref = '$_' . strtoupper($variable);
                     break;
-                }
-                $compiled_ref = '$_COOKIE';
-                break;
 
-            case 'get':
-            case 'post':
-            case 'env':
-            case 'server':
-            case 'session':
-            case 'request':
-                if (isset($compiler->smarty->security_policy) && !$compiler->smarty->security_policy->allow_super_globals) {
-                    $compiler->trigger_template_error("(secure mode) super globals not permitted");
-                    break;
-                }
-                $compiled_ref = '$_'.strtoupper($variable);
-                break;
+                case 'template':
+                    return 'basename($_smarty_tpl->source->filepath)';
 
-            case 'template':
-                return 'basename($_smarty_tpl->source->filepath)';
+                case 'template_object':
+                    return '$_smarty_tpl';
 
-            case 'template_object':
-                return '$_smarty_tpl';
+                case 'current_dir':
+                    return 'dirname($_smarty_tpl->source->filepath)';
 
-            case 'current_dir':
-                return 'dirname($_smarty_tpl->source->filepath)';
+                case 'version':
+                    $_version = Smarty::SMARTY_VERSION;
 
-            case 'version':
-                $_version = Smarty::SMARTY_VERSION;
-                return "'$_version'";
+                    return "'$_version'";
 
-            case 'const':
-                if (isset($compiler->smarty->security_policy) && !$compiler->smarty->security_policy->allow_constants) {
-                    $compiler->trigger_template_error("(secure mode) constants not permitted");
-                    break;
-                }
-                return "@constant({$_index[1]})";
+                case 'const':
+                    if (isset($compiler->smarty->security_policy) &&
+                        !$compiler->smarty->security_policy->allow_constants
+                    ) {
+                        $compiler->trigger_template_error("(secure mode) constants not permitted");
+                        break;
+                    }
+                    if (strpos($_index[1], '$') === false && strpos($_index[1], '\'') === false) {
+                        return "@constant('{$_index[1]}')";
+                    } else {
+                        return "@constant({$_index[1]})";
+                    }
 
-            case 'config':
-                if (isset($_index[2])) {
-                    return "(is_array(\$tmp = \$_smarty_tpl->getConfigVariable($_index[1])) ? \$tmp[$_index[2]] : null)";
-                } else {
-                    return "\$_smarty_tpl->getConfigVariable($_index[1])";
-                }
-            case 'ldelim':
-                $_ldelim = $compiler->smarty->left_delimiter;
-                return "'$_ldelim'";
+                case 'config':
+                    if (isset($_index[2])) {
+                        return "(is_array(\$tmp = \$_smarty_tpl->smarty->ext->_config->_getConfigVariable(\$_smarty_tpl, $_index[1])) ? \$tmp[$_index[2]] : null)";
+                    } else {
+                        return "\$_smarty_tpl->smarty->ext->_config->_getConfigVariable(\$_smarty_tpl, $_index[1])";
+                    }
+                case 'ldelim':
+                    $_ldelim = $compiler->smarty->left_delimiter;
 
-            case 'rdelim':
-                $_rdelim = $compiler->smarty->right_delimiter;
-                return "'$_rdelim'";
+                    return "'$_ldelim'";
 
-            default:
-                $compiler->trigger_template_error('$smarty.' . trim($_index[0], "'") . ' is invalid');
-                break;
-        }
-        if (isset($_index[1])) {
-            array_shift($_index);
-            foreach ($_index as $_ind) {
-                $compiled_ref = $compiled_ref . "[$_ind]";
+                case 'rdelim':
+                    $_rdelim = $compiler->smarty->right_delimiter;
+
+                    return "'$_rdelim'";
+
+                default:
+                    $compiler->trigger_template_error('$smarty.' . trim($_index[0], "'") . ' is invalid');
+                    break;
             }
+            if (isset($_index[1])) {
+                array_shift($_index);
+                foreach ($_index as $_ind) {
+                    $compiled_ref = $compiled_ref . "[$_ind]";
+                }
+            }
+            return $compiled_ref;
         }
-        return $compiled_ref;
     }
-
 }
-
-?>
\ No newline at end of file
diff --git a/include/smarty/libs/sysplugins/smarty_internal_compile_rdelim.php b/include/smarty/libs/sysplugins/smarty_internal_compile_rdelim.php
index 807c7e2b9..22b33eaa2 100644
--- a/include/smarty/libs/sysplugins/smarty_internal_compile_rdelim.php
+++ b/include/smarty/libs/sysplugins/smarty_internal_compile_rdelim.php
@@ -1,41 +1,39 @@
 <?php
 /**
  * Smarty Internal Plugin Compile Rdelim
- *
  * Compiles the {rdelim} tag
- * @package Smarty
+ *
+ * @package    Smarty
  * @subpackage Compiler
- * @author Uwe Tews
+ * @author     Uwe Tews
  */
 
 /**
  * Smarty Internal Plugin Compile Rdelim Class
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage Compiler
  */
-class Smarty_Internal_Compile_Rdelim extends Smarty_Internal_CompileBase {
-
+class Smarty_Internal_Compile_Rdelim extends Smarty_Internal_CompileBase
+{
     /**
      * Compiles code for the {rdelim} tag
-     *
      * This tag does output the right delimiter.
      *
-     * @param array  $args     array with attributes from parser
-     * @param object $compiler compiler object
+     * @param  array  $args     array with attributes from parser
+     * @param  object $compiler compiler object
+     *
      * @return string compiled code
      */
-    public function compile($args, $compiler)
+    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler)
     {
         $_attr = $this->getAttributes($compiler, $args);
         if ($_attr['nocache'] === true) {
-            $compiler->trigger_template_error('nocache option not allowed', $compiler->lex->taglineno);
+            $compiler->trigger_template_error('nocache option not allowed', null, true);
         }
         // this tag does not return compiled code
         $compiler->has_code = true;
+
         return $compiler->smarty->right_delimiter;
     }
-
 }
-
-?>
\ No newline at end of file
diff --git a/include/smarty/libs/sysplugins/smarty_internal_compile_section.php b/include/smarty/libs/sysplugins/smarty_internal_compile_section.php
index ccb7673d8..079903c2b 100644
--- a/include/smarty/libs/sysplugins/smarty_internal_compile_section.php
+++ b/include/smarty/libs/sysplugins/smarty_internal_compile_section.php
@@ -1,22 +1,21 @@
 <?php
 /**
  * Smarty Internal Plugin Compile Section
- *
  * Compiles the {section} {sectionelse} {/section} tags
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage Compiler
- * @author Uwe Tews
+ * @author     Uwe Tews
  */
 
 /**
  * Smarty Internal Plugin Compile Section Class
- * 
- * @package Smarty
+ *
+ * @package    Smarty
  * @subpackage Compiler
  */
-class Smarty_Internal_Compile_Section extends Smarty_Internal_CompileBase {
-
+class Smarty_Internal_Compile_Section extends Smarty_Internal_Compile_Private_ForeachSection
+{
     /**
      * Attribute definition: Overwrites base class.
      *
@@ -24,6 +23,7 @@ class Smarty_Internal_Compile_Section extends Smarty_Internal_CompileBase {
      * @see Smarty_Internal_CompileBase
      */
     public $required_attributes = array('name', 'loop');
+
     /**
      * Attribute definition: Overwrites base class.
      *
@@ -31,6 +31,7 @@ class Smarty_Internal_Compile_Section extends Smarty_Internal_CompileBase {
      * @see Smarty_Internal_CompileBase
      */
     public $shorttag_order = array('name', 'loop');
+
     /**
      * Attribute definition: Overwrites base class.
      *
@@ -40,164 +41,414 @@ class Smarty_Internal_Compile_Section extends Smarty_Internal_CompileBase {
     public $optional_attributes = array('start', 'step', 'max', 'show');
 
     /**
+     * counter
+     *
+     * @var int
+     */
+    public $counter = 0;
+
+    /**
+     * Name of this tag
+     *
+     * @var string
+     */
+    public $tagName = 'section';
+
+    /**
+     * Valid properties of $smarty.section.name.xxx variable
+     *
+     * @var array
+     */
+    public static $nameProperties = array('first', 'last', 'index', 'iteration', 'show', 'total', 'rownum',
+                                          'index_prev', 'index_next');
+
+    /**
+     * {section} tag has no item properties
+     *
+     * @var array
+     */
+    public $itemProperties = null;
+
+    /**
+     * {section} tag has always name attribute
+     *
+     * @var bool
+     */
+    public $isNamed = true;
+
+    /**
      * Compiles code for the {section} tag
      *
-     * @param array  $args     array with attributes from parser
-     * @param object $compiler compiler object
+     * @param  array                                 $args     array with attributes from parser
+     * @param  \Smarty_Internal_TemplateCompilerBase $compiler compiler object
+     *
      * @return string compiled code
+     * @throws \SmartyCompilerException
      */
-    public function compile($args, $compiler)
+    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler)
     {
+        $compiler->loopNesting++;
         // check and get attributes
         $_attr = $this->getAttributes($compiler, $args);
-
-        $this->openTag($compiler, 'section', array('section', $compiler->nocache));
+        $attributes = array('name' => $compiler->getId($_attr['name']));
+        unset($_attr['name']);
+        foreach ($attributes as $a => $v) {
+            if ($v === false) {
+                $compiler->trigger_template_error("'{$a}' attribute/variable has illegal value", null, true);
+            }
+        }
+        $local = "\$__section_{$attributes['name']}_" . $this->counter ++ . '_';
+        $sectionVar = "\$_smarty_tpl->tpl_vars['__smarty_section_{$attributes['name']}']";
+        $this->openTag($compiler, 'section', array('section', $compiler->nocache, $local, $sectionVar));
         // maybe nocache because of nocache variables
         $compiler->nocache = $compiler->nocache | $compiler->tag_nocache;
 
-        $output = "<?php ";
-
-        $section_name = $_attr['name'];
-
-        $output .= "if (isset(\$_smarty_tpl->tpl_vars['smarty']->value['section'][$section_name])) unset(\$_smarty_tpl->tpl_vars['smarty']->value['section'][$section_name]);\n";
-        $section_props = "\$_smarty_tpl->tpl_vars['smarty']->value['section'][$section_name]";
-
+        $initLocal = array('saved' => "isset(\$_smarty_tpl->tpl_vars['__smarty_section_{$attributes['name']}']) ? \$_smarty_tpl->tpl_vars['__section_{$attributes['name']}'] : false",);
+        $initNamedProperty = array();
+        $initFor = array();
+        $incFor = array();
+        $cmpFor = array();
+        $propValue = array('index'     => "{$sectionVar}->value['index']", 'show' => 'true', 'step' => 1,
+                           'iteration' => "{$local}iteration",
+
+        );
+        $propType = array('index' => 2, 'iteration' => 2, 'show' => 0, 'step' => 0,);
+        // search for used tag attributes
+        $this->scanForProperties($attributes, $compiler);
+        if (!empty($this->matchResults['named'])) {
+            $namedAttr = $this->matchResults['named'];
+        }
+        $namedAttr['index'] = true;
+        $output = "<?php\n";
         foreach ($_attr as $attr_name => $attr_value) {
             switch ($attr_name) {
                 case 'loop':
-                    $output .= "{$section_props}['loop'] = is_array(\$_loop=$attr_value) ? count(\$_loop) : max(0, (int)\$_loop); unset(\$_loop);\n";
+                    if (is_numeric($attr_value)) {
+                        $v = (int) $attr_value;
+                        $t = 0;
+                    } else {
+                        $v = "(is_array(@\$_loop=$attr_value) ? count(\$_loop) : max(0, (int) \$_loop))";
+                        $t = 1;
+                    }
+                    if (isset($namedAttr['loop'])) {
+                        $initNamedProperty['loop'] = "'loop' => {$v}";
+                        if ($t == 1) {
+                            $v = "{$sectionVar}->value['loop']";
+                        }
+                    } elseif ($t == 1) {
+                        $initLocal['loop'] = $v;
+                        $v = "{$local}loop";
+                    }
                     break;
-
                 case 'show':
-                    if (is_bool($attr_value))
-                        $show_attr_value = $attr_value ? 'true' : 'false';
-                    else
-                        $show_attr_value = "(bool)$attr_value";
-                    $output .= "{$section_props}['show'] = $show_attr_value;\n";
+                    if (is_bool($attr_value)) {
+                        $v = $attr_value ? 'true' : 'false';
+                        $t = 0;
+                    } else {
+                        $v = "(bool) $attr_value";
+                        $t = 3;
+                    }
                     break;
-
-                case 'name':
-                    $output .= "{$section_props}['$attr_name'] = $attr_value;\n";
+                case 'step':
+                    if (is_numeric($attr_value)) {
+                        $v = (int) $attr_value;
+                        $v = ($v == 0) ? 1 : $v;
+                        $t = 0;
+                        break;
+                    }
+                    $initLocal['step'] = "((int)@$attr_value) == 0 ? 1 : (int)@$attr_value";
+                    $v = "{$local}step";
+                    $t = 2;
                     break;
 
                 case 'max':
                 case 'start':
-                    $output .= "{$section_props}['$attr_name'] = (int)$attr_value;\n";
-                    break;
-
-                case 'step':
-                    $output .= "{$section_props}['$attr_name'] = ((int)$attr_value) == 0 ? 1 : (int)$attr_value;\n";
+                    if (is_numeric($attr_value)) {
+                        $v = (int) $attr_value;
+                        $t = 0;
+                        break;
+                    }
+                    $v = "(int)@$attr_value";
+                    $t = 3;
                     break;
             }
+            if ($t == 3 && $compiler->getId($attr_value)) {
+                $t = 1;
+            }
+            $propValue[$attr_name] = $v;
+            $propType[$attr_name] = $t;
         }
 
-        if (!isset($_attr['show']))
-            $output .= "{$section_props}['show'] = true;\n";
-
-        if (!isset($_attr['loop']))
-            $output .= "{$section_props}['loop'] = 1;\n";
-
-        if (!isset($_attr['max']))
-            $output .= "{$section_props}['max'] = {$section_props}['loop'];\n";
-        else
-            $output .= "if ({$section_props}['max'] < 0)\n" . "    {$section_props}['max'] = {$section_props}['loop'];\n";
+        if (isset($namedAttr['step'])) {
+            $initNamedProperty['step'] = $propValue['step'];
+        }
+        if (isset($namedAttr['iteration'])) {
+            $propValue['iteration'] = "{$sectionVar}->value['iteration']";
+        }
+        $incFor['iteration'] = "{$propValue['iteration']}++";
+        $initFor['iteration'] = "{$propValue['iteration']} = 1";
+
+        if ($propType['step'] == 0) {
+            if ($propValue['step'] == 1) {
+                $incFor['index'] = "{$sectionVar}->value['index']++";
+            } elseif ($propValue['step'] > 1) {
+                $incFor['index'] = "{$sectionVar}->value['index'] += {$propValue['step']}";
+            } else {
+                $incFor['index'] = "{$sectionVar}->value['index'] -= " . - $propValue['step'];
+            }
+        } else {
+            $incFor['index'] = "{$sectionVar}->value['index'] += {$propValue['step']}";
+        }
 
-        if (!isset($_attr['step']))
-            $output .= "{$section_props}['step'] = 1;\n";
+        if (!isset($propValue['max'])) {
+            $propValue['max'] = $propValue['loop'];
+            $propType['max'] = $propType['loop'];
+        } elseif ($propType['max'] != 0) {
+            $propValue['max'] = "{$propValue['max']} < 0 ? {$propValue['loop']} : {$propValue['max']}";
+            $propType['max'] = 1;
+        } else {
+            if ($propValue['max'] < 0) {
+                $propValue['max'] = $propValue['loop'];
+                $propType['max'] = $propType['loop'];
+            }
+        }
 
-        if (!isset($_attr['start']))
-            $output .= "{$section_props}['start'] = {$section_props}['step'] > 0 ? 0 : {$section_props}['loop']-1;\n";
-        else {
-            $output .= "if ({$section_props}['start'] < 0)\n" . "    {$section_props}['start'] = max({$section_props}['step'] > 0 ? 0 : -1, {$section_props}['loop'] + {$section_props}['start']);\n" . "else\n" . "    {$section_props}['start'] = min({$section_props}['start'], {$section_props}['step'] > 0 ? {$section_props}['loop'] : {$section_props}['loop']-1);\n";
+        if (!isset($propValue['start'])) {
+            $start_code = array(1 => "{$propValue['step']} > 0 ? ", 2 => '0', 3 => ' : ', 4 => $propValue['loop'],
+                                5 => ' - 1');
+            if ($propType['loop'] == 0) {
+                $start_code[5] = '';
+                $start_code[4] = $propValue['loop'] - 1;
+            }
+            if ($propType['step'] == 0) {
+                if ($propValue['step'] > 0) {
+                    $start_code = array(1 => '0');
+                    $propType['start'] = 0;
+                } else {
+                    $start_code[1] = $start_code[2] = $start_code[3] = '';
+                    $propType['start'] = $propType['loop'];
+                }
+            } else {
+                $propType['start'] = 1;
+            }
+            $propValue['start'] = join('', $start_code);
+        } else {
+            $start_code = array(1  => "{$propValue['start']} < 0 ? ", 2 => 'max(', 3 => "{$propValue['step']} > 0 ? ",
+                                4  => '0', 5 => ' : ', 6 => '-1', 7 => ', ',
+                                8  => "{$propValue['start']} + {$propValue['loop']}", 10 => ')', 11 => ' : ',
+                                12 => 'min(', 13 => $propValue['start'], 14 => ', ',
+                                15 => "{$propValue['step']} > 0 ? ", 16 => $propValue['loop'], 17 => ' : ',
+                                18 => $propType['loop'] == 0 ? $propValue['loop'] - 1 : "{$propValue['loop']} - 1",
+                                19 => ')');
+            if ($propType['step'] == 0) {
+                $start_code[3] = $start_code[5] = $start_code[15] = $start_code[17] = '';
+                if ($propValue['step'] > 0) {
+                    $start_code[6] = $start_code[18] = '';
+                } else {
+                    $start_code[4] = $start_code[16] = '';
+                }
+            }
+            if ($propType['start'] == 0) {
+                if ($propType['loop'] == 0) {
+                    $start_code[8] = $propValue['start'] + $propValue['loop'];
+                }
+                $propType['start'] = $propType['step'] + $propType['loop'];
+                $start_code[1] = '';
+                if ($propValue['start'] < 0) {
+                    for ($i = 11; $i <= 19; $i ++) {
+                        $start_code[$i] = '';
+                    }
+                    if ($propType['start'] == 0) {
+                        $start_code = array(max($propValue['step'] > 0 ? 0 : - 1, $propValue['start'] +
+                                                                                $propValue['loop']));
+                    }
+                } else {
+                    for ($i = 1; $i <= 11; $i ++) {
+                        $start_code[$i] = '';
+                    }
+                    if ($propType['start'] == 0) {
+                        $start_code = array(min($propValue['step'] > 0 ? $propValue['loop'] : $propValue['loop'] -
+                            1, $propValue['start']));
+                    }
+                }
+            }
+            $propValue['start'] = join('', $start_code);
+        }
+        if ($propType['start'] != 0) {
+            $initLocal['start'] = $propValue['start'];
+            $propValue['start'] = "{$local}start";
         }
 
-        $output .= "if ({$section_props}['show']) {\n";
+        $initFor['index'] = "{$sectionVar}->value['index'] = {$propValue['start']}";
+
         if (!isset($_attr['start']) && !isset($_attr['step']) && !isset($_attr['max'])) {
-            $output .= "    {$section_props}['total'] = {$section_props}['loop'];\n";
+            $propValue['total'] = $propValue['loop'];
+            $propType['total'] = $propType['loop'];
         } else {
-            $output .= "    {$section_props}['total'] = min(ceil(({$section_props}['step'] > 0 ? {$section_props}['loop'] - {$section_props}['start'] : {$section_props}['start']+1)/abs({$section_props}['step'])), {$section_props}['max']);\n";
+            $propType['total'] = $propType['start'] + $propType['loop'] + $propType['step'] + $propType['max'];
+            if ($propType['total'] == 0) {
+                $propValue['total'] = min(ceil(($propValue['step'] > 0 ? $propValue['loop'] -
+                                                   $propValue['start'] : (int) $propValue['start'] + 1) /
+                                               abs($propValue['step'])), $propValue['max']);
+            } else {
+                $total_code = array(1  => 'min(', 2 => 'ceil(', 3 => '(', 4 => "{$propValue['step']} > 0 ? ",
+                                    5  => $propValue['loop'], 6 => ' - ', 7 => $propValue['start'], 8 => ' : ',
+                                    9  => $propValue['start'], 10 => '+ 1', 11 => ')', 12 => '/ ', 13 => 'abs(',
+                                    14 => $propValue['step'], 15 => ')', 16 => ')', 17 => ", {$propValue['max']})",);
+                if (!isset($propValue['max'])) {
+                    $total_code[1] = $total_code[17] = '';
+                }
+                if ($propType['loop'] + $propType['start'] == 0) {
+                    $total_code[5] = $propValue['loop'] - $propValue['start'];
+                    $total_code[6] = $total_code[7] = '';
+                }
+                if ($propType['start'] == 0) {
+                    $total_code[9] = (int) $propValue['start'] + 1;
+                    $total_code[10] = '';
+                }
+                if ($propType['step'] == 0) {
+                    $total_code[13] = $total_code[15] = '';
+                    if ($propValue['step'] == 1 || $propValue['step'] == - 1) {
+                        $total_code[2] = $total_code[12] = $total_code[14] = $total_code[16] = '';
+                    } elseif ($propValue['step'] < 0) {
+                        $total_code[14] = - $propValue['step'];
+                    }
+                    $total_code[4] = '';
+                    if ($propValue['step'] > 0) {
+                        $total_code[8] = $total_code[9] = $total_code[10] = '';
+                    } else {
+                        $total_code[5] = $total_code[6] = $total_code[7] = $total_code[8] = '';
+                    }
+                }
+                $propValue['total'] = join('', $total_code);
+            }
+        }
+
+        if (isset($namedAttr['total'])) {
+            $initNamedProperty['total'] = "'total' => {$propValue['total']}";
+            if ($propType['total'] > 0) {
+                $propValue['total'] = "{$sectionVar}->value['total']";
+            }
+        } elseif ($propType['total'] > 0) {
+            $initLocal['total'] = $propValue['total'];
+            $propValue['total'] = "{$local}total";
         }
-        $output .= "    if ({$section_props}['total'] == 0)\n" . "        {$section_props}['show'] = false;\n" . "} else\n" . "    {$section_props}['total'] = 0;\n";
 
-        $output .= "if ({$section_props}['show']):\n";
-        $output .= "
-            for ({$section_props}['index'] = {$section_props}['start'], {$section_props}['iteration'] = 1;
-                 {$section_props}['iteration'] <= {$section_props}['total'];
-                 {$section_props}['index'] += {$section_props}['step'], {$section_props}['iteration']++):\n";
-        $output .= "{$section_props}['rownum'] = {$section_props}['iteration'];\n";
-        $output .= "{$section_props}['index_prev'] = {$section_props}['index'] - {$section_props}['step'];\n";
-        $output .= "{$section_props}['index_next'] = {$section_props}['index'] + {$section_props}['step'];\n";
-        $output .= "{$section_props}['first']      = ({$section_props}['iteration'] == 1);\n";
-        $output .= "{$section_props}['last']       = ({$section_props}['iteration'] == {$section_props}['total']);\n";
+        $cmpFor['iteration'] = "{$propValue['iteration']} <= {$propValue['total']}";
 
+        foreach ($initLocal as $key => $code) {
+            $output .= "{$local}{$key} = {$code};\n";
+        }
+
+        $_vars = 'array(' . join(', ', $initNamedProperty) . ')';
+        $output .= "{$sectionVar} = new Smarty_Variable({$_vars});\n";
+        $cond_code = "{$propValue['total']} != 0";
+        if ($propType['total'] == 0) {
+            if ($propValue['total'] == 0) {
+                $cond_code = 'false';
+            } else {
+                $cond_code = 'true';
+            }
+        }
+        if ($propType['show'] > 0) {
+            $output .= "{$local}show = {$propValue['show']} ? {$cond_code} : false;\n";
+            $output .= "if ({$local}show) {\n";
+        } elseif ($propValue['show'] == 'true') {
+            $output .= "if ({$cond_code}) {\n";
+        } else {
+            $output .= "if (false) {\n";
+        }
+        $jinit = join(', ', $initFor);
+        $jcmp = join(', ', $cmpFor);
+        $jinc = join(', ', $incFor);
+        $output .= "for ({$jinit}; {$jcmp}; {$jinc}){\n";
+        if (isset($namedAttr['rownum'])) {
+            $output .= "{$sectionVar}->value['rownum'] = {$propValue['iteration']};\n";
+        }
+        if (isset($namedAttr['index_prev'])) {
+            $output .= "{$sectionVar}->value['index_prev'] = {$propValue['index']} - {$propValue['step']};\n";
+        }
+        if (isset($namedAttr['index_next'])) {
+            $output .= "{$sectionVar}->value['index_next'] = {$propValue['index']} + {$propValue['step']};\n";
+        }
+        if (isset($namedAttr['first'])) {
+            $output .= "{$sectionVar}->value['first'] = ({$propValue['iteration']} == 1);\n";
+        }
+        if (isset($namedAttr['last'])) {
+            $output .= "{$sectionVar}->value['last'] = ({$propValue['iteration']} == {$propValue['total']});\n";
+        }
         $output .= "?>";
+
         return $output;
     }
-
 }
 
 /**
  * Smarty Internal Plugin Compile Sectionelse Class
- * 
- * @package Smarty
+ *
+ * @package    Smarty
  * @subpackage Compiler
  */
-class Smarty_Internal_Compile_Sectionelse extends Smarty_Internal_CompileBase {
-
+class Smarty_Internal_Compile_Sectionelse extends Smarty_Internal_CompileBase
+{
     /**
      * Compiles code for the {sectionelse} tag
      *
-     * @param array  $args     array with attributes from parser
-     * @param object $compiler compiler object
+     * @param  array                                $args     array with attributes from parser
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object
+     *
      * @return string compiled code
      */
-    public function compile($args, $compiler)
+    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler)
     {
         // check and get attributes
         $_attr = $this->getAttributes($compiler, $args);
 
-        list($openTag, $nocache) = $this->closeTag($compiler, array('section'));
-        $this->openTag($compiler, 'sectionelse', array('sectionelse', $nocache));
+        list($openTag, $nocache, $local, $sectionVar) = $this->closeTag($compiler, array('section'));
+        $this->openTag($compiler, 'sectionelse', array('sectionelse', $nocache, $local, $sectionVar));
 
-        return "<?php endfor; else: ?>";
+        return "<?php }} else {\n ?>";
     }
-
 }
 
 /**
  * Smarty Internal Plugin Compile Sectionclose Class
- * 
- * @package Smarty
+ *
+ * @package    Smarty
  * @subpackage Compiler
  */
-class Smarty_Internal_Compile_Sectionclose extends Smarty_Internal_CompileBase {
-
+class Smarty_Internal_Compile_Sectionclose extends Smarty_Internal_CompileBase
+{
     /**
      * Compiles code for the {/section} tag
      *
-     * @param array  $args     array with attributes from parser
-     * @param object $compiler compiler object
+     * @param  array                                $args     array with attributes from parser
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object
+     *
      * @return string compiled code
      */
-    public function compile($args, $compiler)
+    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler)
     {
-        // check and get attributes
-        $_attr = $this->getAttributes($compiler, $args);
-
+        $compiler->loopNesting--;
         // must endblock be nocache?
         if ($compiler->nocache) {
             $compiler->tag_nocache = true;
         }
 
-        list($openTag, $compiler->nocache) = $this->closeTag($compiler, array('section', 'sectionelse'));
+        list($openTag, $compiler->nocache, $local, $sectionVar) = $this->closeTag($compiler, array('section',
+                                                                                                   'sectionelse'));
 
+        $output = "<?php\n";
         if ($openTag == 'sectionelse') {
-            return "<?php endif; ?>";
+            $output .= "}\n";
         } else {
-            return "<?php endfor; endif; ?>";
+            $output .= "}\n}\n";
         }
-    }
+        $output .= "if ({$local}saved) {\n";
+        $output .= "{$sectionVar} = {$local}saved;\n";
+        $output .= "}\n";
+        $output .= "?>";
 
+        return $output;
+    }
 }
-
-?>
\ No newline at end of file
diff --git a/include/smarty/libs/sysplugins/smarty_internal_compile_setfilter.php b/include/smarty/libs/sysplugins/smarty_internal_compile_setfilter.php
index 50b4cab55..b4932c1e1 100644
--- a/include/smarty/libs/sysplugins/smarty_internal_compile_setfilter.php
+++ b/include/smarty/libs/sysplugins/smarty_internal_compile_setfilter.php
@@ -1,72 +1,70 @@
 <?php
 /**
  * Smarty Internal Plugin Compile Setfilter
- *
  * Compiles code for setfilter tag
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage Compiler
- * @author Uwe Tews
+ * @author     Uwe Tews
  */
 
 /**
  * Smarty Internal Plugin Compile Setfilter Class
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage Compiler
  */
-class Smarty_Internal_Compile_Setfilter extends Smarty_Internal_CompileBase {
-
+class Smarty_Internal_Compile_Setfilter extends Smarty_Internal_CompileBase
+{
     /**
      * Compiles code for setfilter 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 $compiler  compiler object
+     * @param  array  $parameter array with compilation parameter
+     *
      * @return string compiled code
      */
-    public function compile($args, $compiler, $parameter)
+    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter)
     {
-        $compiler->variable_filter_stack[] = $compiler->template->variable_filters;
-        $compiler->template->variable_filters = $parameter['modifier_list'];
+        $compiler->variable_filter_stack[] = $compiler->variable_filters;
+        $compiler->variable_filters = $parameter['modifier_list'];
         // this tag does not return compiled code
         $compiler->has_code = false;
+
         return true;
     }
-
 }
 
 /**
  * Smarty Internal Plugin Compile Setfilterclose Class
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage Compiler
  */
-class Smarty_Internal_Compile_Setfilterclose extends Smarty_Internal_CompileBase {
-
+class Smarty_Internal_Compile_Setfilterclose extends Smarty_Internal_CompileBase
+{
     /**
      * Compiles code for the {/setfilter} tag
-     *
      * This tag does not generate compiled output. It resets variable filter.
      *
-     * @param array  $args     array with attributes from parser
-     * @param object $compiler compiler object
+     * @param  array  $args     array with attributes from parser
+     * @param  object $compiler compiler object
+     *
      * @return string compiled code
      */
-    public function compile($args, $compiler)
+    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler)
     {
         $_attr = $this->getAttributes($compiler, $args);
         // reset variable filter to previous state
         if (count($compiler->variable_filter_stack)) {
-            $compiler->template->variable_filters = array_pop($compiler->variable_filter_stack);
+            $compiler->variable_filters = array_pop($compiler->variable_filter_stack);
         } else {
-            $compiler->template->variable_filters = array();
+            $compiler->variable_filters = array();
         }
         // this tag does not return compiled code
         $compiler->has_code = false;
+
         return true;
     }
-
 }
-
-?>
\ No newline at end of file
diff --git a/include/smarty/libs/sysplugins/smarty_internal_compile_shared_inheritance.php b/include/smarty/libs/sysplugins/smarty_internal_compile_shared_inheritance.php
new file mode 100644
index 000000000..c7bf1f8fb
--- /dev/null
+++ b/include/smarty/libs/sysplugins/smarty_internal_compile_shared_inheritance.php
@@ -0,0 +1,46 @@
+<?php
+/**
+ * Smarty Internal Plugin Compile Shared Inheritance
+ * Shared methods for {extends} and {block} tags
+ *
+ * @package    Smarty
+ * @subpackage Compiler
+ * @author     Uwe Tews
+ */
+
+/**
+ * Smarty Internal Plugin Compile Shared Inheritance Class
+ *
+ * @package    Smarty
+ * @subpackage Compiler
+ */
+class Smarty_Internal_Compile_Shared_Inheritance extends Smarty_Internal_CompileBase
+{
+    /**
+     * Register post compile callback to compile inheritance initialization code
+     *
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler
+     * @param bool|false                            $initChildSequence if true force child template
+     */
+    public function registerInit(Smarty_Internal_TemplateCompilerBase $compiler, $initChildSequence = false)
+    {
+        if ($initChildSequence || !isset($compiler->_cache['inheritanceInit'])) {
+            $compiler->registerPostCompileCallback(array('Smarty_Internal_Compile_Shared_Inheritance', 'postCompile'),
+                                                   array($initChildSequence), 'inheritanceInit', $initChildSequence);
+
+            $compiler->_cache['inheritanceInit'] = true;
+        }
+    }
+
+    /**
+     * Compile inheritance initialization code as prefix
+     *
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler
+     * @param bool|false                            $initChildSequence if true force child template
+     */
+    static function postCompile(Smarty_Internal_TemplateCompilerBase $compiler, $initChildSequence = false)
+    {
+        $compiler->prefixCompiledCode .= "<?php \$_smarty_tpl->ext->_inheritance->init(\$_smarty_tpl, " .
+            var_export($initChildSequence, true) . ");\n?>\n";
+    }
+}
\ No newline at end of file
diff --git a/include/smarty/libs/sysplugins/smarty_internal_compile_while.php b/include/smarty/libs/sysplugins/smarty_internal_compile_while.php
index d7d986c34..bd31f6671 100644
--- a/include/smarty/libs/sysplugins/smarty_internal_compile_while.php
+++ b/include/smarty/libs/sysplugins/smarty_internal_compile_while.php
@@ -1,94 +1,108 @@
 <?php
 /**
  * Smarty Internal Plugin Compile While
- *
  * Compiles the {while} tag
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage Compiler
- * @author Uwe Tews
+ * @author     Uwe Tews
  */
 
 /**
  * Smarty Internal Plugin Compile While Class
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage Compiler
  */
-class Smarty_Internal_Compile_While extends Smarty_Internal_CompileBase {
-
+class Smarty_Internal_Compile_While extends Smarty_Internal_CompileBase
+{
     /**
      * Compiles code for the {while} 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 \Smarty_Internal_TemplateCompilerBase $compiler  compiler object
+     * @param  array                                       $parameter array with compilation parameter
+     *
      * @return string compiled code
+     * @throws \SmartyCompilerException
      */
-    public function compile($args, $compiler, $parameter)
+    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter)
     {
+        $compiler->loopNesting++;
         // check and get attributes
         $_attr = $this->getAttributes($compiler, $args);
         $this->openTag($compiler, 'while', $compiler->nocache);
 
-        if (!array_key_exists("if condition",$parameter)) {
-            $compiler->trigger_template_error("missing while condition", $compiler->lex->taglineno);
+        if (!array_key_exists("if condition", $parameter)) {
+            $compiler->trigger_template_error("missing while condition", null, true);
         }
 
         // maybe nocache because of nocache variables
         $compiler->nocache = $compiler->nocache | $compiler->tag_nocache;
+        $_output = "<?php\n";
         if (is_array($parameter['if condition'])) {
             if ($compiler->nocache) {
                 $_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 = '';
             }
             if (is_array($parameter['if condition']['var'])) {
-                $_output = "<?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 .= "while (\$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var']['var'] . "]->value" . $parameter['if condition']['var']['smarty_internal_index'] . " = " . $parameter['if condition']['value'] . "){?>";
+                $_output .= "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->smarty->ext->_var->createLocalArrayVariable(\$_smarty_tpl, " . $parameter['if condition']['var']['var'] .
+                    "$_nocache);\n";
+                $_output .= "while (\$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var']['var'] . "]->value" .
+                    $parameter['if condition']['var']['smarty_internal_index'] . " = " .
+                    $parameter['if condition']['value'] . ") {?>";
             } else {
-                $_output = "<?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 .= "while (\$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var'] . "]->value = " . $parameter['if condition']['value'] . "){?>";
+                $_output .= "if (!isset(\$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var'] .
+                    "])) \$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var'] .
+                    "] = new Smarty_Variable(null{$_nocache});";
+                $_output .= "while (\$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var'] . "]->value = " .
+                    $parameter['if condition']['value'] . ") {?>";
             }
-            return $_output;
         } else {
-            return "<?php while ({$parameter['if condition']}){?>";
-        }
+            $_output .= "while ({$parameter['if condition']}) {?>";
+         }
+        return $_output;
     }
-
 }
 
 /**
  * Smarty Internal Plugin Compile Whileclose Class
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage Compiler
  */
-class Smarty_Internal_Compile_Whileclose extends Smarty_Internal_CompileBase {
-
+class Smarty_Internal_Compile_Whileclose extends Smarty_Internal_CompileBase
+{
     /**
      * Compiles code for the {/while} tag
      *
-     * @param array  $args     array with attributes from parser
-     * @param object $compiler compiler object
+     * @param  array                                       $args     array with attributes from parser
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object
+     *
      * @return string compiled code
      */
-    public function compile($args, $compiler)
+    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler)
     {
+        $compiler->loopNesting--;
         // must endblock be nocache?
         if ($compiler->nocache) {
             $compiler->tag_nocache = true;
         }
         $compiler->nocache = $this->closeTag($compiler, array('while'));
-        return "<?php }?>";
+        return "<?php }?>\n";
     }
-
 }
-
-?>
\ No newline at end of file
diff --git a/include/smarty/libs/sysplugins/smarty_internal_compilebase.php b/include/smarty/libs/sysplugins/smarty_internal_compilebase.php
index 5fb56f371..0803f27a6 100644
--- a/include/smarty/libs/sysplugins/smarty_internal_compilebase.php
+++ b/include/smarty/libs/sysplugins/smarty_internal_compilebase.php
@@ -2,25 +2,26 @@
 /**
  * Smarty Internal Plugin CompileBase
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage Compiler
- * @author Uwe Tews
+ * @author     Uwe Tews
  */
 
 /**
  * This class does extend all internal compile plugins
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage Compiler
  */
-abstract class Smarty_Internal_CompileBase {
-
+abstract class Smarty_Internal_CompileBase
+{
     /**
      * Array of names of required attribute required by tag
      *
      * @var array
      */
     public $required_attributes = array();
+
     /**
      * Array of names of optional attribute required by tag
      * use array('_any') if there is no restriction of attributes names
@@ -28,12 +29,14 @@ abstract class Smarty_Internal_CompileBase {
      * @var array
      */
     public $optional_attributes = array();
+
     /**
      * Shorttag attribute order defined by its names
      *
      * @var array
      */
     public $shorttag_order = array();
+
     /**
      * Array of names of valid option flags
      *
@@ -43,15 +46,15 @@ abstract class Smarty_Internal_CompileBase {
 
     /**
      * This function checks if the attributes passed are valid
-     *
      * The attributes passed for the tag to compile are checked against the list of required and
      * optional attributes. Required attributes must be present. Optional attributes are check against
      * the corresponding list. The keyword '_any' specifies that any attribute will be accepted
      * as valid
      *
-     * @param object $compiler   compiler object
-     * @param array  $attributes attributes applied to the tag
-     * @return array of mapped attributes for further processing
+     * @param  object $compiler   compiler object
+     * @param  array  $attributes attributes applied to the tag
+     *
+     * @return array  of mapped attributes for further processing
      */
     public function getAttributes($compiler, $attributes)
     {
@@ -64,11 +67,11 @@ abstract class Smarty_Internal_CompileBase {
                 if (in_array(trim($mixed, '\'"'), $this->option_flags)) {
                     $_indexed_attr[trim($mixed, '\'"')] = true;
                     // shorthand attribute ?
-                } else if (isset($this->shorttag_order[$key])) {
+                } elseif (isset($this->shorttag_order[$key])) {
                     $_indexed_attr[$this->shorttag_order[$key]] = $mixed;
                 } else {
                     // too many shorthands
-                    $compiler->trigger_template_error('too many shorthand attributes', $compiler->lex->taglineno);
+                    $compiler->trigger_template_error('too many shorthand attributes', null, true);
                 }
                 // named attribute
             } else {
@@ -77,20 +80,20 @@ abstract class Smarty_Internal_CompileBase {
                 if (in_array($kv['key'], $this->option_flags)) {
                     if (is_bool($kv['value'])) {
                         $_indexed_attr[$kv['key']] = $kv['value'];
-                    } else if (is_string($kv['value']) && in_array(trim($kv['value'], '\'"'), array('true', 'false'))) {
+                    } elseif (is_string($kv['value']) && in_array(trim($kv['value'], '\'"'), array('true', 'false'))) {
                         if (trim($kv['value']) == 'true') {
                             $_indexed_attr[$kv['key']] = true;
                         } else {
                             $_indexed_attr[$kv['key']] = false;
                         }
-                    } else if (is_numeric($kv['value']) && in_array($kv['value'], array(0, 1))) {
+                    } elseif (is_numeric($kv['value']) && in_array($kv['value'], array(0, 1))) {
                         if ($kv['value'] == 1) {
                             $_indexed_attr[$kv['key']] = true;
                         } else {
                             $_indexed_attr[$kv['key']] = false;
                         }
                     } else {
-                        $compiler->trigger_template_error("illegal value of option flag \"{$kv['key']}\"", $compiler->lex->taglineno);
+                        $compiler->trigger_template_error("illegal value of option flag \"{$kv['key']}\"", null, true);
                     }
                     // must be named attribute
                 } else {
@@ -102,15 +105,15 @@ abstract class Smarty_Internal_CompileBase {
         // check if all required attributes present
         foreach ($this->required_attributes as $attr) {
             if (!array_key_exists($attr, $_indexed_attr)) {
-                $compiler->trigger_template_error("missing \"" . $attr . "\" attribute", $compiler->lex->taglineno);
+                $compiler->trigger_template_error("missing \"" . $attr . "\" attribute", null, true);
             }
         }
-        // check for unallowed attributes
+        // check for not allowed attributes
         if ($this->optional_attributes != array('_any')) {
             $tmp_array = array_merge($this->required_attributes, $this->optional_attributes, $this->option_flags);
             foreach ($_indexed_attr as $key => $dummy) {
                 if (!in_array($key, $tmp_array) && $key !== 0) {
-                    $compiler->trigger_template_error("unexpected \"" . $key . "\" attribute", $compiler->lex->taglineno);
+                    $compiler->trigger_template_error("unexpected \"" . $key . "\" attribute", null, true);
                 }
             }
         }
@@ -126,12 +129,11 @@ abstract class Smarty_Internal_CompileBase {
 
     /**
      * Push opening tag name on stack
-     *
      * Optionally additional data can be saved on stack
      *
-     * @param object    $compiler   compiler object
-     * @param string    $openTag    the opening tag's name
-     * @param mixed     $data       optional data saved
+     * @param object $compiler compiler object
+     * @param string $openTag  the opening tag's name
+     * @param mixed  $data     optional data saved
      */
     public function openTag($compiler, $openTag, $data = null)
     {
@@ -140,12 +142,12 @@ abstract class Smarty_Internal_CompileBase {
 
     /**
      * Pop closing tag
-     *
      * Raise an error if this stack-top doesn't match with expected opening tags
      *
-     * @param object       $compiler    compiler object
-     * @param array|string $expectedTag the expected opening tag names
-     * @return mixed any type the opening tag's name or saved data
+     * @param  object       $compiler    compiler object
+     * @param  array|string $expectedTag the expected opening tag names
+     *
+     * @return mixed        any type the opening tag's name or saved data
      */
     public function closeTag($compiler, $expectedTag)
     {
@@ -163,14 +165,14 @@ abstract class Smarty_Internal_CompileBase {
                 }
             }
             // wrong nesting of tags
-            $compiler->trigger_template_error("unclosed {" . $_openTag . "} tag");
+            $compiler->trigger_template_error("unclosed {$compiler->smarty->left_delimiter}" . $_openTag .
+                                              "{$compiler->smarty->right_delimiter} tag");
+
             return;
         }
         // wrong nesting of tags
-        $compiler->trigger_template_error("unexpected closing tag", $compiler->lex->taglineno);
+        $compiler->trigger_template_error("unexpected closing tag", null, true);
+
         return;
     }
-
 }
-
-?>
\ No newline at end of file
diff --git a/include/smarty/libs/sysplugins/smarty_internal_config.php b/include/smarty/libs/sysplugins/smarty_internal_config.php
deleted file mode 100644
index bcb3ce054..000000000
--- a/include/smarty/libs/sysplugins/smarty_internal_config.php
+++ /dev/null
@@ -1,302 +0,0 @@
-<?php
-/**
- * Smarty Internal Plugin Config
- *
- * @package Smarty
- * @subpackage Config
- * @author Uwe Tews
- */
-
-/**
- * Smarty Internal Plugin Config
- *
- * Main class for config variables
- *
- * @package Smarty
- * @subpackage Config
- *
- * @property Smarty_Config_Source   $source
- * @property Smarty_Config_Compiled $compiled
- * @ignore
- */
-class Smarty_Internal_Config {
-
-    /**
-     * Samrty instance
-     *
-     * @var Smarty object
-     */
-    public $smarty = null;
-    /**
-     * Object of config var storage
-     *
-     * @var object
-     */
-    public $data = null;
-    /**
-     * Config resource
-     * @var string
-     */
-    public $config_resource = null;
-    /**
-     * Compiled config file
-     *
-     * @var string
-     */
-    public $compiled_config = null;
-    /**
-     * filepath of compiled config file
-     *
-     * @var string
-     */
-    public $compiled_filepath = null;
-    /**
-     * Filemtime of compiled config Filemtime
-     *
-     * @var int
-     */
-    public $compiled_timestamp = null;
-    /**
-     * flag if compiled config file is invalid and must be (re)compiled
-     * @var bool
-     */
-    public $mustCompile = null;
-    /**
-     * Config file compiler object
-     *
-     * @var Smarty_Internal_Config_File_Compiler object
-     */
-    public $compiler_object = null;
-
-    /**
-     * Constructor of config file object
-     *
-     * @param string $config_resource config file resource name
-     * @param Smarty $smarty Smarty instance
-     * @param object $data object for config vars storage
-     */
-    public function __construct($config_resource, $smarty, $data = null)
-    {
-        $this->data = $data;
-        $this->smarty = $smarty;
-        $this->config_resource = $config_resource;
-    }
-
-    /**
-     * Returns the compiled  filepath
-     *
-     * @return string the compiled filepath
-     */
-    public function getCompiledFilepath()
-    {
-        return $this->compiled_filepath === null ?
-                ($this->compiled_filepath = $this->buildCompiledFilepath()) :
-                $this->compiled_filepath;
-    }
-
-    /**
-     * Get file path.
-     *
-     * @return string
-     */
-    public function buildCompiledFilepath()
-    {
-        $_compile_id = isset($this->smarty->compile_id) ? preg_replace('![^\w\|]+!', '_', $this->smarty->compile_id) : null;
-        $_flag = (int) $this->smarty->config_read_hidden + (int) $this->smarty->config_booleanize * 2
-                + (int) $this->smarty->config_overwrite * 4;
-        $_filepath = sha1($this->source->name . $_flag);
-        // if use_sub_dirs, break file into directories
-        if ($this->smarty->use_sub_dirs) {
-            $_filepath = substr($_filepath, 0, 2) . DS
-                    . substr($_filepath, 2, 2) . DS
-                    . substr($_filepath, 4, 2) . DS
-                    . $_filepath;
-        }
-        $_compile_dir_sep = $this->smarty->use_sub_dirs ? DS : '^';
-        if (isset($_compile_id)) {
-            $_filepath = $_compile_id . $_compile_dir_sep . $_filepath;
-        }
-        $_compile_dir = $this->smarty->getCompileDir();
-        return $_compile_dir . $_filepath . '.' . basename($this->source->name) . '.config' . '.php';
-    }
-
-    /**
-     * Returns the timpestamp of the compiled file
-     *
-     * @return integer the file timestamp
-     */
-    public function getCompiledTimestamp()
-    {
-        return $this->compiled_timestamp === null
-            ? ($this->compiled_timestamp = (file_exists($this->getCompiledFilepath())) ? filemtime($this->getCompiledFilepath()) : false)
-            : $this->compiled_timestamp;
-    }
-
-    /**
-     * Returns if the current config file must be compiled
-     *
-     * It does compare the timestamps of config source and the compiled config and checks the force compile configuration
-     *
-     * @return boolean true if the file must be compiled
-     */
-    public function mustCompile()
-    {
-        return $this->mustCompile === null ?
-            $this->mustCompile = ($this->smarty->force_compile || $this->getCompiledTimestamp () === false || $this->smarty->compile_check && $this->getCompiledTimestamp () < $this->source->timestamp):
-            $this->mustCompile;
-    }
-
-    /**
-     * Returns the compiled config file
-     *
-     * It checks if the config file must be compiled or just read the compiled version
-     *
-     * @return string the compiled config file
-     */
-    public function getCompiledConfig()
-    {
-        if ($this->compiled_config === null) {
-            // see if template needs compiling.
-            if ($this->mustCompile()) {
-                $this->compileConfigSource();
-            } else {
-                $this->compiled_config = file_get_contents($this->getCompiledFilepath());
-            }
-        }
-        return $this->compiled_config;
-    }
-
-    /**
-     * Compiles the config files
-     *
-     * @throws Exception
-     */
-    public function compileConfigSource()
-    {
-        // compile template
-        if (!is_object($this->compiler_object)) {
-            // load compiler
-            $this->compiler_object = new Smarty_Internal_Config_File_Compiler($this->smarty);
-        }
-        // compile locking
-        if ($this->smarty->compile_locking) {
-            if ($saved_timestamp = $this->getCompiledTimestamp()) {
-                touch($this->getCompiledFilepath());
-            }
-        }
-        // call compiler
-        try {
-            $this->compiler_object->compileSource($this);
-        } catch (Exception $e) {
-            // restore old timestamp in case of error
-            if ($this->smarty->compile_locking && $saved_timestamp) {
-                touch($this->getCompiledFilepath(), $saved_timestamp);
-            }
-            throw $e;
-        }
-        // compiling succeded
-        // write compiled template
-        Smarty_Internal_Write_File::writeFile($this->getCompiledFilepath(), $this->getCompiledConfig(), $this->smarty);
-    }
-
-    /**
-     * load config variables
-     *
-     * @param mixed $sections array of section names, single section or null
-     * @param object $scope global,parent or local
-     */
-    public function loadConfigVars($sections = null, $scope = 'local')
-    {
-        if ($this->data instanceof Smarty_Internal_Template) {
-            $this->data->properties['file_dependency'][sha1($this->source->filepath)] = array($this->source->filepath, $this->source->timestamp, 'file');
-        }
-        if ($this->mustCompile()) {
-            $this->compileConfigSource();
-        }
-        // pointer to scope
-        if ($scope == 'local') {
-            $scope_ptr = $this->data;
-        } elseif ($scope == 'parent') {
-            if (isset($this->data->parent)) {
-                $scope_ptr = $this->data->parent;
-            } else {
-                $scope_ptr = $this->data;
-            }
-        } elseif ($scope == 'root' || $scope == 'global') {
-            $scope_ptr = $this->data;
-            while (isset($scope_ptr->parent)) {
-                $scope_ptr = $scope_ptr->parent;
-            }
-        }
-        $_config_vars = array();
-        include($this->getCompiledFilepath());
-        // copy global config vars
-        foreach ($_config_vars['vars'] as $variable => $value) {
-            if ($this->smarty->config_overwrite || !isset($scope_ptr->config_vars[$variable])) {
-                $scope_ptr->config_vars[$variable] = $value;
-            } else {
-                $scope_ptr->config_vars[$variable] = array_merge((array) $scope_ptr->config_vars[$variable], (array) $value);
-            }
-        }
-        // scan sections
-        if (!empty($sections)) {
-            foreach ((array) $sections as $this_section) {
-                if (isset($_config_vars['sections'][$this_section])) {
-                    foreach ($_config_vars['sections'][$this_section]['vars'] as $variable => $value) {
-                        if ($this->smarty->config_overwrite || !isset($scope_ptr->config_vars[$variable])) {
-                            $scope_ptr->config_vars[$variable] = $value;
-                        } else {
-                            $scope_ptr->config_vars[$variable] = array_merge((array) $scope_ptr->config_vars[$variable], (array) $value);
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    /**
-     * set Smarty property in template context
-     *
-     * @param string $property_name property name
-     * @param mixed  $value         value
-     * @throws SmartyException if $property_name is not valid
-     */
-    public function __set($property_name, $value)
-    {
-        switch ($property_name) {
-            case 'source':
-            case 'compiled':
-                $this->$property_name = $value;
-                return;
-        }
-
-        throw new SmartyException("invalid config property '$property_name'.");
-    }
-
-    /**
-     * get Smarty property in template context
-     *
-     * @param string $property_name property name
-     * @throws SmartyException if $property_name is not valid
-     */
-    public function __get($property_name)
-    {
-        switch ($property_name) {
-            case 'source':
-                if (empty($this->config_resource)) {
-                    throw new SmartyException("Unable to parse resource name \"{$this->config_resource}\"");
-                }
-                $this->source = Smarty_Resource::config($this);
-                return $this->source;
-
-            case 'compiled':
-                $this->compiled = $this->source->getCompiled($this);
-                return $this->compiled;
-        }
-
-        throw new SmartyException("config attribute '$property_name' does not exist.");
-    }
-
-}
-
-?>
\ No newline at end of file
diff --git a/include/smarty/libs/sysplugins/smarty_internal_config_file_compiler.php b/include/smarty/libs/sysplugins/smarty_internal_config_file_compiler.php
index b16a6940d..56d3b0665 100644
--- a/include/smarty/libs/sysplugins/smarty_internal_config_file_compiler.php
+++ b/include/smarty/libs/sysplugins/smarty_internal_config_file_compiler.php
@@ -1,22 +1,35 @@
 <?php
 /**
  * Smarty Internal Plugin Config File Compiler
- *
  * This is the config file compiler class. It calls the lexer and parser to
  * perform the compiling.
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage Config
- * @author Uwe Tews
+ * @author     Uwe Tews
  */
 
 /**
  * Main config file compiler class
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage Config
  */
-class Smarty_Internal_Config_File_Compiler {
+class Smarty_Internal_Config_File_Compiler
+{
+    /**
+     * Lexer class name
+     *
+     * @var string
+     */
+    public $lexer_class;
+
+    /**
+     * Parser class name
+     *
+     * @var string
+     */
+    public $parser_class;
 
     /**
      * Lexer object
@@ -42,9 +55,9 @@ class Smarty_Internal_Config_File_Compiler {
     /**
      * Smarty object
      *
-     * @var Smarty_Internal_Config object
+     * @var Smarty_Internal_Template object
      */
-    public $config;
+    public $template;
 
     /**
      * Compiled config data sections and variables
@@ -54,75 +67,115 @@ class Smarty_Internal_Config_File_Compiler {
     public $config_data = array();
 
     /**
+     * compiled config data must always be written
+     *
+     * @var bool
+     */
+    public $write_compiled_code = true;
+
+    /**
      * Initialize compiler
      *
-     * @param Smarty $smarty base instance
+     * @param string $lexer_class  class name
+     * @param string $parser_class class name
+     * @param Smarty $smarty       global instance
      */
-    public function __construct($smarty)
+    public function __construct($lexer_class, $parser_class, Smarty $smarty)
     {
         $this->smarty = $smarty;
+        // get required plugins
+        $this->lexer_class = $lexer_class;
+        $this->parser_class = $parser_class;
+        $this->smarty = $smarty;
         $this->config_data['sections'] = array();
         $this->config_data['vars'] = array();
     }
 
     /**
-     * Method to compile a Smarty template.
+     * Method to compile Smarty config source.
+     *
+     * @param Smarty_Internal_Template $template
      *
-     * @param  Smarty_Internal_Config $config config object
      * @return bool true if compiling succeeded, false if it failed
      */
-    public function compileSource(Smarty_Internal_Config $config)
+    public function compileTemplate(Smarty_Internal_Template $template)
     {
-        /* here is where the compiling takes place. Smarty
-          tags in the templates are replaces with PHP code,
-          then written to compiled files. */
-        $this->config = $config;
-        // get config file source
-        $_content = $config->source->content . "\n";
-        // on empty template just return
-        if ($_content == '') {
-            return true;
+        $this->template = $template;
+        $this->template->compiled->file_dependency[$this->template->source->uid] = array($this->template->source->filepath,
+                                                                                             $this->template->source->getTimeStamp(),
+                                                                                             $this->template->source->type);
+        if ($this->smarty->debugging) {
+            $this->smarty->_debug->start_compile($this->template);
         }
         // init the lexer/parser to compile the config file
-        $lex = new Smarty_Internal_Configfilelexer($_content, $this->smarty);
-        $parser = new Smarty_Internal_Configfileparser($lex, $this);
-        if ($this->smarty->_parserdebug) $parser->PrintTrace();
+        /* @var Smarty_Internal_ConfigFileLexer $lex */
+        $lex = new $this->lexer_class(str_replace(array("\r\n", "\r"), "\n", $template->source->getContent()) .
+                                      "\n", $this);
+        /* @var Smarty_Internal_ConfigFileParser $parser */
+        $parser = new $this->parser_class($lex, $this);
+
+        if (function_exists('mb_internal_encoding') && ((int) ini_get('mbstring.func_overload')) & 2) {
+            $mbEncoding = mb_internal_encoding();
+            mb_internal_encoding('ASCII');
+        } else {
+            $mbEncoding = null;
+        }
+
+        if ($this->smarty->_parserdebug) {
+            $parser->PrintTrace();
+        }
         // get tokens from lexer and parse them
         while ($lex->yylex()) {
-            if ($this->smarty->_parserdebug) echo "<br>Parsing  {$parser->yyTokenName[$lex->token]} Token {$lex->value} Line {$lex->line} \n";
+            if ($this->smarty->_parserdebug) {
+                echo "<br>Parsing  {$parser->yyTokenName[$lex->token]} Token {$lex->value} Line {$lex->line} \n";
+            }
             $parser->doParse($lex->token, $lex->value);
         }
         // finish parsing process
         $parser->doParse(0, 0);
-        $config->compiled_config = '<?php $_config_vars = ' . var_export($this->config_data, true) . '; ?>';
+
+        if ($mbEncoding) {
+            mb_internal_encoding($mbEncoding);
+        }
+        if ($this->smarty->debugging) {
+            $this->smarty->_debug->end_compile($this->template);
+        }
+        // template header code
+        $template_header = "<?php /* Smarty version " . Smarty::SMARTY_VERSION . ", created on " .
+            strftime("%Y-%m-%d %H:%M:%S") . "\n";
+        $template_header .= "         compiled from \"" . $this->template->source->filepath . "\" */ ?>\n";
+
+        $code = '<?php $_smarty_tpl->smarty->ext->configLoad->_loadConfigVars($_smarty_tpl, ' .
+            var_export($this->config_data, true) . '); ?>';
+        return $template_header . $this->template->smarty->ext->_codeFrame->create($this->template, $code);
     }
 
     /**
      * display compiler error messages without dying
-     *
      * If parameter $args is empty it is a parser detected syntax error.
-     * In this case the parser is called to obtain information about exspected tokens.
-     *
+     * In this case the parser is called to obtain information about expected tokens.
      * If parameter $args contains a string this is used as error message
      *
      * @param string $args individual error message or null
+     *
+     * @throws SmartyCompilerException
      */
     public function trigger_config_file_error($args = null)
     {
         $this->lex = Smarty_Internal_Configfilelexer::instance();
         $this->parser = Smarty_Internal_Configfileparser::instance();
-        // get template source line which has error
+        // get config source line which has error
         $line = $this->lex->line;
         if (isset($args)) {
             // $line--;
         }
         $match = preg_split("/\n/", $this->lex->data);
-        $error_text = "Syntax error in config file '{$this->config->source->filepath}' on line {$line} '{$match[$line-1]}' ";
+        $error_text = "Syntax error in config file '{$this->template->source->filepath}' on line {$line} '{$match[$line - 1]}' ";
         if (isset($args)) {
             // individual error message
             $error_text .= $args;
         } else {
-            // exspected token from parser
+            // expected token from parser
             foreach ($this->parser->yy_get_expected_tokens($this->parser->yymajor) as $token) {
                 $exp_token = $this->parser->yyTokenName[$token];
                 if (isset($this->lex->smarty_token_names[$exp_token])) {
@@ -138,7 +191,4 @@ class Smarty_Internal_Config_File_Compiler {
         }
         throw new SmartyCompilerException($error_text);
     }
-
 }
-
-?>
\ No newline at end of file
diff --git a/include/smarty/libs/sysplugins/smarty_internal_configfilelexer.php b/include/smarty/libs/sysplugins/smarty_internal_configfilelexer.php
index bade2fe74..e62728c2c 100644
--- a/include/smarty/libs/sysplugins/smarty_internal_configfilelexer.php
+++ b/include/smarty/libs/sysplugins/smarty_internal_configfilelexer.php
@@ -1,115 +1,238 @@
 <?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 Plugin Configfilelexer
-*/
+ * 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;
-    public $node;
-    public $line;
-    private $state = 1;
-    public $smarty_token_names = array (		// Text for parser error messages
-   				);
 
+    /**
+     * current line
+     *
+     * @var int
+     */
+    public $line;
 
-    function __construct($data, $smarty)
+    /**
+     * 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
+     *
+     * @var array
+     */
+    public $smarty_token_names = array(        // Text for parser error messages
+    );
+
+    /**
+     * constructor
+     *
+     * @param   string                             $data template source
+     * @param Smarty_Internal_Config_File_Compiler $compiler
+     */
+    function __construct($data, Smarty_Internal_Config_File_Compiler $compiler)
     {
         // set instance object
         self::instance($this);
         $this->data = $data . "\n"; //now all lines are \n-terminated
         $this->counter = 0;
+        if (preg_match('/^\xEF\xBB\xBF/', $this->data, $match)) {
+            $this->counter += strlen($match[0]);
+        }
         $this->line = 1;
-        $this->smarty = $smarty;
-        $this->mbstring_overload = ini_get('mbstring.func_overload') & 2;
+        $this->compiler = $compiler;
+        $this->smarty = $compiler->smarty;
+        $this->configBooleanize = $this->smarty->config_booleanize;
     }
+
     public static function &instance($new_instance = null)
     {
         static $instance = null;
-        if (isset($new_instance) && is_object($new_instance))
+        if (isset($new_instance) && is_object($new_instance)) {
             $instance = $new_instance;
+        }
         return $instance;
     }
 
-
+    public function PrintTrace()
+    {
+        $this->yyTraceFILE = fopen('php://output', 'w');
+        $this->yyTracePrompt = '<br>';
+    }
 
     private $_yy_state = 1;
+
     private $_yy_stack = array();
 
-    function yylex()
+    public function yylex()
     {
         return $this->{'yylex' . $this->_yy_state}();
     }
 
-    function yypushstate($state)
+    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);
+        }
         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);
+        }
     }
 
-    function yypopstate()
+    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);
+        }
     }
 
-    function yybegin($state)
+    public function yybegin($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);
+        }
     }
 
-
-
-
-    function yylex1()
+    public function yylex1()
     {
-        $tokenMap = array (
-              1 => 0,
-              2 => 0,
-              3 => 0,
-              4 => 0,
-              5 => 0,
-              6 => 0,
-              7 => 0,
-              8 => 0,
-            );
-        if ($this->counter >= ($this->mbstring_overload ? mb_strlen($this->data,'latin1'): 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])/isS";
+        }
+        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 ($this->mbstring_overload ? preg_match($yy_global_pattern, mb_substr($this->data, $this->counter,2000000000,'latin1'), $yymatches) : 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 = array_filter($yymatches, 'strlen'); // remove empty sub-patterns
-                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 (strlen($yysubmatches[0]) < 200) {
+                    $yymatches = preg_grep("/(.|\s)+/", $yysubmatches);
+                } else {
+                    $yymatches = array_filter($yymatches, 'strlen');
+                }
+                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 += ($this->mbstring_overload ? mb_strlen($this->value,'latin1'): strlen($this->value));
+                    $this->counter += strlen($this->value);
                     $this->line += substr_count($this->value, "\n");
                     // accept this token
                     return true;
@@ -118,110 +241,100 @@ class Smarty_Internal_Configfilelexer
                     // process this token in the new state
                     return $this->yylex();
                 } elseif ($r === false) {
-                    $this->counter += ($this->mbstring_overload ? mb_strlen($this->value,'latin1'): strlen($this->value));
+                    $this->counter += strlen($this->value);
                     $this->line += substr_count($this->value, "\n");
-                    if ($this->counter >= ($this->mbstring_overload ? mb_strlen($this->data,'latin1'): 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)
-    {
 
-    $this->token = Smarty_Internal_Configfileparser::TPC_COMMENTSTART;
-    $this->yypushstate(self::COMMENT);
-    }
-    function yy_r1_2($yy_subpatterns)
+    function yy_r1_1()
     {
 
-    $this->token = Smarty_Internal_Configfileparser::TPC_OPENB;
-    $this->yypushstate(self::SECTION);
+        $this->token = Smarty_Internal_Configfileparser::TPC_COMMENTSTART;
+        $this->yypushstate(self::COMMENT);
     }
-    function yy_r1_3($yy_subpatterns)
+
+    function yy_r1_2()
     {
 
-    $this->token = Smarty_Internal_Configfileparser::TPC_CLOSEB;
+        $this->token = Smarty_Internal_Configfileparser::TPC_OPENB;
+        $this->yypushstate(self::SECTION);
     }
-    function yy_r1_4($yy_subpatterns)
+
+    function yy_r1_3()
     {
 
-    $this->token = Smarty_Internal_Configfileparser::TPC_EQUAL;
-    $this->yypushstate(self::VALUE);
+        $this->token = Smarty_Internal_Configfileparser::TPC_CLOSEB;
     }
-    function yy_r1_5($yy_subpatterns)
+
+    function yy_r1_4()
     {
 
-    return false;
+        $this->token = Smarty_Internal_Configfileparser::TPC_EQUAL;
+        $this->yypushstate(self::VALUE);
     }
-    function yy_r1_6($yy_subpatterns)
+
+    function yy_r1_5()
     {
 
-    $this->token = Smarty_Internal_Configfileparser::TPC_NEWLINE;
+        return false;
     }
-    function yy_r1_7($yy_subpatterns)
+
+    function yy_r1_6()
     {
 
-    $this->token = Smarty_Internal_Configfileparser::TPC_ID;
+        $this->token = Smarty_Internal_Configfileparser::TPC_NEWLINE;
     }
-    function yy_r1_8($yy_subpatterns)
+
+    function yy_r1_7()
     {
 
-    $this->token = Smarty_Internal_Configfileparser::TPC_OTHER;
+        $this->token = Smarty_Internal_Configfileparser::TPC_ID;
     }
 
+    function yy_r1_8()
+    {
 
+        $this->token = Smarty_Internal_Configfileparser::TPC_OTHER;
+    }
 
-    function yylex2()
+    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 >= ($this->mbstring_overload ? mb_strlen($this->data,'latin1'): 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)/isS";
+        }
+        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 ($this->mbstring_overload ? preg_match($yy_global_pattern, mb_substr($this->data, $this->counter,2000000000,'latin1'), $yymatches) : 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 = array_filter($yymatches, 'strlen'); // remove empty sub-patterns
-                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 (strlen($yysubmatches[0]) < 200) {
+                    $yymatches = preg_grep("/(.|\s)+/", $yysubmatches);
+                } else {
+                    $yymatches = array_filter($yymatches, 'strlen');
+                }
+                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 += ($this->mbstring_overload ? mb_strlen($this->value,'latin1'): strlen($this->value));
+                    $this->counter += strlen($this->value);
                     $this->line += substr_count($this->value, "\n");
                     // accept this token
                     return true;
@@ -230,119 +343,120 @@ class Smarty_Internal_Configfilelexer
                     // process this token in the new state
                     return $this->yylex();
                 } elseif ($r === false) {
-                    $this->counter += ($this->mbstring_overload ? mb_strlen($this->value,'latin1'): strlen($this->value));
+                    $this->counter += strlen($this->value);
                     $this->line += substr_count($this->value, "\n");
-                    if ($this->counter >= ($this->mbstring_overload ? mb_strlen($this->data,'latin1'): 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)
-    {
 
-    return false;
-    }
-    function yy_r2_2($yy_subpatterns)
+    function yy_r2_1()
     {
 
-    $this->token = Smarty_Internal_Configfileparser::TPC_FLOAT;
-    $this->yypopstate();
+        return false;
     }
-    function yy_r2_3($yy_subpatterns)
+
+    function yy_r2_2()
     {
 
-    $this->token = Smarty_Internal_Configfileparser::TPC_INT;
-    $this->yypopstate();
+        $this->token = Smarty_Internal_Configfileparser::TPC_FLOAT;
+        $this->yypopstate();
     }
-    function yy_r2_4($yy_subpatterns)
+
+    function yy_r2_3()
     {
 
-    $this->token = Smarty_Internal_Configfileparser::TPC_TRIPPLE_QUOTES;
-    $this->yypushstate(self::TRIPPLE);
+        $this->token = Smarty_Internal_Configfileparser::TPC_INT;
+        $this->yypopstate();
     }
-    function yy_r2_5($yy_subpatterns)
+
+    function yy_r2_4()
     {
 
-    $this->token = Smarty_Internal_Configfileparser::TPC_SINGLE_QUOTED_STRING;
-    $this->yypopstate();
+        $this->token = Smarty_Internal_Configfileparser::TPC_TRIPPLE_QUOTES;
+        $this->yypushstate(self::TRIPPLE);
     }
-    function yy_r2_6($yy_subpatterns)
+
+    function yy_r2_5()
     {
 
-    $this->token = Smarty_Internal_Configfileparser::TPC_DOUBLE_QUOTED_STRING;
-    $this->yypopstate();
+        $this->token = Smarty_Internal_Configfileparser::TPC_SINGLE_QUOTED_STRING;
+        $this->yypopstate();
     }
-    function yy_r2_7($yy_subpatterns)
+
+    function yy_r2_6()
     {
 
-    if (!$this->smarty->config_booleanize || !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_DOUBLE_QUOTED_STRING;
         $this->yypopstate();
     }
-    }
-    function yy_r2_8($yy_subpatterns)
+
+    function yy_r2_7()
     {
 
-    $this->token = Smarty_Internal_Configfileparser::TPC_NAKED_STRING;
-    $this->yypopstate();
+        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_9($yy_subpatterns)
+
+    function yy_r2_8()
     {
 
-    $this->token = Smarty_Internal_Configfileparser::TPC_NAKED_STRING;
-    $this->value = "";
-    $this->yypopstate();
+        $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();
+    }
 
-    function yylex3()
+    public function yylex3()
     {
-        $tokenMap = array (
-              1 => 0,
-            );
-        if ($this->counter >= ($this->mbstring_overload ? mb_strlen($this->data,'latin1'): strlen($this->data))) {
+        if (!isset($this->yy_global_pattern3)) {
+            $this->yy_global_pattern3 = "/\G([^\n]+?(?=[ \t\r]*\n))/isS";
+        }
+        if ($this->counter >= strlen($this->data)) {
             return false; // end of input
         }
-        $yy_global_pattern = "/\G([^\n]+?(?=[ \t\r]*\n))/iS";
 
         do {
-            if ($this->mbstring_overload ? preg_match($yy_global_pattern, mb_substr($this->data, $this->counter,2000000000,'latin1'), $yymatches) : 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 = array_filter($yymatches, 'strlen'); // remove empty sub-patterns
-                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 (strlen($yysubmatches[0]) < 200) {
+                    $yymatches = preg_grep("/(.|\s)+/", $yysubmatches);
+                } else {
+                    $yymatches = array_filter($yymatches, 'strlen');
+                }
+                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 += ($this->mbstring_overload ? mb_strlen($this->value,'latin1'): strlen($this->value));
+                    $this->counter += strlen($this->value);
                     $this->line += substr_count($this->value, "\n");
                     // accept this token
                     return true;
@@ -351,67 +465,56 @@ class Smarty_Internal_Configfilelexer
                     // process this token in the new state
                     return $this->yylex();
                 } elseif ($r === false) {
-                    $this->counter += ($this->mbstring_overload ? mb_strlen($this->value,'latin1'): strlen($this->value));
+                    $this->counter += strlen($this->value);
                     $this->line += substr_count($this->value, "\n");
-                    if ($this->counter >= ($this->mbstring_overload ? mb_strlen($this->data,'latin1'): 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();
     }
 
-
-
-    function yylex4()
+    public function yylex4()
     {
-        $tokenMap = array (
-              1 => 0,
-              2 => 0,
-              3 => 0,
-            );
-        if ($this->counter >= ($this->mbstring_overload ? mb_strlen($this->data,'latin1'): strlen($this->data))) {
+        if (!isset($this->yy_global_pattern4)) {
+            $this->yy_global_pattern4 = "/\G([ \t\r]+)|\G([^\n]+?(?=[ \t\r]*\n))|\G(\n)/isS";
+        }
+        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 ($this->mbstring_overload ? preg_match($yy_global_pattern, mb_substr($this->data, $this->counter,2000000000,'latin1'), $yymatches) : 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 = array_filter($yymatches, 'strlen'); // remove empty sub-patterns
-                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 (strlen($yysubmatches[0]) < 200) {
+                    $yymatches = preg_grep("/(.|\s)+/", $yysubmatches);
+                } else {
+                    $yymatches = array_filter($yymatches, 'strlen');
+                }
+                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 += ($this->mbstring_overload ? mb_strlen($this->value,'latin1'): strlen($this->value));
+                    $this->counter += strlen($this->value);
                     $this->line += substr_count($this->value, "\n");
                     // accept this token
                     return true;
@@ -420,76 +523,68 @@ class Smarty_Internal_Configfilelexer
                     // process this token in the new state
                     return $this->yylex();
                 } elseif ($r === false) {
-                    $this->counter += ($this->mbstring_overload ? mb_strlen($this->value,'latin1'): strlen($this->value));
+                    $this->counter += strlen($this->value);
                     $this->line += substr_count($this->value, "\n");
-                    if ($this->counter >= ($this->mbstring_overload ? mb_strlen($this->data,'latin1'): 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)
-    {
 
-    return false;
-    }
-    function yy_r4_2($yy_subpatterns)
+    function yy_r4_1()
     {
 
-    $this->token = Smarty_Internal_Configfileparser::TPC_NAKED_STRING;
+        return false;
     }
-    function yy_r4_3($yy_subpatterns)
+
+    function yy_r4_2()
     {
 
-    $this->token = Smarty_Internal_Configfileparser::TPC_NEWLINE;
-    $this->yypopstate();
+        $this->token = Smarty_Internal_Configfileparser::TPC_NAKED_STRING;
     }
 
+    function yy_r4_3()
+    {
 
+        $this->token = Smarty_Internal_Configfileparser::TPC_NEWLINE;
+        $this->yypopstate();
+    }
 
-    function yylex5()
+    public function yylex5()
     {
-        $tokenMap = array (
-              1 => 0,
-              2 => 0,
-            );
-        if ($this->counter >= ($this->mbstring_overload ? mb_strlen($this->data,'latin1'): strlen($this->data))) {
+        if (!isset($this->yy_global_pattern5)) {
+            $this->yy_global_pattern5 = "/\G(\\.)|\G(.*?(?=[\.=[\]\r\n]))/isS";
+        }
+        if ($this->counter >= strlen($this->data)) {
             return false; // end of input
         }
-        $yy_global_pattern = "/\G(\\.)|\G(.*?(?=[\.=[\]\r\n]))/iS";
 
         do {
-            if ($this->mbstring_overload ? preg_match($yy_global_pattern, mb_substr($this->data, $this->counter,2000000000,'latin1'), $yymatches) : 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 = array_filter($yymatches, 'strlen'); // remove empty sub-patterns
-                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 (strlen($yysubmatches[0]) < 200) {
+                    $yymatches = preg_grep("/(.|\s)+/", $yysubmatches);
+                } else {
+                    $yymatches = array_filter($yymatches, 'strlen');
+                }
+                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 += ($this->mbstring_overload ? mb_strlen($this->value,'latin1'): strlen($this->value));
+                    $this->counter += strlen($this->value);
                     $this->line += substr_count($this->value, "\n");
                     // accept this token
                     return true;
@@ -498,70 +593,62 @@ class Smarty_Internal_Configfilelexer
                     // process this token in the new state
                     return $this->yylex();
                 } elseif ($r === false) {
-                    $this->counter += ($this->mbstring_overload ? mb_strlen($this->value,'latin1'): strlen($this->value));
+                    $this->counter += strlen($this->value);
                     $this->line += substr_count($this->value, "\n");
-                    if ($this->counter >= ($this->mbstring_overload ? mb_strlen($this->data,'latin1'): 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();
     }
 
-
-    function yylex6()
+    public function yylex6()
     {
-        $tokenMap = array (
-              1 => 0,
-              2 => 0,
-            );
-        if ($this->counter >= ($this->mbstring_overload ? mb_strlen($this->data,'latin1'): strlen($this->data))) {
+        if (!isset($this->yy_global_pattern6)) {
+            $this->yy_global_pattern6 = "/\G(\"\"\"(?=[ \t\r]*[\n#;]))|\G([\S\s])/isS";
+        }
+        if ($this->counter >= strlen($this->data)) {
             return false; // end of input
         }
-        $yy_global_pattern = "/\G(\"\"\"(?=[ \t\r]*[\n#;]))|\G([\S\s])/iS";
 
         do {
-            if ($this->mbstring_overload ? preg_match($yy_global_pattern, mb_substr($this->data, $this->counter,2000000000,'latin1'), $yymatches) : 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 = array_filter($yymatches, 'strlen'); // remove empty sub-patterns
-                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 (strlen($yysubmatches[0]) < 200) {
+                    $yymatches = preg_grep("/(.|\s)+/", $yysubmatches);
+                } else {
+                    $yymatches = array_filter($yymatches, 'strlen');
+                }
+                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 += ($this->mbstring_overload ? mb_strlen($this->value,'latin1'): strlen($this->value));
+                    $this->counter += strlen($this->value);
                     $this->line += substr_count($this->value, "\n");
                     // accept this token
                     return true;
@@ -570,53 +657,43 @@ class Smarty_Internal_Configfilelexer
                     // process this token in the new state
                     return $this->yylex();
                 } elseif ($r === false) {
-                    $this->counter += ($this->mbstring_overload ? mb_strlen($this->value,'latin1'): strlen($this->value));
+                    $this->counter += strlen($this->value);
                     $this->line += substr_count($this->value, "\n");
-                    if ($this->counter >= ($this->mbstring_overload ? mb_strlen($this->data,'latin1'): 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()
     {
 
-  if ($this->mbstring_overload) {
-    $to = mb_strlen($this->data,'latin1');
-  } else {
-    $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");
-  }
-  if ($this->mbstring_overload) {
-    $this->value = mb_substr($this->data,$this->counter,$to-$this->counter,'latin1');
-  } else {
-    $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;
     }
 
-
 }
-?>
\ No newline at end of file
diff --git a/include/smarty/libs/sysplugins/smarty_internal_configfileparser.php b/include/smarty/libs/sysplugins/smarty_internal_configfileparser.php
index 784bc684d..69aaf990f 100644
--- a/include/smarty/libs/sysplugins/smarty_internal_configfileparser.php
+++ b/include/smarty/libs/sysplugins/smarty_internal_configfileparser.php
@@ -1,20 +1,12 @@
 <?php
-/**
-* Smarty Internal Plugin Configfileparser
-*
-* This is the config file parser.
-* It is generated from the internal.configfileparser.y file
-* @package Smarty
-* @subpackage Compiler
-* @author Uwe Tews
-*/
 
 class TPC_yyToken implements ArrayAccess
 {
     public $string = '';
+
     public $metadata = array();
 
-    function __construct($s, $m = array())
+    public function __construct($s, $m = array())
     {
         if ($s instanceof TPC_yyToken) {
             $this->string = $s->string;
@@ -29,28 +21,28 @@ class TPC_yyToken implements ArrayAccess
         }
     }
 
-    function __toString()
+    public function __toString()
     {
-        return $this->_string;
+        return $this->string;
     }
 
-    function offsetExists($offset)
+    public function offsetExists($offset)
     {
         return isset($this->metadata[$offset]);
     }
 
-    function offsetGet($offset)
+    public function offsetGet($offset)
     {
         return $this->metadata[$offset];
     }
 
-    function offsetSet($offset, $value)
+    public function offsetSet($offset, $value)
     {
         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;
             }
             $offset = count($this->metadata);
@@ -67,7 +59,7 @@ class TPC_yyToken implements ArrayAccess
         }
     }
 
-    function offsetUnset($offset)
+    public function offsetUnset($offset)
     {
         unset($this->metadata[$offset]);
     }
@@ -80,37 +72,136 @@ class TPC_yyStackEntry
                      ** 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"
 
-#line 12 "smarty_internal_configfileparser.y"
-class Smarty_Internal_Configfileparser#line 79 "smarty_internal_configfileparser.php"
+/**
+ * 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 14 "smarty_internal_configfileparser.y"
+    #line 25 "../smarty/lexer/smarty_internal_configfileparser.y"
 
-    // states whether the parse was successful or not
+    /**
+     * result status
+     *
+     * @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;
 
-    function __construct($lex, $compiler) {
+    /**
+     * 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('\\' => '\\', '\'' => '\'');
+
+    /**
+     * constructor
+     *
+     * @param Smarty_Internal_Configfilelexer      $lex
+     * @param Smarty_Internal_Config_File_Compiler $compiler
+     */
+    function __construct(Smarty_Internal_Configfilelexer $lex, Smarty_Internal_Config_File_Compiler $compiler)
+    {
         // set instance object
         self::instance($this);
         $this->lex = $lex;
         $this->smarty = $compiler->smarty;
         $this->compiler = $compiler;
+        $this->configOverwrite = $this->smarty->config_overwrite;
+        $this->configReadHidden = $this->smarty->config_read_hidden;
     }
+
+    /**
+     * @param null $new_instance
+     *
+     * @return null
+     */
     public static function &instance($new_instance = null)
     {
         static $instance = null;
-        if (isset($new_instance) && is_object($new_instance))
+        if (isset($new_instance) && is_object($new_instance)) {
             $instance = $new_instance;
+        }
         return $instance;
     }
 
-    private function parse_bool($str) {
-        if (in_array(strtolower($str) ,array('on','yes','true'))) {
+    /**
+     * parse optional boolean keywords
+     *
+     * @param string $str
+     *
+     * @return bool
+     */
+    private function parse_bool($str)
+    {
+        $str = strtolower($str);
+        if (in_array($str, array('on', 'yes', 'true'))) {
             $res = true;
         } else {
             $res = false;
@@ -118,12 +209,20 @@ class Smarty_Internal_Configfileparser#line 79 "smarty_internal_configfileparser
         return $res;
     }
 
-    private static $escapes_single = Array('\\' => '\\',
-                                          '\'' => '\'');
-    private static function parse_single_quoted_string($qstr) {
-        $escaped_string = substr($qstr, 1, strlen($qstr)-2); //remove outer quotes
+    /**
+     * parse single quoted string
+     *  remove outer quotes
+     *  unescape inner quotes
+     *
+     * @param string $qstr
+     *
+     * @return string
+     */
+    private static function parse_single_quoted_string($qstr)
+    {
+        $escaped_string = substr($qstr, 1, strlen($qstr) - 2); //remove outer quotes
 
-        $ss = preg_split('/(\\\\.)/', $escaped_string, -1, PREG_SPLIT_DELIM_CAPTURE);
+        $ss = preg_split('/(\\\\.)/', $escaped_string, - 1, PREG_SPLIT_DELIM_CAPTURE);
 
         $str = "";
         foreach ($ss as $s) {
@@ -131,28 +230,49 @@ class Smarty_Internal_Configfileparser#line 79 "smarty_internal_configfileparser
                 if (isset(self::$escapes_single[$s[1]])) {
                     $s = self::$escapes_single[$s[1]];
                 }
-             }
-
-             $str .= $s;
+            }
+            $str .= $s;
         }
-
         return $str;
     }
 
-    private static function parse_double_quoted_string($qstr) {
-        $inner_str = substr($qstr, 1, strlen($qstr)-2);
+    /**
+     * parse double quoted string
+     *
+     * @param string $qstr
+     *
+     * @return string
+     */
+    private static function parse_double_quoted_string($qstr)
+    {
+        $inner_str = substr($qstr, 1, strlen($qstr) - 2);
         return stripcslashes($inner_str);
     }
 
-    private static function parse_tripple_double_quoted_string($qstr) {
+    /**
+     * parse triple quoted string
+     *
+     * @param string $qstr
+     *
+     * @return string
+     */
+    private static function parse_tripple_double_quoted_string($qstr)
+    {
         return stripcslashes($qstr);
     }
 
-    private function set_var(Array $var, Array &$target_array) {
+    /**
+     * set a config variable in target array
+     *
+     * @param array $var
+     * @param array $target_array
+     */
+    private function set_var(Array $var, Array &$target_array)
+    {
         $key = $var["key"];
         $value = $var["value"];
 
-        if ($this->smarty->config_overwrite || !isset($target_array['vars'][$key])) {
+        if ($this->configOverwrite || !isset($target_array['vars'][$key])) {
             $target_array['vars'][$key] = $value;
         } else {
             settype($target_array['vars'][$key], 'array');
@@ -160,16 +280,29 @@ class Smarty_Internal_Configfileparser#line 79 "smarty_internal_configfileparser
         }
     }
 
-    private function add_global_vars(Array $vars) {
+    /**
+     * add config variable to global vars
+     *
+     * @param array $vars
+     */
+    private function add_global_vars(Array $vars)
+    {
         if (!isset($this->compiler->config_data['vars'])) {
-      $this->compiler->config_data['vars'] = Array();
+            $this->compiler->config_data['vars'] = Array();
         }
         foreach ($vars as $var) {
             $this->set_var($var, $this->compiler->config_data);
         }
     }
 
-    private function add_section_vars($section_name, Array $vars) {
+    /**
+     * add config variable to section
+     *
+     * @param string $section_name
+     * @param array  $vars
+     */
+    private function add_section_vars($section_name, Array $vars)
+    {
         if (!isset($this->compiler->config_data['sections'][$section_name]['vars'])) {
             $this->compiler->config_data['sections'][$section_name]['vars'] = Array();
         }
@@ -177,167 +310,135 @@ class Smarty_Internal_Configfileparser#line 79 "smarty_internal_configfileparser
             $this->set_var($var, $this->compiler->config_data['sections'][$section_name]);
         }
     }
-#line 173 "smarty_internal_configfileparser.php"
-
-    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(
- /*     0 */    29,   30,   34,   33,   24,   13,   19,   25,   35,   21,
- /*    10 */    59,    8,    3,    1,   20,   12,   14,   31,   20,   12,
- /*    20 */    15,   17,   23,   18,   27,   26,    4,    5,    6,   32,
- /*    30 */     2,   11,   28,   22,   16,    9,    7,   10,
-    );
-    static public $yy_lookahead = array(
- /*     0 */     7,    8,    9,   10,   11,   12,    5,   27,   15,   16,
- /*    10 */    20,   21,   23,   23,   17,   18,   13,   14,   17,   18,
- /*    20 */    15,    2,   17,    4,   25,   26,    6,    3,    3,   14,
- /*    30 */    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(
- /*     0 */    -8,    1,    1,    1,   -7,   -3,   -3,   30,   -8,   -8,
- /*    10 */    -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(
- /*     0 */   -10,   -1,   -1,   -1,  -20,   10,   12,    8,   14,    7,
- /*    10 */   -11,
-);
-    static public $yyExpectedTokens = array(
-        /* 0 */ array(),
-        /* 1 */ array(5, 17, 18, ),
-        /* 2 */ array(5, 17, 18, ),
-        /* 3 */ array(5, 17, 18, ),
-        /* 4 */ array(7, 8, 9, 10, 11, 12, 15, 16, ),
-        /* 5 */ array(17, 18, ),
-        /* 6 */ array(17, 18, ),
-        /* 7 */ array(1, ),
-        /* 8 */ array(),
-        /* 9 */ array(),
-        /* 10 */ array(),
-        /* 11 */ array(2, 4, ),
-        /* 12 */ array(15, 17, ),
-        /* 13 */ array(13, 14, ),
-        /* 14 */ array(14, ),
-        /* 15 */ array(17, ),
-        /* 16 */ array(3, ),
-        /* 17 */ array(3, ),
-        /* 18 */ array(2, ),
-        /* 19 */ array(6, ),
-        /* 20 */ array(),
-        /* 21 */ array(),
-        /* 22 */ array(),
-        /* 23 */ array(),
-        /* 24 */ array(),
-        /* 25 */ array(),
-        /* 26 */ array(),
-        /* 27 */ array(),
-        /* 28 */ array(),
-        /* 29 */ array(),
-        /* 30 */ array(),
-        /* 31 */ array(),
-        /* 32 */ array(),
-        /* 33 */ array(),
-        /* 34 */ array(),
-        /* 35 */ array(),
-);
-    static public $yy_default = array(
- /*     0 */    44,   37,   41,   40,   58,   58,   58,   36,   39,   44,
- /*    10 */    44,   58,   58,   58,   58,   58,   58,   58,   58,   58,
- /*    20 */    55,   54,   57,   56,   50,   45,   43,   42,   38,   46,
- /*    30 */    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;
-    static public $yyFallback = array(
-    );
-    static function Trace($TraceFILE, $zTracePrompt)
+
+    public static $yyFallback = array();
+
+    public function Trace($TraceFILE, $zTracePrompt)
     {
         if (!$TraceFILE) {
             $zTracePrompt = 0;
         } elseif (!$zTracePrompt) {
             $TraceFILE = 0;
         }
-        self::$yyTraceFILE = $TraceFILE;
-        self::$yyTracePrompt = $zTracePrompt;
+        $this->yyTraceFILE = $TraceFILE;
+        $this->yyTracePrompt = $zTracePrompt;
     }
 
-    static function PrintTrace()
+    public function PrintTrace()
     {
-        self::$yyTraceFILE = fopen('php://output', 'w');
-        self::$yyTracePrompt = '<br>';
+        $this->yyTraceFILE = fopen('php://output', 'w');
+        $this->yyTracePrompt = '<br>';
     }
 
-    static public $yyTraceFILE;
-    static public $yyTracePrompt;
+    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',
-    );
-
-    static public $yyRuleName = array(
- /*   0 */ "start ::= global_vars sections",
- /*   1 */ "global_vars ::= var_list",
- /*   2 */ "sections ::= sections section",
- /*   3 */ "sections ::=",
- /*   4 */ "section ::= OPENB SECTION CLOSEB newline var_list",
- /*   5 */ "section ::= OPENB DOT SECTION CLOSEB newline var_list",
- /*   6 */ "var_list ::= var_list newline",
- /*   7 */ "var_list ::= var_list var",
- /*   8 */ "var_list ::=",
- /*   9 */ "var ::= ID EQUAL value",
- /*  10 */ "value ::= FLOAT",
- /*  11 */ "value ::= INT",
- /*  12 */ "value ::= BOOL",
- /*  13 */ "value ::= SINGLE_QUOTED_STRING",
- /*  14 */ "value ::= DOUBLE_QUOTED_STRING",
- /*  15 */ "value ::= TRIPPLE_QUOTES TRIPPLE_TEXT TRIPPLE_QUOTES_END",
- /*  16 */ "value ::= TRIPPLE_QUOTES TRIPPLE_QUOTES_END",
- /*  17 */ "value ::= NAKED_STRING",
- /*  18 */ "value ::= OTHER",
- /*  19 */ "newline ::= NEWLINE",
- /*  20 */ "newline ::= COMMENTSTART NEWLINE",
- /*  21 */ "newline ::= COMMENTSTART NAKED_STRING NEWLINE",
-    );
-
-    function tokenName($tokenType)
+    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 function tokenName($tokenType)
     {
         if ($tokenType === 0) {
             return 'End of Input';
@@ -349,46 +450,54 @@ static public $yy_action = array(
         }
     }
 
-    static function yy_destructor($yymajor, $yypminor)
+    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 */
         }
     }
 
-    function yy_pop_parser_stack()
+    public function yy_pop_parser_stack()
     {
-        if (!count($this->yystack)) {
+        if (empty($this->yystack)) {
             return;
         }
         $yytos = array_pop($this->yystack);
-        if (self::$yyTraceFILE && $this->yyidx >= 0) {
-            fwrite(self::$yyTraceFILE,
-                self::$yyTracePrompt . 'Popping ' . $this->yyTokenName[$yytos->major] .
-                    "\n");
+        if ($this->yyTraceFILE && $this->yyidx >= 0) {
+            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;
     }
 
-    function __destruct()
+    public function __destruct()
     {
         while ($this->yystack !== Array()) {
             $this->yy_pop_parser_stack();
         }
-        if (is_resource(self::$yyTraceFILE)) {
-            fclose(self::$yyTraceFILE);
+        if (is_resource($this->yyTraceFILE)) {
+            fclose($this->yyTraceFILE);
         }
     }
 
-    function yy_get_expected_tokens($token)
+    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;
@@ -398,7 +507,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
@@ -406,25 +515,30 @@ static public $yy_action = array(
                         return array_unique($expected);
                     }
                     $yyruleno = $yyact - self::YYNSTATE;
-                    $this->yyidx -= self::$yyRuleInfo[$yyruleno]['rhs'];
-                    $nextstate = $this->yy_find_reduce_action(
-                        $this->yystack[$this->yyidx]->stateno,
-                        self::$yyRuleInfo[$yyruleno]['lhs']);
+                    $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])) {
-		        $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]['lhs'];
+                        $x->major = self::$yyRuleInfo[$yyruleno][0];
                         $this->yystack[$this->yyidx] = $x;
                         continue 2;
                     } elseif ($nextstate == self::YYNSTATE + self::YYNRULE + 1) {
@@ -446,19 +560,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);
     }
 
-    function yy_is_expected_token($token)
+    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;
@@ -468,7 +591,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
@@ -476,22 +599,27 @@ static public $yy_action = array(
                         return true;
                     }
                     $yyruleno = $yyact - self::YYNSTATE;
-                    $this->yyidx -= self::$yyRuleInfo[$yyruleno]['rhs'];
-                    $nextstate = $this->yy_find_reduce_action(
-                        $this->yystack[$this->yyidx]->stateno,
-                        self::$yyRuleInfo[$yyruleno]['lhs']);
-                    if (isset(self::$yyExpectedTokens[$nextstate]) &&
-                          in_array($token, self::$yyExpectedTokens[$nextstate], true)) {
-                        $this->yyidx = $yyidx;
-                        $this->yystack = $stack;
-                        return true;
+                    $this->yyidx -= self::$yyRuleInfo[$yyruleno][1];
+                    $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]['lhs'];
+                        $x->major = self::$yyRuleInfo[$yyruleno][0];
                         $this->yystack[$this->yyidx] = $x;
                         continue 2;
                     } elseif ($nextstate == self::YYNSTATE + self::YYNRULE + 1) {
@@ -519,10 +647,11 @@ static public $yy_action = array(
         } while (true);
         $this->yyidx = $yyidx;
         $this->yystack = $stack;
+
         return true;
     }
 
-   function yy_find_shift_action($iLookAhead)
+    public function yy_find_shift_action($iLookAhead)
     {
         $stateno = $this->yystack[$this->yyidx]->stateno;
 
@@ -539,24 +668,22 @@ 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 (self::$yyTraceFILE) {
-                    fwrite(self::$yyTraceFILE, self::$yyTracePrompt . "FALLBACK " .
-                        $this->yyTokenName[$iLookAhead] . " => " .
-                        $this->yyTokenName[$iFallback] . "\n");
+        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");
                 }
+
                 return $this->yy_find_shift_action($iFallback);
             }
+
             return self::$yy_default[$stateno];
         } else {
             return self::$yy_action[$i];
         }
     }
 
-    function yy_find_reduce_action($stateno, $iLookAhead)
+    public function yy_find_reduce_action($stateno, $iLookAhead)
     {
         /* $stateno = $this->yystack[$this->yyidx]->stateno; */
 
@@ -571,213 +698,185 @@ 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];
         }
     }
 
-    function yy_shift($yyNewState, $yyMajor, $yypMinor)
+    public function yy_shift($yyNewState, $yyMajor, $yypMinor)
     {
-        $this->yyidx++;
+        $this->yyidx ++;
         if ($this->yyidx >= self::YYSTACKDEPTH) {
-            $this->yyidx--;
-            if (self::$yyTraceFILE) {
-                fprintf(self::$yyTraceFILE, "%sStack Overflow!\n", self::$yyTracePrompt);
+            $this->yyidx --;
+            if ($this->yyTraceFILE) {
+                fprintf($this->yyTraceFILE, "%sStack Overflow!\n", $this->yyTracePrompt);
             }
             while ($this->yyidx >= 0) {
                 $this->yy_pop_parser_stack();
             }
-#line 125 "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");
-#line 593 "smarty_internal_configfileparser.php"
             return;
         }
         $yytos = new TPC_yyStackEntry;
         $yytos->stateno = $yyNewState;
         $yytos->major = $yyMajor;
         $yytos->minor = $yypMinor;
-        array_push($this->yystack, $yytos);
-        if (self::$yyTraceFILE && $this->yyidx > 0) {
-            fprintf(self::$yyTraceFILE, "%sShift %d\n", self::$yyTracePrompt,
-                $yyNewState);
-            fprintf(self::$yyTraceFILE, "%sStack:", self::$yyTracePrompt);
-            for($i = 1; $i <= $this->yyidx; $i++) {
-                fprintf(self::$yyTraceFILE, " %s",
-                    $this->yyTokenName[$this->yystack[$i]->major]);
+        $this->yystack[] = $yytos;
+        if ($this->yyTraceFILE && $this->yyidx > 0) {
+            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]);
             }
-            fwrite(self::$yyTraceFILE,"\n");
-        }
-    }
-
-    static public $yyRuleInfo = array(
-  array( 'lhs' => 20, 'rhs' => 2 ),
-  array( 'lhs' => 21, 'rhs' => 1 ),
-  array( 'lhs' => 22, 'rhs' => 2 ),
-  array( 'lhs' => 22, 'rhs' => 0 ),
-  array( 'lhs' => 24, 'rhs' => 5 ),
-  array( 'lhs' => 24, 'rhs' => 6 ),
-  array( 'lhs' => 23, 'rhs' => 2 ),
-  array( 'lhs' => 23, 'rhs' => 2 ),
-  array( 'lhs' => 23, 'rhs' => 0 ),
-  array( 'lhs' => 26, 'rhs' => 3 ),
-  array( 'lhs' => 27, 'rhs' => 1 ),
-  array( 'lhs' => 27, 'rhs' => 1 ),
-  array( 'lhs' => 27, 'rhs' => 1 ),
-  array( 'lhs' => 27, 'rhs' => 1 ),
-  array( 'lhs' => 27, 'rhs' => 1 ),
-  array( 'lhs' => 27, 'rhs' => 3 ),
-  array( 'lhs' => 27, 'rhs' => 2 ),
-  array( 'lhs' => 27, 'rhs' => 1 ),
-  array( 'lhs' => 27, 'rhs' => 1 ),
-  array( 'lhs' => 25, 'rhs' => 1 ),
-  array( 'lhs' => 25, 'rhs' => 2 ),
-  array( 'lhs' => 25, 'rhs' => 3 ),
-    );
-
-    static public $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 131 "smarty_internal_configfileparser.y"
-    function yy_r0(){
-    $this->_retvalue = null;
-    }
-#line 666 "smarty_internal_configfileparser.php"
-#line 136 "smarty_internal_configfileparser.y"
-    function yy_r1(){
-    $this->add_global_vars($this->yystack[$this->yyidx + 0]->minor); $this->_retvalue = null;
-    }
-#line 671 "smarty_internal_configfileparser.php"
-#line 149 "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 677 "smarty_internal_configfileparser.php"
-#line 154 "smarty_internal_configfileparser.y"
-    function yy_r5(){
-    if ($this->smarty->config_read_hidden) {
-        $this->add_section_vars($this->yystack[$this->yyidx + -3]->minor, $this->yystack[$this->yyidx + 0]->minor);
-    }
-    $this->_retvalue = null;
-    }
-#line 685 "smarty_internal_configfileparser.php"
-#line 162 "smarty_internal_configfileparser.y"
-    function yy_r6(){
-    $this->_retvalue = $this->yystack[$this->yyidx + -1]->minor;
-    }
-#line 690 "smarty_internal_configfileparser.php"
-#line 166 "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 695 "smarty_internal_configfileparser.php"
-#line 170 "smarty_internal_configfileparser.y"
-    function yy_r8(){
-    $this->_retvalue = Array();
-    }
-#line 700 "smarty_internal_configfileparser.php"
-#line 176 "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 705 "smarty_internal_configfileparser.php"
-#line 181 "smarty_internal_configfileparser.y"
-    function yy_r10(){
-    $this->_retvalue = (float) $this->yystack[$this->yyidx + 0]->minor;
-    }
-#line 710 "smarty_internal_configfileparser.php"
-#line 185 "smarty_internal_configfileparser.y"
-    function yy_r11(){
-    $this->_retvalue = (int) $this->yystack[$this->yyidx + 0]->minor;
-    }
-#line 715 "smarty_internal_configfileparser.php"
-#line 189 "smarty_internal_configfileparser.y"
-    function yy_r12(){
-    $this->_retvalue = $this->parse_bool($this->yystack[$this->yyidx + 0]->minor);
-    }
-#line 720 "smarty_internal_configfileparser.php"
-#line 193 "smarty_internal_configfileparser.y"
-    function yy_r13(){
-    $this->_retvalue = self::parse_single_quoted_string($this->yystack[$this->yyidx + 0]->minor);
-    }
-#line 725 "smarty_internal_configfileparser.php"
-#line 197 "smarty_internal_configfileparser.y"
-    function yy_r14(){
-    $this->_retvalue = self::parse_double_quoted_string($this->yystack[$this->yyidx + 0]->minor);
-    }
-#line 730 "smarty_internal_configfileparser.php"
-#line 201 "smarty_internal_configfileparser.y"
-    function yy_r15(){
-    $this->_retvalue = self::parse_tripple_double_quoted_string($this->yystack[$this->yyidx + -1]->minor);
-    }
-#line 735 "smarty_internal_configfileparser.php"
-#line 205 "smarty_internal_configfileparser.y"
-    function yy_r16(){
-    $this->_retvalue = '';
-    }
-#line 740 "smarty_internal_configfileparser.php"
-#line 209 "smarty_internal_configfileparser.y"
-    function yy_r17(){
-    $this->_retvalue = $this->yystack[$this->yyidx + 0]->minor;
-    }
-#line 745 "smarty_internal_configfileparser.php"
+            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 $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 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);
+        }
+        $this->_retvalue = null;
+    }
+
+    #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 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 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 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 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 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;
+    }
 
     private $_retvalue;
 
-    function yy_reduce($yyruleno)
+    public function yy_reduce($yyruleno)
     {
-        $yymsp = $this->yystack[$this->yyidx];
-        if (self::$yyTraceFILE && $yyruleno >= 0
-              && $yyruleno < count(self::$yyRuleName)) {
-            fprintf(self::$yyTraceFILE, "%sReduce (%d) [%s].\n",
-                self::$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]}();
             $yy_lefthand_side = $this->_retvalue;
         }
-        $yygoto = self::$yyRuleInfo[$yyruleno]['lhs'];
-        $yysize = self::$yyRuleInfo[$yyruleno]['rhs'];
+        $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 (!self::$yyTraceFILE && $yysize) {
-                $this->yyidx++;
+            if (!$this->yyTraceFILE && $yysize) {
+                $this->yyidx ++;
                 $x = new TPC_yyStackEntry;
                 $x->stateno = $yyact;
                 $x->major = $yygoto;
@@ -791,73 +890,68 @@ static public $yy_action = array(
         }
     }
 
-    function yy_parse_failed()
+    public function yy_parse_failed()
     {
-        if (self::$yyTraceFILE) {
-            fprintf(self::$yyTraceFILE, "%sFail!\n", self::$yyTracePrompt);
+        if ($this->yyTraceFILE) {
+            fprintf($this->yyTraceFILE, "%sFail!\n", $this->yyTracePrompt);
         }
         while ($this->yyidx >= 0) {
             $this->yy_pop_parser_stack();
         }
     }
 
-    function yy_syntax_error($yymajor, $TOKEN)
+    public function yy_syntax_error($yymajor, $TOKEN)
     {
-#line 118 "smarty_internal_configfileparser.y"
+        #line 248 "../smarty/lexer/smarty_internal_configfileparser.y"
 
-    $this->internalError = true;
-    $this->yymajor = $yymajor;
-    $this->compiler->trigger_config_file_error();
-#line 808 "smarty_internal_configfileparser.php"
+        $this->internalError = true;
+        $this->yymajor = $yymajor;
+        $this->compiler->trigger_config_file_error();
     }
 
-    function yy_accept()
+    public function yy_accept()
     {
-        if (self::$yyTraceFILE) {
-            fprintf(self::$yyTraceFILE, "%sAccept!\n", self::$yyTracePrompt);
+        if ($this->yyTraceFILE) {
+            fprintf($this->yyTraceFILE, "%sAccept!\n", $this->yyTracePrompt);
         }
         while ($this->yyidx >= 0) {
-            $stack = $this->yy_pop_parser_stack();
+            $this->yy_pop_parser_stack();
         }
-#line 110 "smarty_internal_configfileparser.y"
+        #line 241 "../smarty/lexer/smarty_internal_configfileparser.y"
 
-    $this->successful = !$this->internalError;
-    $this->internalError = false;
-    $this->retvalue = $this->_retvalue;
-    //echo $this->retvalue."\n\n";
-#line 826 "smarty_internal_configfileparser.php"
+        $this->successful = !$this->internalError;
+        $this->internalError = false;
+        $this->retvalue = $this->_retvalue;
     }
 
-    function doParse($yymajor, $yytokenvalue)
+    public function doParse($yymajor, $yytokenvalue)
     {
         $yyerrorhit = 0;   /* True if yymajor has invoked an error */
 
         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 (self::$yyTraceFILE) {
-            fprintf(self::$yyTraceFILE, "%sInput %s\n",
-                self::$yyTracePrompt, $this->yyTokenName[$yymajor]);
+        if ($this->yyTraceFILE) {
+            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 {
@@ -866,30 +960,25 @@ static public $yy_action = array(
             } elseif ($yyact < self::YYNSTATE + self::YYNRULE) {
                 $this->yy_reduce($yyact - self::YYNSTATE);
             } elseif ($yyact == self::YY_ERROR_ACTION) {
-                if (self::$yyTraceFILE) {
-                    fprintf(self::$yyTraceFILE, "%sSyntax Error!\n",
-                        self::$yyTracePrompt);
+                if ($this->yyTraceFILE) {
+                    fprintf($this->yyTraceFILE, "%sSyntax Error!\n", $this->yyTracePrompt);
                 }
                 if (self::YYERRORSYMBOL) {
                     if ($this->yyerrcnt < 0) {
                         $this->yy_syntax_error($yymajor, $yytokenvalue);
                     }
                     $yymx = $this->yystack[$this->yyidx]->major;
-                    if ($yymx == self::YYERRORSYMBOL || $yyerrorhit ){
-                        if (self::$yyTraceFILE) {
-                            fprintf(self::$yyTraceFILE, "%sDiscard input token %s\n",
-                                self::$yyTracePrompt, $this->yyTokenName[$yymajor]);
+                    if ($yymx == self::YYERRORSYMBOL || $yyerrorhit) {
+                        if ($this->yyTraceFILE) {
+                            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;
@@ -918,4 +1007,4 @@ static public $yy_action = array(
         } while ($yymajor != self::YYNOCODE && $this->yyidx >= 0);
     }
 }
-?>
\ No newline at end of file
+
diff --git a/include/smarty/libs/sysplugins/smarty_internal_data.php b/include/smarty/libs/sysplugins/smarty_internal_data.php
index 1d7b1d334..53f351b41 100644
--- a/include/smarty/libs/sysplugins/smarty_internal_data.php
+++ b/include/smarty/libs/sysplugins/smarty_internal_data.php
@@ -1,21 +1,35 @@
 <?php
 /**
  * Smarty Internal Plugin Data
+ * This file contains the basic classes and methods for template and variable creation
  *
- * This file contains the basic classes and methodes for template and variable creation
- *
- * @package Smarty
+ * @package    Smarty
  * @subpackage Template
- * @author Uwe Tews
+ * @author     Uwe Tews
  */
 
 /**
- * Base class with template and variable methodes
+ * Base class with template and variable methods
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage Template
+ *
+ * @method mixed getConfigVars(string $varName = null, bool $searchParents = true)
+ * @method mixed getStreamVariable(string $variable)
+ * @method Smarty_Internal_Data clearAssign(mixed $tpl_var)
+ * @method Smarty_Internal_Data clearAllAssign()
+ * @method Smarty_Internal_Data clearConfig(string $varName = null)
+ * @method Smarty_Internal_Data configLoad(string $config_file, mixed $sections = null, string $scope = 'local')
+ * @property int $scope
  */
-class Smarty_Internal_Data {
+class Smarty_Internal_Data
+{
+    /**
+     * This object type (Smarty = 1, template = 2, data = 4)
+     *
+     * @var int
+     */
+    public $_objType = 4;
 
     /**
      * name of class used for templates
@@ -23,534 +37,189 @@ class Smarty_Internal_Data {
      * @var string
      */
     public $template_class = 'Smarty_Internal_Template';
+
     /**
      * template variables
      *
-     * @var array
+     * @var Smarty_Variable[]
      */
     public $tpl_vars = array();
+
     /**
      * parent template (if any)
      *
-     * @var Smarty_Internal_Template
+     * @var Smarty|Smarty_Internal_Template|Smarty_Internal_Data
      */
     public $parent = null;
+
     /**
      * configuration settings
      *
-     * @var array
+     * @var string[]
      */
     public $config_vars = array();
 
     /**
-     * assigns a Smarty variable
-     *
-     * @param array|string $tpl_var the template variable name(s)
-     * @param mixed        $value   the value to assign
-     * @param boolean      $nocache if true any output of this variable will be not cached
-     * @param boolean $scope the scope the variable will have  (local,parent or root)
-     * @return Smarty_Internal_Data current Smarty_Internal_Data (or Smarty or Smarty_Internal_Template) instance for chaining
-     */
-    public function assign($tpl_var, $value = null, $nocache = false)
-    {
-        if (is_array($tpl_var)) {
-            foreach ($tpl_var as $_key => $_val) {
-                if ($_key != '') {
-                    $this->tpl_vars[$_key] = new Smarty_variable($_val, $nocache);
-                }
-            }
-        } else {
-            if ($tpl_var != '') {
-                $this->tpl_vars[$tpl_var] = new Smarty_variable($value, $nocache);
-            }
-        }
-
-        return $this;
-    }
-
-    /**
-     * assigns a global Smarty variable
+     * extension handler
      *
-     * @param string $varname the global variable name
-     * @param mixed  $value   the value to assign
-     * @param boolean $nocache if true any output of this variable will be not cached
-     * @return Smarty_Internal_Data current Smarty_Internal_Data (or Smarty or Smarty_Internal_Template) instance for chaining
+     * @var Smarty_Internal_Extension_Handler
      */
-    public function assignGlobal($varname, $value = null, $nocache = false)
-    {
-        if ($varname != '') {
-            Smarty::$global_tpl_vars[$varname] = new Smarty_variable($value, $nocache);
-            $ptr = $this;
-            while ($ptr instanceof Smarty_Internal_Template) {
-                $ptr->tpl_vars[$varname] = clone Smarty::$global_tpl_vars[$varname];
-                $ptr = $ptr->parent;
-            }
-        }
+    public $ext = null;
 
-        return $this;
-    }
     /**
-     * assigns values to template variables by reference
+     * Smarty_Internal_Data constructor.
      *
-     * @param string $tpl_var the template variable name
-     * @param mixed $ &$value the referenced value to assign
-     * @param boolean $nocache if true any output of this variable will be not cached
-     * @return Smarty_Internal_Data current Smarty_Internal_Data (or Smarty or Smarty_Internal_Template) instance for chaining
+     * Install extension handler
      */
-    public function assignByRef($tpl_var, &$value, $nocache = false)
+    public function __construct()
     {
-        if ($tpl_var != '') {
-            $this->tpl_vars[$tpl_var] = new Smarty_variable(null, $nocache);
-            $this->tpl_vars[$tpl_var]->value = &$value;
-        }
-
-        return $this;
+        $this->ext = new Smarty_Internal_Extension_Handler();
+        $this->ext->objType = $this->_objType;
     }
 
     /**
-     * appends values to template variables
+     * assigns a Smarty variable
      *
-     * @param array|string $tpl_var the template variable name(s)
-     * @param mixed        $value   the value to append
-     * @param boolean      $merge   flag if array elements shall be merged
-     * @param boolean $nocache if true any output of this variable will be not cached
-     * @return Smarty_Internal_Data current Smarty_Internal_Data (or Smarty or Smarty_Internal_Template) instance for chaining
+     * @param  array|string $tpl_var the template variable name(s)
+     * @param  mixed        $value   the value to assign
+     * @param  boolean      $nocache if true any output of this variable will be not cached
+     *
+     * @return Smarty_Internal_Data current Smarty_Internal_Data (or Smarty or Smarty_Internal_Template) instance for
+     *                              chaining
      */
-    public function append($tpl_var, $value = null, $merge = false, $nocache = false)
+    public function assign($tpl_var, $value = null, $nocache = false)
     {
         if (is_array($tpl_var)) {
-            // $tpl_var is an array, ignore $value
             foreach ($tpl_var as $_key => $_val) {
                 if ($_key != '') {
-                    if (!isset($this->tpl_vars[$_key])) {
-                        $tpl_var_inst = $this->getVariable($_key, null, true, false);
-                        if ($tpl_var_inst instanceof Undefined_Smarty_Variable) {
-                            $this->tpl_vars[$_key] = new Smarty_variable(null, $nocache);
-                        } else {
-                            $this->tpl_vars[$_key] = clone $tpl_var_inst;
-                        }
-                    }
-                    if (!(is_array($this->tpl_vars[$_key]->value) || $this->tpl_vars[$_key]->value instanceof ArrayAccess)) {
-                        settype($this->tpl_vars[$_key]->value, 'array');
-                    }
-                    if ($merge && is_array($_val)) {
-                        foreach($_val as $_mkey => $_mval) {
-                            $this->tpl_vars[$_key]->value[$_mkey] = $_mval;
-                        }
-                    } else {
-                        $this->tpl_vars[$_key]->value[] = $_val;
+                    $this->tpl_vars[$_key] = new Smarty_Variable($_val, $nocache);
+                    if ($this->_objType == 2 && $this->scope) {
+                        $this->ext->_updateScope->updateScope($this, $_key);
                     }
                 }
             }
         } else {
-            if ($tpl_var != '' && isset($value)) {
-                if (!isset($this->tpl_vars[$tpl_var])) {
-                    $tpl_var_inst = $this->getVariable($tpl_var, null, true, false);
-                    if ($tpl_var_inst instanceof Undefined_Smarty_Variable) {
-                        $this->tpl_vars[$tpl_var] = new Smarty_variable(null, $nocache);
-                    } else {
-                        $this->tpl_vars[$tpl_var] = clone $tpl_var_inst;
-                    }
-                }
-                if (!(is_array($this->tpl_vars[$tpl_var]->value) || $this->tpl_vars[$tpl_var]->value instanceof ArrayAccess)) {
-                    settype($this->tpl_vars[$tpl_var]->value, 'array');
-                }
-                if ($merge && is_array($value)) {
-                    foreach($value as $_mkey => $_mval) {
-                        $this->tpl_vars[$tpl_var]->value[$_mkey] = $_mval;
-                    }
-                } else {
-                    $this->tpl_vars[$tpl_var]->value[] = $value;
+            if ($tpl_var != '') {
+                $this->tpl_vars[$tpl_var] = new Smarty_Variable($value, $nocache);
+                if ($this->_objType == 2 && $this->scope) {
+                    $this->ext->_updateScope->updateScope($this, $tpl_var);
                 }
             }
         }
-
         return $this;
     }
 
     /**
-     * appends values to template variables by reference
+     * appends values to template variables
      *
-     * @param string $tpl_var the template variable name
-     * @param mixed  &$value  the referenced value to append
-     * @param boolean $merge  flag if array elements shall be merged
-     * @return Smarty_Internal_Data current Smarty_Internal_Data (or Smarty or Smarty_Internal_Template) instance for chaining
-     */
-    public function appendByRef($tpl_var, &$value, $merge = false)
-    {
-        if ($tpl_var != '' && isset($value)) {
-            if (!isset($this->tpl_vars[$tpl_var])) {
-                $this->tpl_vars[$tpl_var] = new Smarty_variable();
-            }
-            if (!is_array($this->tpl_vars[$tpl_var]->value)) {
-                settype($this->tpl_vars[$tpl_var]->value, 'array');
-            }
-            if ($merge && is_array($value)) {
-                foreach($value as $_key => $_val) {
-                    $this->tpl_vars[$tpl_var]->value[$_key] = &$value[$_key];
-                }
-            } else {
-                $this->tpl_vars[$tpl_var]->value[] = &$value;
-            }
-        }
-
-        return $this;
-    }
-
-    /**
-     * Returns a single or all template variables
+     * @api  Smarty::append()
+     * @link http://www.smarty.net/docs/en/api.append.tpl
      *
-     * @param string  $varname        variable name or null
-     * @param string  $_ptr           optional pointer to data object
-     * @param boolean $search_parents include parent templates?
-     * @return string variable value or or array of variables
-     */
-    public function getTemplateVars($varname = null, $_ptr = null, $search_parents = true)
-    {
-        if (isset($varname)) {
-            $_var = $this->getVariable($varname, $_ptr, $search_parents, false);
-            if (is_object($_var)) {
-                return $_var->value;
-            } else {
-                return null;
-            }
-        } else {
-            $_result = array();
-            if ($_ptr === null) {
-                $_ptr = $this;
-            } while ($_ptr !== null) {
-                foreach ($_ptr->tpl_vars AS $key => $var) {
-                    if (!array_key_exists($key, $_result)) {
-                        $_result[$key] = $var->value;
-                    }
-                }
-                // not found, try at parent
-                if ($search_parents) {
-                    $_ptr = $_ptr->parent;
-                } else {
-                    $_ptr = null;
-                }
-            }
-            if ($search_parents && isset(Smarty::$global_tpl_vars)) {
-                foreach (Smarty::$global_tpl_vars AS $key => $var) {
-                    if (!array_key_exists($key, $_result)) {
-                        $_result[$key] = $var->value;
-                    }
-                }
-            }
-            return $_result;
-        }
-    }
-
-    /**
-     * clear the given assigned template variable.
+     * @param  array|string $tpl_var                                           the template variable name(s)
+     * @param  mixed        $value                                             the value to append
+     * @param  bool         $merge                                             flag if array elements shall be merged
+     * @param  bool         $nocache                                           if true any output of this variable will
+     *                                                                         be not cached
      *
-     * @param string|array $tpl_var the template variable(s) to clear
-     * @return Smarty_Internal_Data current Smarty_Internal_Data (or Smarty or Smarty_Internal_Template) instance for chaining
-     */
-    public function clearAssign($tpl_var)
-    {
-        if (is_array($tpl_var)) {
-            foreach ($tpl_var as $curr_var) {
-                unset($this->tpl_vars[$curr_var]);
-            }
-        } else {
-            unset($this->tpl_vars[$tpl_var]);
-        }
-
-        return $this;
-    }
-
-    /**
-     * clear all the assigned template variables.
-     * @return Smarty_Internal_Data current Smarty_Internal_Data (or Smarty or Smarty_Internal_Template) instance for chaining
+     * @return \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty
      */
-    public function clearAllAssign()
-    {
-        $this->tpl_vars = array();
-        return $this;
-    }
-
-    /**
-     * load a config file, optionally load just selected sections
-     *
-     * @param string $config_file filename
-     * @param mixed  $sections    array of section names, single section or null
-     * @return Smarty_Internal_Data current Smarty_Internal_Data (or Smarty or Smarty_Internal_Template) instance for chaining
-     */
-    public function configLoad($config_file, $sections = null)
+    public function append($tpl_var, $value = null, $merge = false, $nocache = false)
     {
-        // load Config class
-        $config = new Smarty_Internal_Config($config_file, $this->smarty, $this);
-        $config->loadConfigVars($sections);
-        return $this;
+        return $this->ext->append->append($this, $tpl_var, $value, $merge, $nocache);
     }
 
     /**
-     * gets the object of a Smarty variable
+     * assigns a global Smarty variable
      *
-     * @param string  $variable the name of the Smarty variable
-     * @param object  $_ptr     optional pointer to data object
-     * @param boolean $search_parents search also in parent data
-     * @return object the object of the variable
-     */
-    public function getVariable($variable, $_ptr = null, $search_parents = true, $error_enable = true)
-    {
-        if ($_ptr === null) {
-            $_ptr = $this;
-        } while ($_ptr !== null) {
-            if (isset($_ptr->tpl_vars[$variable])) {
-                // found it, return it
-                return $_ptr->tpl_vars[$variable];
-            }
-            // not found, try at parent
-            if ($search_parents) {
-                $_ptr = $_ptr->parent;
-            } else {
-                $_ptr = null;
-            }
-        }
-        if (isset(Smarty::$global_tpl_vars[$variable])) {
-            // found it, return it
-            return Smarty::$global_tpl_vars[$variable];
-        }
-        if ($this->smarty->error_unassigned && $error_enable) {
-            // force a notice
-            $x = $$variable;
-        }
-        return new Undefined_Smarty_Variable;
-    }
-
-    /**
-     * gets  a config variable
+     * @param  string  $varName the global variable name
+     * @param  mixed   $value   the value to assign
+     * @param  boolean $nocache if true any output of this variable will be not cached
      *
-     * @param string $variable the name of the config variable
-     * @return mixed the value of the config variable
+     * @return \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty
      */
-    public function getConfigVariable($variable, $error_enable = true)
+    public function assignGlobal($varName, $value = null, $nocache = false)
     {
-        $_ptr = $this;
-        while ($_ptr !== null) {
-            if (isset($_ptr->config_vars[$variable])) {
-                // found it, return it
-                return $_ptr->config_vars[$variable];
-            }
-            // not found, try at parent
-            $_ptr = $_ptr->parent;
-        }
-        if ($this->smarty->error_unassigned && $error_enable) {
-            // force a notice
-            $x = $$variable;
-        }
-        return null;
+        return $this->ext->assignGlobal->assignGlobal($this, $varName, $value, $nocache);
     }
 
     /**
-     * gets  a stream variable
-     *
-     * @param string $variable the stream of the variable
-     * @return mixed the value of the stream variable
-     */
-    public function getStreamVariable($variable)
-    {
-        $_result = '';
-        $fp = fopen($variable, 'r+');
-        if ($fp) {
-            while (!feof($fp) && ($current_line = fgets($fp)) !== false ) {
-                $_result .= $current_line;
-            }
-            fclose($fp);
-            return $_result;
-        }
-
-        if ($this->smarty->error_unassigned) {
-            throw new SmartyException('Undefined stream variable "' . $variable . '"');
-        } else {
-            return null;
-        }
-    }
-
-    /**
-     * Returns a single or all config variables
+     * appends values to template variables by reference
      *
-     * @param string $varname variable name or null
-     * @return string variable value or or array of variables
-     */
-    public function getConfigVars($varname = null, $search_parents = true)
-    {
-        $_ptr = $this;
-        $var_array = array();
-        while ($_ptr !== null) {
-            if (isset($varname)) {
-                if (isset($_ptr->config_vars[$varname])) {
-                    return $_ptr->config_vars[$varname];
-                }
-            } else {
-                $var_array = array_merge($_ptr->config_vars, $var_array);
-            }
-             // not found, try at parent
-            if ($search_parents) {
-                $_ptr = $_ptr->parent;
-            } else {
-                $_ptr = null;
-            }
-        }
-        if (isset($varname)) {
-            return '';
-        } else {
-            return $var_array;
-        }
-    }
-
-    /**
-     * Deassigns a single or all config variables
+     * @param  string  $tpl_var the template variable name
+     * @param  mixed   &$value  the referenced value to append
+     * @param  boolean $merge   flag if array elements shall be merged
      *
-     * @param string $varname variable name or null
-     * @return Smarty_Internal_Data current Smarty_Internal_Data (or Smarty or Smarty_Internal_Template) instance for chaining
+     * @return \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty
      */
-    public function clearConfig($varname = null)
+    public function appendByRef($tpl_var, &$value, $merge = false)
     {
-        if (isset($varname)) {
-            unset($this->config_vars[$varname]);
-        } else {
-            $this->config_vars = array();
-        }
-        return $this;
+        return $this->ext->appendByRef->appendByRef($this, $tpl_var, $value, $merge);
     }
 
-}
-
-/**
- * class for the Smarty data object
- *
- * The Smarty data object will hold Smarty variables in the current scope
- *
- * @package Smarty
- * @subpackage Template
- */
-class Smarty_Data extends Smarty_Internal_Data {
-
     /**
-     * Smarty object
+     * assigns values to template variables by reference
      *
-     * @var Smarty
-     */
-    public $smarty = null;
-
-    /**
-     * create Smarty data object
+     * @param string   $tpl_var the template variable name
+     * @param          $value
+     * @param  boolean $nocache if true any output of this variable will be not cached
      *
-     * @param Smarty|array $_parent  parent template
-     * @param Smarty       $smarty   global smarty instance
+     * @return \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty
      */
-    public function __construct ($_parent = null, $smarty = null)
+    public function assignByRef($tpl_var, &$value, $nocache = false)
     {
-        $this->smarty = $smarty;
-        if (is_object($_parent)) {
-            // when object set up back pointer
-            $this->parent = $_parent;
-        } elseif (is_array($_parent)) {
-            // set up variable values
-            foreach ($_parent as $_key => $_val) {
-                $this->tpl_vars[$_key] = new Smarty_variable($_val);
-            }
-        } elseif ($_parent != null) {
-            throw new SmartyException("Wrong type for template variables");
-        }
+        return $this->ext->assignByRef->assignByRef($this, $tpl_var, $value, $nocache);
     }
 
-}
-
-/**
- * class for the Smarty variable object
- *
- * This class defines the Smarty variable object
- *
- * @package Smarty
- * @subpackage Template
- */
-class Smarty_Variable {
-
-    /**
-     * template variable
-     *
-     * @var mixed
-     */
-    public $value = null;
-    /**
-     * if true any output of this variable will be not cached
-     *
-     * @var boolean
-     */
-    public $nocache = false;
     /**
-     * the scope the variable will have  (local,parent or root)
+     * Returns a single or all template variables
      *
-     * @var int
-     */
-    public $scope = Smarty::SCOPE_LOCAL;
-
-    /**
-     * create Smarty variable object
+     * @api  Smarty::getTemplateVars()
+     * @link http://www.smarty.net/docs/en/api.get.template.vars.tpl
      *
-     * @param mixed   $value   the value to assign
-     * @param boolean $nocache if true any output of this variable will be not cached
-     * @param int     $scope   the scope the variable will have  (local,parent or root)
-     */
-    public function __construct($value = null, $nocache = false, $scope = Smarty::SCOPE_LOCAL)
-    {
-        $this->value = $value;
-        $this->nocache = $nocache;
-        $this->scope = $scope;
-    }
-
-    /**
-     * <<magic>> String conversion
+     * @param  string                                                 $varName       variable name or null
+     * @param \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty $_ptr          optional pointer to data object
+     * @param  bool                                                   $searchParents include parent templates?
      *
-     * @return string
+     * @return mixed variable value or or array of variables
      */
-    public function __toString()
+    public function getTemplateVars($varName = null, Smarty_Internal_Data $_ptr = null, $searchParents = true)
     {
-        return (string) $this->value;
+        return $this->ext->getTemplateVars->getTemplateVars($this, $varName, $_ptr, $searchParents);
     }
 
-}
-
-/**
- * class for undefined variable object
- *
- * This class defines an object for undefined variable handling
- *
- * @package Smarty
- * @subpackage Template
- */
-class Undefined_Smarty_Variable {
-
     /**
-     * Returns FALSE for 'nocache' and NULL otherwise.
+     * Follow the parent chain an merge template and config variables
      *
-     * @param string $name
-     * @return bool
+     * @param \Smarty_Internal_Data|null $data
      */
-    public function __get($name)
+    public function _mergeVars(Smarty_Internal_Data $data = null)
     {
-        if ($name == 'nocache') {
-            return false;
+        if (isset($data)) {
+            if (!empty($this->tpl_vars)) {
+                $data->tpl_vars = array_merge($this->tpl_vars, $data->tpl_vars);
+            }
+            if (!empty($this->config_vars)) {
+                $data->config_vars = array_merge($this->config_vars, $data->config_vars);
+            }
         } else {
-            return null;
+            $data = $this;
+        }
+        if (isset($this->parent)) {
+            $this->parent->_mergeVars($data);
         }
     }
 
     /**
-     * Always returns an empty string.
+     * Handle unknown class methods
      *
-     * @return string
+     * @param string $name unknown method-name
+     * @param array  $args argument array
+     *
+     * @return mixed
+     * @throws SmartyException
      */
-    public function __toString()
+    public function __call($name, $args)
     {
-        return "";
+        return $this->ext->_callExternalMethod($this, $name, $args);
     }
-
 }
-
-?>
\ No newline at end of file
diff --git a/include/smarty/libs/sysplugins/smarty_internal_debug.php b/include/smarty/libs/sysplugins/smarty_internal_debug.php
index 2aea13f30..0cbd54955 100644
--- a/include/smarty/libs/sysplugins/smarty_internal_debug.php
+++ b/include/smarty/libs/sysplugins/smarty_internal_debug.php
@@ -1,184 +1,362 @@
 <?php
 /**
  * Smarty Internal Plugin Debug
+ * Class to collect data for the Smarty Debugging Console
  *
- * Class to collect data for the Smarty Debugging Consol
- *
- * @package Smarty
+ * @package    Smarty
  * @subpackage Debug
- * @author Uwe Tews
+ * @author     Uwe Tews
  */
 
 /**
  * Smarty Internal Plugin Debug Class
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage Debug
  */
-class Smarty_Internal_Debug extends Smarty_Internal_Data {
-
+class Smarty_Internal_Debug extends Smarty_Internal_Data
+{
     /**
      * template data
      *
      * @var array
      */
-    public static $template_data = array();
+    public $template_data = array();
+
+    /**
+     * List of uid's which shall be ignored
+     *
+     * @var array
+     */
+    public $ignore_uid = array();
+
+    /**
+     * Index of display() and fetch() calls
+     *
+     * @var int
+     */
+    public $index = 0;
+
+    /**
+     * Counter for window offset
+     *
+     * @var int
+     */
+    public $offset = 0;
+
+    /**
+     * Start logging template
+     *
+     * @param \Smarty_Internal_Template $template template
+     * @param null                      $mode     true: display   false: fetch  null: subtemplate
+     */
+    public function start_template(Smarty_Internal_Template $template, $mode = null)
+    {
+        if (isset($mode)) {
+            $this->index ++;
+            $this->offset ++;
+            $this->template_data[$this->index] = null;
+        }
+        $key = $this->get_key($template);
+        $this->template_data[$this->index][$key]['start_template_time'] = microtime(true);
+    }
+
+    /**
+     * End logging of cache time
+     *
+     * @param \Smarty_Internal_Template $template cached template
+     */
+    public function end_template(Smarty_Internal_Template $template)
+    {
+        $key = $this->get_key($template);
+        $this->template_data[$this->index][$key]['total_time'] +=
+            microtime(true) - $this->template_data[$this->index][$key]['start_template_time'];
+        //$this->template_data[$this->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 function start_compile(Smarty_Internal_Template $template)
     {
-        $key = self::get_key($template);
-        self::$template_data[$key]['start_time'] = microtime(true);
+        static $_is_stringy = array('string' => true, 'eval' => true);
+        if (!empty($template->compiler->trace_uid)) {
+            $key = $template->compiler->trace_uid;
+            if (!isset($this->template_data[$this->index][$key])) {
+                if (isset($_is_stringy[$template->source->type])) {
+                    $this->template_data[$this->index][$key]['name'] =
+                        '\'' . substr($template->source->name, 0, 25) . '...\'';
+                } else {
+                    $this->template_data[$this->index][$key]['name'] = $template->source->filepath;
+                }
+                $this->template_data[$this->index][$key]['compile_time'] = 0;
+                $this->template_data[$this->index][$key]['render_time'] = 0;
+                $this->template_data[$this->index][$key]['cache_time'] = 0;
+            }
+        } else {
+            if (isset($this->ignore_uid[$template->source->uid])) {
+                return;
+            }
+            $key = $this->get_key($template);
+        }
+        $this->template_data[$this->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 function end_compile(Smarty_Internal_Template $template)
     {
-        $key = self::get_key($template);
-        self::$template_data[$key]['compile_time'] += microtime(true) - self::$template_data[$key]['start_time'];
+        if (!empty($template->compiler->trace_uid)) {
+            $key = $template->compiler->trace_uid;
+        } else {
+            if (isset($this->ignore_uid[$template->source->uid])) {
+                return;
+            }
+
+            $key = $this->get_key($template);
+        }
+        $this->template_data[$this->index][$key]['compile_time'] +=
+            microtime(true) - $this->template_data[$this->index][$key]['start_time'];
     }
 
     /**
      * Start logging of render time
      *
-     * @param object $template
+     * @param \Smarty_Internal_Template $template
      */
-    public static function start_render($template)
+    public function start_render(Smarty_Internal_Template $template)
     {
-        $key = self::get_key($template);
-        self::$template_data[$key]['start_time'] = microtime(true);
+        $key = $this->get_key($template);
+        $this->template_data[$this->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 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'];
+        $key = $this->get_key($template);
+        $this->template_data[$this->index][$key]['render_time'] +=
+            microtime(true) - $this->template_data[$this->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 function start_cache(Smarty_Internal_Template $template)
     {
-        $key = self::get_key($template);
-        self::$template_data[$key]['start_time'] = microtime(true);
+        $key = $this->get_key($template);
+        $this->template_data[$this->index][$key]['start_time'] = microtime(true);
     }
 
     /**
      * End logging of cache time
      *
-     * @param object $template cached template
+     * @param \Smarty_Internal_Template $template cached template
+     */
+    public function end_cache(Smarty_Internal_Template $template)
+    {
+        $key = $this->get_key($template);
+        $this->template_data[$this->index][$key]['cache_time'] +=
+            microtime(true) - $this->template_data[$this->index][$key]['start_time'];
+    }
+
+    /**
+     * Register template object
+     *
+     * @param \Smarty_Internal_Template $template cached template
+     */
+    public function register_template(Smarty_Internal_Template $template)
+    {
+    }
+
+    /**
+     * Register data object
+     *
+     * @param \Smarty_Data $data data object
      */
-    public static function end_cache($template)
+    public static function register_data(Smarty_Data $data)
     {
-        $key = self::get_key($template);
-        self::$template_data[$key]['cache_time'] += microtime(true) - self::$template_data[$key]['start_time'];
     }
 
     /**
-     * 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)
+    public function display_debug($obj, $full = false)
     {
-        // prepare information of assigned variables
-        $ptr = self::get_debug_vars($obj);
-        if ($obj instanceof Smarty) {
-            $smarty = clone $obj;
+        if (!$full) {
+            $this->offset ++;
+            $savedIndex = $this->index;
+            $this->index = 9999;
+        }
+        if ($obj->_objType == 1) {
+            $smarty = $obj;
         } else {
-            $smarty = clone $obj->smarty;
+            $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 = $this->get_debug_vars($obj);
         $_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->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;
-        if ($obj instanceof Smarty_Internal_Template) {
+        $debugging = $smarty->debugging;
+
+        $_template = new Smarty_Internal_Template($debObj->debug_tpl, $debObj);
+        if ($obj->_objType == 2) {
             $_template->assign('template_name', $obj->source->type . ':' . $obj->source->name);
         }
-        if ($obj instanceof Smarty) {
-            $_template->assign('template_data', self::$template_data);
+        if ($obj->_objType == 1 || $full) {
+            $_template->assign('template_data', $this->template_data[$this->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', $debugging == 2 || !$full);
+        $_template->assign('offset', $this->offset * 50);
         echo $_template->fetch();
+        if (isset($full)) {
+            $this->index --;
+        }
+        if (!$full) {
+            $this->index = $savedIndex;
+        }
     }
 
     /**
      * Recursively gets variables from all template/data scopes
      *
-     * @param Smarty_Internal_Template|Smarty_Data $obj object to debug
+     * @param  Smarty_Internal_Template|Smarty_Data $obj object to debug
+     *
      * @return StdClass
      */
-    public static function get_debug_vars($obj)
+    public function get_debug_vars($obj)
     {
-        $config_vars = $obj->config_vars;
+        $config_vars = array();
+        foreach ($obj->config_vars as $key => $var) {
+            $config_vars[$key]['value'] = $var;
+            if ($obj->_objType == 2) {
+                $config_vars[$key]['scope'] = $obj->source->type . ':' . $obj->source->name;
+            } elseif ($obj->_objType == 4) {
+                $tpl_vars[$key]['scope'] = $obj->dataObjectName;
+            } else {
+                $config_vars[$key]['scope'] = 'Smarty object';
+            }
+        }
         $tpl_vars = array();
         foreach ($obj->tpl_vars as $key => $var) {
-            $tpl_vars[$key] = clone $var;
-            if ($obj instanceof Smarty_Internal_Template) {
-                $tpl_vars[$key]->scope = $obj->source->type . ':' . $obj->source->name;
-            } elseif ($obj instanceof Smarty_Data) {
-                $tpl_vars[$key]->scope = 'Data object';
+            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 ($obj->_objType == 2) {
+                $tpl_vars[$key]['scope'] = $obj->source->type . ':' . $obj->source->name;
+            } elseif ($obj->_objType == 4) {
+                $tpl_vars[$key]['scope'] = $obj->dataObjectName;
             } else {
-                $tpl_vars[$key]->scope = 'Smarty root';
+                $tpl_vars[$key]['scope'] = 'Smarty object';
             }
         }
 
         if (isset($obj->parent)) {
-            $parent = self::get_debug_vars($obj->parent);
+            $parent = $this->get_debug_vars($obj->parent);
+            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) {
+                if (isset($config_vars[$name]) && $config_vars[$name]['value'] === $pvar['value']) {
+                    $config_vars[$name]['scope'] = $pvar['scope'];
+                }
+            }
             $config_vars = array_merge($parent->config_vars, $config_vars);
         } else {
-            foreach (Smarty::$global_tpl_vars as $name => $var) {
-                if (!array_key_exists($name, $tpl_vars)) {
-                    $clone = clone $var;
-                    $clone->scope = 'Global';
-                    $tpl_vars[$name] = $clone;
+            foreach (Smarty::$global_tpl_vars as $key => $var) {
+                if (!array_key_exists($key, $tpl_vars)) {
+                    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;
+                                }
+                            }
+                        }
+                    }
+                    $tpl_vars[$key]['scope'] = 'Global';
                 }
             }
         }
+
         return (object) array('tpl_vars' => $tpl_vars, 'config_vars' => $config_vars);
     }
 
     /**
      * Return key into $template_data for template
      *
-     * @param object $template  template object
-     * @return string   key into $template_data
+     * @param \Smarty_Internal_Template $template template object
+     *
+     * @return string key into $template_data
      */
-    private static function get_key($template)
+    private function get_key(Smarty_Internal_Template $template)
     {
         static $_is_stringy = array('string' => true, 'eval' => true);
         // calculate Uid if not already done
@@ -186,21 +364,67 @@ class Smarty_Internal_Debug extends Smarty_Internal_Data {
             $template->source->filepath;
         }
         $key = $template->source->uid;
-        if (isset(self::$template_data[$key])) {
+        if (isset($this->template_data[$this->index][$key])) {
             return $key;
         } else {
             if (isset($_is_stringy[$template->source->type])) {
-                self::$template_data[$key]['name'] = '\''.substr($template->source->name,0,25).'...\'';
+                $this->template_data[$this->index][$key]['name'] =
+                    '\'' . substr($template->source->name, 0, 25) . '...\'';
             } else {
-                self::$template_data[$key]['name'] = $template->source->filepath;
+                $this->template_data[$this->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;
+            $this->template_data[$this->index][$key]['compile_time'] = 0;
+            $this->template_data[$this->index][$key]['render_time'] = 0;
+            $this->template_data[$this->index][$key]['cache_time'] = 0;
+            $this->template_data[$this->index][$key]['total_time'] = 0;
+
             return $key;
         }
     }
 
-}
+    /**
+     * Ignore template
+     *
+     * @param \Smarty_Internal_Template $template
+     */
+    public function ignore(Smarty_Internal_Template $template)
+    {
+        // calculate Uid if not already done
+        if ($template->source->uid == '') {
+            $template->source->filepath;
+        }
+        $this->ignore_uid[$template->source->uid] = true;
+    }
 
-?>
\ No newline at end of file
+    /**
+     * handle 'URL' debugging mode
+     *
+     * @param Smarty $smarty
+     */
+    public function debugUrl(Smarty $smarty)
+    {
+        if (isset($_SERVER['QUERY_STRING'])) {
+            $_query_string = $_SERVER['QUERY_STRING'];
+        } else {
+            $_query_string = '';
+        }
+        if (false !== strpos($_query_string, $smarty->smarty_debug_id)) {
+            if (false !== strpos($_query_string, $smarty->smarty_debug_id . '=on')) {
+                // enable debugging for this browser session
+                setcookie('SMARTY_DEBUG', true);
+                $smarty->debugging = true;
+            } elseif (false !== strpos($_query_string, $smarty->smarty_debug_id . '=off')) {
+                // disable debugging for this browser session
+                setcookie('SMARTY_DEBUG', false);
+                $smarty->debugging = false;
+            } else {
+                // enable debugging for this page
+                $smarty->debugging = true;
+            }
+        } else {
+            if (isset($_COOKIE['SMARTY_DEBUG'])) {
+                $smarty->debugging = true;
+            }
+        }
+    }
+}
diff --git a/include/smarty/libs/sysplugins/smarty_internal_extension_clear.php b/include/smarty/libs/sysplugins/smarty_internal_extension_clear.php
new file mode 100644
index 000000000..c595214d8
--- /dev/null
+++ b/include/smarty/libs/sysplugins/smarty_internal_extension_clear.php
@@ -0,0 +1,134 @@
+<?php
+
+/**
+ * Smarty Extension Clear
+ *
+ * $smarty->clear() method file cache file resource
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Extension_Clear
+{
+    /**
+     * Empty cache for a specific template
+     *
+     * @param Smarty  $smarty
+     * @param string  $resource_name template name
+     * @param string  $cache_id      cache id
+     * @param string  $compile_id    compile id
+     * @param integer $exp_time      expiration time (number of seconds, not timestamp)
+     *
+     * @return integer number of cache files deleted
+     */
+    public static function clear(Smarty $smarty, $resource_name, $cache_id, $compile_id, $exp_time)
+    {
+        $_cache_id = isset($cache_id) ? preg_replace('![^\w\|]+!', '_', $cache_id) : null;
+        $_compile_id = isset($compile_id) ? preg_replace('![^\w]+!', '_', $compile_id) : null;
+        $_dir_sep = $smarty->use_sub_dirs ? '/' : '^';
+        $_compile_id_offset = $smarty->use_sub_dirs ? 3 : 0;
+        $_dir = $smarty->getCacheDir();
+        if ($_dir == '/') { //We should never want to delete this!
+            return 0;
+        }
+        $_dir_length = strlen($_dir);
+        if (isset($_cache_id)) {
+            $_cache_id_parts = explode('|', $_cache_id);
+            $_cache_id_parts_count = count($_cache_id_parts);
+            if ($smarty->use_sub_dirs) {
+                foreach ($_cache_id_parts as $id_part) {
+                    $_dir .= $id_part . DS;
+                }
+            }
+        }
+        if (isset($resource_name)) {
+            $_save_stat = $smarty->caching;
+            $smarty->caching = true;
+            $tpl = new $smarty->template_class($resource_name, $smarty);
+            $smarty->caching = $_save_stat;
+
+            // remove from template cache
+            $tpl->source; // have the template registered before unset()
+
+            if ($tpl->source->exists) {
+                $_resourcename_parts = basename(str_replace('^', '/', $tpl->cached->filepath));
+            } else {
+                return 0;
+            }
+        }
+        $_count = 0;
+        $_time = time();
+        if (file_exists($_dir)) {
+            $_cacheDirs = new RecursiveDirectoryIterator($_dir);
+            $_cache = new RecursiveIteratorIterator($_cacheDirs, RecursiveIteratorIterator::CHILD_FIRST);
+            foreach ($_cache as $_file) {
+                if (substr(basename($_file->getPathname()), 0, 1) == '.' || strpos($_file, '.svn') !== false) {
+                    continue;
+                }
+                // directory ?
+                if ($_file->isDir()) {
+                    if (!$_cache->isDot()) {
+                        // delete folder if empty
+                        @rmdir($_file->getPathname());
+                    }
+                } else {
+                    $_parts = explode($_dir_sep, str_replace('\\', '/', substr((string) $_file, $_dir_length)));
+                    $_parts_count = count($_parts);
+                    // check name
+                    if (isset($resource_name)) {
+                        if ($_parts[$_parts_count - 1] != $_resourcename_parts) {
+                            continue;
+                        }
+                    }
+                    // check compile id
+                    if (isset($_compile_id) && (!isset($_parts[$_parts_count - 2 - $_compile_id_offset]) ||
+                            $_parts[$_parts_count - 2 - $_compile_id_offset] != $_compile_id)
+                    ) {
+                        continue;
+                    }
+                    // check cache id
+                    if (isset($_cache_id)) {
+                        // count of cache id parts
+                        $_parts_count = (isset($_compile_id)) ? $_parts_count - 2 - $_compile_id_offset :
+                            $_parts_count - 1 - $_compile_id_offset;
+                        if ($_parts_count < $_cache_id_parts_count) {
+                            continue;
+                        }
+                        for ($i = 0; $i < $_cache_id_parts_count; $i ++) {
+                            if ($_parts[$i] != $_cache_id_parts[$i]) {
+                                continue 2;
+                            }
+                        }
+                    }
+                    // expired ?
+                    if (isset($exp_time)) {
+                        if ($exp_time < 0) {
+                            preg_match('#\'cache_lifetime\' =>\s*(\d*)#', file_get_contents($_file), $match);
+                            if ($_time < (@filemtime($_file) + $match[1])) {
+                                continue;
+                            }
+                        } else {
+                            if ($_time - @filemtime($_file) < $exp_time) {
+                                continue;
+                            }
+                        }
+                    }
+                    // remove from template cache
+                    if (isset($smarty->_cache['template_objects'])) {
+                        foreach ($smarty->_cache['template_objects'] as $key => $tpl) {
+                            if (isset($tpl->cached) && $tpl->cached->filepath == (string) $_file) {
+                                unset($smarty->_cache['template_objects'][$key]);
+                            }
+                        }
+                    }
+                    $_count += @unlink((string) $_file) ? 1 : 0;
+                    if (function_exists('opcache_invalidate')) {
+                        opcache_invalidate((string) $_file);
+                    }
+                }
+            }
+        }
+        return $_count;
+    }
+}
\ No newline at end of file
diff --git a/include/smarty/libs/sysplugins/smarty_internal_extension_handler.php b/include/smarty/libs/sysplugins/smarty_internal_extension_handler.php
new file mode 100644
index 000000000..68012d86f
--- /dev/null
+++ b/include/smarty/libs/sysplugins/smarty_internal_extension_handler.php
@@ -0,0 +1,157 @@
+<?php
+
+/**
+ * Smarty Extension handler
+ *
+ * Load extensions dynamically
+ *
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ *
+ * @property Smarty_Internal_Runtime_Inheritance      $_inheritance
+ * @property Smarty_Internal_Runtime_SubTemplate      $_subTemplate
+ * @property Smarty_Internal_Runtime_TplFunction      $_tplFunction
+ * @property Smarty_Internal_Runtime_Var              $_var
+ * @property Smarty_Internal_Runtime_Config           $_config
+ * @property Smarty_Internal_Runtime_Foreach          $_foreach
+ * @property Smarty_Internal_Runtime_Hhvm             $_hhvm
+ * @property Smarty_Internal_Runtime_WriteFile        $_writeFile
+ * @property Smarty_Internal_Runtime_ValidateCompiled $_validateCompiled
+ * @property Smarty_Internal_Runtime_CodeFrame        $_codeFrame
+ * @property Smarty_Internal_Runtime_FilterHandler    $_filterHandler
+ * @property Smarty_Internal_Runtime_GetIncludePath   $_getIncludePath
+ * @property Smarty_Internal_Runtime_UpdateScope      $_updateScope
+ * @property Smarty_Internal_Runtime_IsCached         $_isCached
+ * @property Smarty_Internal_Runtime_CacheModify      $_cacheModify
+ * @property Smarty_Internal_Runtime_UpdateCache      $_updateCache
+ * @property Smarty_Internal_Method_GetTemplateVars   $getTemplateVars
+ * @property Smarty_Internal_Method_Append            $append
+ * @property Smarty_Internal_Method_AppendByRef       $appendByRef
+ * @property Smarty_Internal_Method_AssignGlobal      $assignGlobal
+ * @property Smarty_Internal_Method_AssignByRef       $assignByRef
+ * @property Smarty_Internal_Method_LoadFilter        $loadFilter
+ * @property Smarty_Internal_Method_LoadPlugin        $loadPlugin
+ * @property Smarty_Internal_Method_RegisterFilter    $registerFilter
+ * @property Smarty_Internal_Method_RegisterObject    $registerObject
+ * @property Smarty_Internal_Method_RegisterPlugin    $registerPlugin
+ */
+class Smarty_Internal_Extension_Handler
+{
+
+    public $objType = null;
+
+    /**
+     * Cache for property information from generic getter/setter
+     * Preloaded with names which should not use with generic getter/setter
+     *
+     * @var array
+     */
+    private $_property_info = array('AutoloadFilters' => 0, 'DefaultModifiers' => 0, 'ConfigVars' => 0,
+                                    'DebugTemplate'   => 0, 'RegisteredObject' => 0, 'StreamVariable' => 0,
+                                    'TemplateVars'    => 0,);#
+
+    private $resolvedProperties = array();
+
+    /**
+     * Call external Method
+     *
+     * @param \Smarty_Internal_Data $data
+     * @param string                $name external method names
+     * @param array                 $args argument array
+     *
+     * @return mixed
+     * @throws SmartyException
+     */
+    public function _callExternalMethod(Smarty_Internal_Data $data, $name, $args)
+    {
+        /* @var Smarty $data ->smarty */
+        $smarty = isset($data->smarty) ? $data->smarty : $data;
+        if (!isset($smarty->ext->$name)) {
+            $class = 'Smarty_Internal_Method_' . ucfirst($name);
+            if (preg_match('/^(set|get)([A-Z].*)$/', $name, $match)) {
+                if (!isset($this->_property_info[$prop = $match[2]])) {
+                    // convert camel case to underscored name
+                    $this->resolvedProperties[$prop] = $pn = strtolower(join('_',
+                                                                             preg_split('/([A-Z][^A-Z]*)/', $prop, - 1,
+                                                                                        PREG_SPLIT_NO_EMPTY |
+                                                                                        PREG_SPLIT_DELIM_CAPTURE)));
+                    $this->_property_info[$prop] = property_exists($data, $pn) ? 1 :
+                        ($data->_objType == 2 && property_exists($smarty, $pn) ? 2 : 0);
+                }
+                if ($this->_property_info[$prop]) {
+                    $pn = $this->resolvedProperties[$prop];
+                    if ($match[1] == 'get') {
+                        return $this->_property_info[$prop] == 1 ? $data->$pn : $data->smarty->$pn;
+                    } else {
+                        return $this->_property_info[$prop] == 1 ? $data->$pn = $args[0] :
+                            $data->smarty->$pn = $args[0];
+                    }
+                } elseif (!class_exists($class)) {
+                    throw new SmartyException("property '$pn' does not exist.");
+                }
+            }
+            if (class_exists($class)) {
+                $callback = array($smarty->ext->$name = new $class(), $name);
+            }
+        } else {
+            $callback = array($smarty->ext->$name, $name);
+        }
+        array_unshift($args, $data);
+        if (isset($callback) && $callback[0]->objMap | $data->_objType) {
+            return call_user_func_array($callback, $args);
+        }
+        return call_user_func_array(array(new Smarty_Internal_Undefined(), $name), $args);
+    }
+
+    /**
+     * set extension property
+     *
+     * @param string $property_name property name
+     * @param mixed  $value         value
+     *
+     * @throws SmartyException
+     */
+    public function __set($property_name, $value)
+    {
+        $this->$property_name = $value;
+    }
+
+    /**
+     * get extension object
+     *
+     * @param string $property_name property name
+     *
+     * @return mixed|Smarty_Template_Cached
+     * @throws SmartyException
+     */
+    public function __get($property_name)
+    {
+        // object properties of runtime template extensions will start with '_'
+        if ($property_name[0] == '_') {
+            $class = 'Smarty_Internal_Runtime_' . ucfirst(substr($property_name, 1));
+        } else {
+            $class = 'Smarty_Internal_Method_' . ucfirst($property_name);
+        }
+        if (class_exists($class)) {
+            return $this->$property_name = new $class();
+        }
+        return $this;
+    }
+
+    /**
+     * Call error handler for undefined method
+     *
+     * @param string $name unknown method-name
+     * @param array  $args argument array
+     *
+     * @return mixed
+     * @throws SmartyException
+     */
+    public function __call($name, $args)
+    {
+        return call_user_func_array(array(new Smarty_Internal_Undefined(), $name), $args);
+    }
+
+}
\ No newline at end of file
diff --git a/include/smarty/libs/sysplugins/smarty_internal_filter_handler.php b/include/smarty/libs/sysplugins/smarty_internal_filter_handler.php
deleted file mode 100644
index c9370e1ac..000000000
--- a/include/smarty/libs/sysplugins/smarty_internal_filter_handler.php
+++ /dev/null
@@ -1,70 +0,0 @@
-<?php
-/**
- * Smarty Internal Plugin Filter Handler
- *
- * Smarty filter handler class
- *
- * @package Smarty
- * @subpackage PluginsInternal
- * @author Uwe Tews
- */
-
-/**
- * Class for filter processing
- *
- * @package Smarty
- * @subpackage PluginsInternal
- */
-class Smarty_Internal_Filter_Handler {
-
-    /**
-     * Run filters over content
-     *
-     * The filters will be lazy loaded if required
-     * class name format: Smarty_FilterType_FilterName
-     * plugin filename format: filtertype.filtername.php
-     * Smarty2 filter plugins could be used
-     *
-     * @param string                   $type     the type of filter ('pre','post','output') which shall run
-     * @param string                   $content  the content which shall be processed by the filters
-     * @param Smarty_Internal_Template $template template object
-     * @return string the filtered content
-     */
-    public static function runFilter($type, $content, Smarty_Internal_Template $template)
-    {
-        $output = $content;
-        // loop over autoload filters of specified type
-        if (!empty($template->smarty->autoload_filters[$type])) {
-            foreach ((array)$template->smarty->autoload_filters[$type] as $name) {
-                $plugin_name = "Smarty_{$type}filter_{$name}";
-                if ($template->smarty->loadPlugin($plugin_name)) {
-                    if (function_exists($plugin_name)) {
-                        // use loaded Smarty2 style plugin
-                        $output = $plugin_name($output, $template);
-                    } elseif (class_exists($plugin_name, false)) {
-                        // loaded class of filter plugin
-                        $output = call_user_func(array($plugin_name, 'execute'), $output, $template);
-                    }
-                } else {
-                    // nothing found, throw exception
-                    throw new SmartyException("Unable to load filter {$plugin_name}");
-                }
-            }
-        }
-        // loop over registerd filters of specified type
-        if (!empty($template->smarty->registered_filters[$type])) {
-            foreach ($template->smarty->registered_filters[$type] as $key => $name) {
-                if (is_array($template->smarty->registered_filters[$type][$key])) {
-                    $output = call_user_func($template->smarty->registered_filters[$type][$key], $output, $template);
-                } else {
-                    $output = $template->smarty->registered_filters[$type][$key]($output, $template);
-                }
-            }
-        }
-        // return filtered output
-        return $output;
-    }
-
-}
-
-?>
\ No newline at end of file
diff --git a/include/smarty/libs/sysplugins/smarty_internal_function_call_handler.php b/include/smarty/libs/sysplugins/smarty_internal_function_call_handler.php
deleted file mode 100644
index fa4b43b2a..000000000
--- a/include/smarty/libs/sysplugins/smarty_internal_function_call_handler.php
+++ /dev/null
@@ -1,55 +0,0 @@
-<?php
-/**
- * Smarty Internal Plugin Function Call Handler
- *
- * @package Smarty
- * @subpackage PluginsInternal
- * @author Uwe Tews
- */
-
-/**
- * This class does call function defined with the {function} tag
- *
- * @package Smarty
- * @subpackage PluginsInternal
- */
-class Smarty_Internal_Function_Call_Handler {
-
-    /**
-     * This function handles calls to template functions defined by {function}
-     * It does create a PHP function at the first call
-     *
-     * @param string                   $_name       template function name
-     * @param Smarty_Internal_Template $_template   template object
-     * @param array                    $_params     Smarty variables passed as call parameter
-     * @param string                   $_hash       nocache hash value
-     * @param bool                     $_nocache    nocache flag
-     */
-    public static function call($_name, Smarty_Internal_Template $_template, $_params, $_hash, $_nocache)
-    {
-        if ($_nocache) {
-            $_function = "smarty_template_function_{$_name}_nocache";
-        } else {
-            $_function = "smarty_template_function_{$_hash}_{$_name}";
-        }
-        if (!is_callable($_function)) {
-            $_code = "function {$_function}(\$_smarty_tpl,\$params) {
-    \$saved_tpl_vars = \$_smarty_tpl->tpl_vars;
-    foreach (\$_smarty_tpl->smarty->template_functions['{$_name}']['parameter'] as \$key => \$value) {\$_smarty_tpl->tpl_vars[\$key] = new Smarty_variable(\$value);};
-    foreach (\$params as \$key => \$value) {\$_smarty_tpl->tpl_vars[\$key] = new Smarty_variable(\$value);}?>";
-            if ($_nocache) {
-                $_code .= preg_replace(array("!<\?php echo \\'/\*%%SmartyNocache:{$_template->smarty->template_functions[$_name]['nocache_hash']}%%\*/|/\*/%%SmartyNocache:{$_template->smarty->template_functions[$_name]['nocache_hash']}%%\*/\\';\?>!",
-                        "!\\\'!"), array('', "'"), $_template->smarty->template_functions[$_name]['compiled']);
-                $_template->smarty->template_functions[$_name]['called_nocache'] = true;
-            } else {
-                $_code .= preg_replace("/{$_template->smarty->template_functions[$_name]['nocache_hash']}/", $_template->properties['nocache_hash'], $_template->smarty->template_functions[$_name]['compiled']);
-            }
-            $_code .= "<?php \$_smarty_tpl->tpl_vars = \$saved_tpl_vars;}";
-            eval($_code);
-        }
-        $_function($_template, $_params);
-    }
-
-}
-
-?>
diff --git a/include/smarty/libs/sysplugins/smarty_internal_get_include_path.php b/include/smarty/libs/sysplugins/smarty_internal_get_include_path.php
deleted file mode 100644
index bafb72133..000000000
--- a/include/smarty/libs/sysplugins/smarty_internal_get_include_path.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php
-/**
- * Smarty read include path plugin
- *
- * @package Smarty
- * @subpackage PluginsInternal
- * @author Monte Ohrt
- */
-
-/**
- * Smarty Internal Read Include Path Class
- *
- * @package Smarty
- * @subpackage PluginsInternal
- */
-class Smarty_Internal_Get_Include_Path {
-
-    /**
-     * Return full file path from PHP include_path
-     *
-     * @param string $filepath filepath
-     * @return string|boolean full filepath or false
-     */
-    public static function getIncludePath($filepath)
-    {
-        static $_include_path = null;
-        
-        if (function_exists('stream_resolve_include_path')) {
-            // available since PHP 5.3.2
-            return stream_resolve_include_path($filepath);
-        }
-
-        if ($_include_path === null) {
-            $_include_path = explode(PATH_SEPARATOR, get_include_path());
-        }
-
-        foreach ($_include_path as $_path) {
-            if (file_exists($_path . DS . $filepath)) {
-                return $_path . DS . $filepath;
-            }
-        }
-
-        return false;
-    }
-
-}
-
-?>
\ No newline at end of file
diff --git a/include/smarty/libs/sysplugins/smarty_internal_method_addautoloadfilters.php b/include/smarty/libs/sysplugins/smarty_internal_method_addautoloadfilters.php
new file mode 100644
index 000000000..b739f0e3e
--- /dev/null
+++ b/include/smarty/libs/sysplugins/smarty_internal_method_addautoloadfilters.php
@@ -0,0 +1,51 @@
+<?php
+
+/**
+ * Smarty Method AddAutoloadFilters
+ *
+ * Smarty::addAutoloadFilters() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Method_AddAutoloadFilters extends Smarty_Internal_Method_SetAutoloadFilters
+{
+
+    /**
+     * Add autoload filters
+     *
+     * @api Smarty::setAutoloadFilters()
+     *
+     * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
+     * @param  array                                                          $filters filters to load automatically
+     * @param  string                                                         $type    "pre", "output", … specify the
+     *                                                                                 filter type to set. Defaults to
+     *                                                                                 none treating $filters' keys as
+     *                                                                                 the appropriate types
+     *
+     * @return \Smarty|\Smarty_Internal_Template
+     */
+    public function addAutoloadFilters(Smarty_Internal_TemplateBase $obj, $filters, $type = null)
+    {
+        $smarty = isset($obj->smarty) ? $obj->smarty : $obj;
+        if ($type !== null) {
+            $this->_checkFilterType($type);
+            if (!empty($smarty->autoload_filters[$type])) {
+                $smarty->autoload_filters[$type] = array_merge($smarty->autoload_filters[$type], (array) $filters);
+            } else {
+                $smarty->autoload_filters[$type] = (array) $filters;
+            }
+        } else {
+            foreach ((array) $filters as $type => $value) {
+                $this->_checkFilterType($type);
+                if (!empty($smarty->autoload_filters[$type])) {
+                    $smarty->autoload_filters[$type] = array_merge($smarty->autoload_filters[$type], (array) $value);
+                } else {
+                    $smarty->autoload_filters[$type] = (array) $value;
+                }
+            }
+        }
+        return $obj;
+    }
+}
\ No newline at end of file
diff --git a/include/smarty/libs/sysplugins/smarty_internal_method_adddefaultmodifiers.php b/include/smarty/libs/sysplugins/smarty_internal_method_adddefaultmodifiers.php
new file mode 100644
index 000000000..55d2c9e71
--- /dev/null
+++ b/include/smarty/libs/sysplugins/smarty_internal_method_adddefaultmodifiers.php
@@ -0,0 +1,42 @@
+<?php
+
+/**
+ * Smarty Method AddDefaultModifiers
+ *
+ * Smarty::addDefaultModifiers() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Method_AddDefaultModifiers
+{
+    /**
+     * Valid for Smarty and template object
+     *
+     * @var int
+     */
+    public $objMap = 3;
+
+    /**
+     * Add default modifiers
+     *
+     * @api Smarty::addDefaultModifiers()
+     *
+     * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
+     * @param  array|string                                                   $modifiers modifier or list of modifiers
+     *                                                                                   to add
+     *
+     * @return \Smarty|\Smarty_Internal_Template
+     */
+    public function addDefaultModifiers(Smarty_Internal_TemplateBase $obj, $modifiers)
+    {
+        $smarty = isset($obj->smarty) ? $obj->smarty : $obj;
+        if (is_array($modifiers)) {
+            $this->default_modifiers = array_merge($smarty->default_modifiers, $modifiers);
+        } else {
+            $smarty->default_modifiers[] = $modifiers;
+        }
+        return $obj;
+    }
+}
\ No newline at end of file
diff --git a/include/smarty/libs/sysplugins/smarty_internal_method_append.php b/include/smarty/libs/sysplugins/smarty_internal_method_append.php
new file mode 100644
index 000000000..43df8803f
--- /dev/null
+++ b/include/smarty/libs/sysplugins/smarty_internal_method_append.php
@@ -0,0 +1,74 @@
+<?php
+
+/**
+ * Smarty Method Append
+ *
+ * Smarty::append() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Method_Append
+{
+    /**
+     * Valid for all objects
+     *
+     * @var int
+     */
+    public $objMap = 7;
+
+    /**
+     * appends values to template variables
+     *
+     * @api  Smarty::append()
+     * @link http://www.smarty.net/docs/en/api.append.tpl
+     *
+     * @param \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty $data
+     * @param  array|string                                           $tpl_var the template variable name(s)
+     * @param  mixed                                                  $value   the value to append
+     * @param  bool                                                   $merge   flag if array elements shall be merged
+     * @param  bool                                                   $nocache if true any output of this variable will
+     *                                                                         be not cached
+     *
+     * @return \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty
+     */
+    public function append(Smarty_Internal_Data $data, $tpl_var, $value = null, $merge = false, $nocache = false)
+    {
+        if (is_array($tpl_var)) {
+            // $tpl_var is an array, ignore $value
+            foreach ($tpl_var as $_key => $_val) {
+                if ($_key != '') {
+                    $this->append($data, $_key, $_val, $merge, $nocache);
+                }
+            }
+        } else {
+            if ($tpl_var != '' && isset($value)) {
+                if (!isset($data->tpl_vars[$tpl_var])) {
+                    $tpl_var_inst = $data->ext->getTemplateVars->_getVariable($data, $tpl_var, null, true, false);
+                    if ($tpl_var_inst instanceof Smarty_Undefined_Variable) {
+                        $data->tpl_vars[$tpl_var] = new Smarty_Variable(null, $nocache);
+                    } else {
+                        $data->tpl_vars[$tpl_var] = clone $tpl_var_inst;
+                    }
+                }
+                if (!(is_array($data->tpl_vars[$tpl_var]->value) ||
+                    $data->tpl_vars[$tpl_var]->value instanceof ArrayAccess)
+                ) {
+                    settype($data->tpl_vars[$tpl_var]->value, 'array');
+                }
+                if ($merge && is_array($value)) {
+                    foreach ($value as $_mkey => $_mval) {
+                        $data->tpl_vars[$tpl_var]->value[$_mkey] = $_mval;
+                    }
+                } else {
+                    $data->tpl_vars[$tpl_var]->value[] = $value;
+                }
+            }
+            if ($data->_objType == 2 && $data->scope) {
+                $data->ext->_updateScope->updateScope($data, $tpl_var);
+            }
+        }
+        return $data;
+    }
+}
\ No newline at end of file
diff --git a/include/smarty/libs/sysplugins/smarty_internal_method_appendbyref.php b/include/smarty/libs/sysplugins/smarty_internal_method_appendbyref.php
new file mode 100644
index 000000000..124bb803a
--- /dev/null
+++ b/include/smarty/libs/sysplugins/smarty_internal_method_appendbyref.php
@@ -0,0 +1,50 @@
+<?php
+
+/**
+ * Smarty Method AppendByRef
+ *
+ * Smarty::appendByRef() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Method_AppendByRef
+{
+
+    /**
+     * appends values to template variables by reference
+     *
+     * @api  Smarty::appendByRef()
+     * @link http://www.smarty.net/docs/en/api.append.by.ref.tpl
+     *
+     * @param \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty $data
+     * @param  string                                                 $tpl_var the template variable name
+     * @param  mixed                                                  &$value  the referenced value to append
+     * @param  bool                                                   $merge   flag if array elements shall be merged
+     *
+     * @return \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty
+     */
+    public static function appendByRef(Smarty_Internal_Data $data, $tpl_var, &$value, $merge = false)
+    {
+        if ($tpl_var != '' && isset($value)) {
+            if (!isset($data->tpl_vars[$tpl_var])) {
+                $data->tpl_vars[$tpl_var] = new Smarty_Variable();
+            }
+            if (!is_array($data->tpl_vars[$tpl_var]->value)) {
+                settype($data->tpl_vars[$tpl_var]->value, 'array');
+            }
+            if ($merge && is_array($value)) {
+                foreach ($value as $_key => $_val) {
+                    $data->tpl_vars[$tpl_var]->value[$_key] = &$value[$_key];
+                }
+            } else {
+                $data->tpl_vars[$tpl_var]->value[] = &$value;
+            }
+            if ($data->_objType == 2 && $data->scope) {
+                $data->ext->_updateScope->updateScope($data, $tpl_var);
+            }
+        }
+        return $data;
+    }
+}
\ No newline at end of file
diff --git a/include/smarty/libs/sysplugins/smarty_internal_method_assignbyref.php b/include/smarty/libs/sysplugins/smarty_internal_method_assignbyref.php
new file mode 100644
index 000000000..a97125e30
--- /dev/null
+++ b/include/smarty/libs/sysplugins/smarty_internal_method_assignbyref.php
@@ -0,0 +1,36 @@
+<?php
+
+/**
+ * Smarty Method AssignByRef
+ *
+ * Smarty::assignByRef() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Method_AssignByRef
+{
+
+    /**
+     * assigns values to template variables by reference
+     *
+     * @param \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty $data
+     * @param string                                                  $tpl_var the template variable name
+     * @param                                                         $value
+     * @param  boolean                                                $nocache if true any output of this variable will be not cached
+     *
+     * @return \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty
+     */
+    public function assignByRef(Smarty_Internal_Data $data, $tpl_var, &$value, $nocache)
+    {
+        if ($tpl_var != '') {
+            $data->tpl_vars[$tpl_var] = new Smarty_Variable(null, $nocache);
+            $data->tpl_vars[$tpl_var]->value = &$value;
+            if ($data->_objType == 2 && $data->scope) {
+                $data->ext->_updateScope->updateScope($data, $tpl_var);
+            }
+        }
+        return $data;
+    }
+}
\ No newline at end of file
diff --git a/include/smarty/libs/sysplugins/smarty_internal_method_assignglobal.php b/include/smarty/libs/sysplugins/smarty_internal_method_assignglobal.php
new file mode 100644
index 000000000..23b13b3a2
--- /dev/null
+++ b/include/smarty/libs/sysplugins/smarty_internal_method_assignglobal.php
@@ -0,0 +1,43 @@
+<?php
+
+/**
+ * Smarty Method AssignGlobal
+ *
+ * Smarty::assignGlobal() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Method_AssignGlobal
+{
+    /**
+     * Valid for all objects
+     *
+     * @var int
+     */
+    public $objMap = 7;
+
+     /**
+     * assigns a global Smarty variable
+     *
+     * @param \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty $data
+     * @param  string  $varName the global variable name
+     * @param  mixed   $value   the value to assign
+     * @param  boolean $nocache if true any output of this variable will be not cached
+     *
+     * @return \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty
+     */
+    public function assignGlobal(Smarty_Internal_Data $data, $varName, $value = null, $nocache = false)
+    {
+        if ($varName != '') {
+            Smarty::$global_tpl_vars[$varName] = new Smarty_Variable($value, $nocache);
+            $ptr = $data;
+            while ($ptr->_objType == 2) {
+                $ptr->tpl_vars[$varName] = clone Smarty::$global_tpl_vars[$varName];
+                $ptr = $ptr->parent;
+            }
+        }
+        return $data;
+    }
+}
\ No newline at end of file
diff --git a/include/smarty/libs/sysplugins/smarty_internal_method_clearallassign.php b/include/smarty/libs/sysplugins/smarty_internal_method_clearallassign.php
new file mode 100644
index 000000000..1e5fec4bd
--- /dev/null
+++ b/include/smarty/libs/sysplugins/smarty_internal_method_clearallassign.php
@@ -0,0 +1,37 @@
+<?php
+
+/**
+ * Smarty Method ClearAllAssign
+ *
+ * Smarty::clearAllAssign() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Method_ClearAllAssign
+{
+    /**
+     * Valid for all objects
+     *
+     * @var int
+     */
+    public $objMap = 7;
+
+    /**
+     * clear all the assigned template variables.
+     *
+     * @api  Smarty::clearAllAssign()
+     * @link http://www.smarty.net/docs/en/api.clear.all.assign.tpl
+     *
+     * @param \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty $data
+     *
+     * @return \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty
+     */
+    public function clearAllAssign(Smarty_Internal_Data $data)
+    {
+        $data->tpl_vars = array();
+
+        return $data;
+    }
+}
\ No newline at end of file
diff --git a/include/smarty/libs/sysplugins/smarty_internal_method_clearallcache.php b/include/smarty/libs/sysplugins/smarty_internal_method_clearallcache.php
new file mode 100644
index 000000000..1fe37892e
--- /dev/null
+++ b/include/smarty/libs/sysplugins/smarty_internal_method_clearallcache.php
@@ -0,0 +1,43 @@
+<?php
+
+/**
+ * Smarty Method ClearAllCache
+ *
+ * Smarty::clearAllCache() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Method_ClearAllCache
+{
+    /**
+     * Valid for Smarty object
+     *
+     * @var int
+     */
+    public $objMap = 1;
+
+    /**
+     * Empty cache folder
+     *
+     * @api  Smarty::clearAllCache()
+     * @link http://www.smarty.net/docs/en/api.clear.all.cache.tpl
+     *
+     * @param \Smarty  $smarty
+     * @param  integer $exp_time expiration time
+     * @param  string  $type     resource type
+     *
+     * @return integer number of cache files deleted
+     */
+    public function clearAllCache(Smarty $smarty, $exp_time = null, $type = null)
+    {
+        // load cache resource and call clearAll
+        $_cache_resource = Smarty_CacheResource::load($smarty, $type);
+        if ($smarty->caching_type != 'file') {
+            $_cache_resource->invalidLoadedCache($smarty);
+        }
+
+        return $_cache_resource->clearAll($smarty, $exp_time);
+    }
+}
\ No newline at end of file
diff --git a/include/smarty/libs/sysplugins/smarty_internal_method_clearassign.php b/include/smarty/libs/sysplugins/smarty_internal_method_clearassign.php
new file mode 100644
index 000000000..3a7bd1e47
--- /dev/null
+++ b/include/smarty/libs/sysplugins/smarty_internal_method_clearassign.php
@@ -0,0 +1,44 @@
+<?php
+
+/**
+ * Smarty Method ClearAssign
+ *
+ * Smarty::clearAssign() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Method_ClearAssign
+{
+    /**
+     * Valid for all objects
+     *
+     * @var int
+     */
+    public $objMap = 7;
+
+    /**
+     * clear the given assigned template variable(s).
+     *
+     * @api  Smarty::clearAssign()
+     * @link http://www.smarty.net/docs/en/api.clear.assign.tpl
+     *
+     * @param \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty $data
+     * @param  string|array                                           $tpl_var the template variable(s) to clear
+     *
+     * @return \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty
+     */
+    public function clearAssign(Smarty_Internal_Data $data, $tpl_var)
+    {
+        if (is_array($tpl_var)) {
+            foreach ($tpl_var as $curr_var) {
+                unset($data->tpl_vars[$curr_var]);
+            }
+        } else {
+            unset($data->tpl_vars[$tpl_var]);
+        }
+
+        return $data;
+    }
+}
\ No newline at end of file
diff --git a/include/smarty/libs/sysplugins/smarty_internal_method_clearcache.php b/include/smarty/libs/sysplugins/smarty_internal_method_clearcache.php
new file mode 100644
index 000000000..a923b3ae1
--- /dev/null
+++ b/include/smarty/libs/sysplugins/smarty_internal_method_clearcache.php
@@ -0,0 +1,46 @@
+<?php
+
+/**
+ * Smarty Method ClearCache
+ *
+ * Smarty::clearCache() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Method_ClearCache
+{
+    /**
+     * Valid for Smarty object
+     *
+     * @var int
+     */
+    public $objMap = 1;
+
+    /**
+     * Empty cache for a specific template
+     *
+     * @api  Smarty::clearCache()
+     * @link http://www.smarty.net/docs/en/api.clear.cache.tpl
+     *
+     * @param \Smarty  $smarty
+     * @param  string  $template_name template name
+     * @param  string  $cache_id      cache id
+     * @param  string  $compile_id    compile id
+     * @param  integer $exp_time      expiration time
+     * @param  string  $type          resource type
+     *
+     * @return integer number of cache files deleted
+     */
+    public function clearCache(Smarty $smarty, $template_name, $cache_id = null, $compile_id = null, $exp_time = null, $type = null)
+    {
+        // load cache resource and call clear
+        $_cache_resource = Smarty_CacheResource::load($smarty, $type);
+        if ($smarty->caching_type != 'file' && !isset($template_name)) {
+            $_cache_resource->invalidLoadedCache($smarty);
+        }
+
+        return $_cache_resource->clear($smarty, $template_name, $cache_id, $compile_id, $exp_time);
+    }
+}
\ No newline at end of file
diff --git a/include/smarty/libs/sysplugins/smarty_internal_method_clearcompiledtemplate.php b/include/smarty/libs/sysplugins/smarty_internal_method_clearcompiledtemplate.php
new file mode 100644
index 000000000..ae1003238
--- /dev/null
+++ b/include/smarty/libs/sysplugins/smarty_internal_method_clearcompiledtemplate.php
@@ -0,0 +1,132 @@
+<?php
+
+/**
+ * Smarty Method ClearCompiledTemplate
+ *
+ * Smarty::clearCompiledTemplate() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Method_ClearCompiledTemplate
+{
+    /**
+     * Valid for Smarty object
+     *
+     * @var int
+     */
+    public $objMap = 1;
+
+    /**
+     * Delete compiled template file
+     *
+     * @api  Smarty::clearCompiledTemplate()
+     * @link http://www.smarty.net/docs/en/api.clear.compiled.template.tpl
+     *
+     * @param \Smarty  $smarty
+     * @param  string  $resource_name template name
+     * @param  string  $compile_id    compile id
+     * @param  integer $exp_time      expiration time
+     *
+     * @return integer number of template files deleted
+     */
+    public function clearCompiledTemplate(Smarty $smarty, $resource_name = null, $compile_id = null, $exp_time = null)
+    {
+
+        $_compile_dir = $smarty->getCompileDir();
+        if ($_compile_dir == '/') { //We should never want to delete this!
+            return 0;
+        }
+        $_compile_id = isset($compile_id) ? preg_replace('![^\w]+!', '_', $compile_id) : null;
+        $_dir_sep = $smarty->use_sub_dirs ? DS : '^';
+        if (isset($resource_name)) {
+            $_save_stat = $smarty->caching;
+            $smarty->caching = false;
+            /* @var Smarty_Internal_Template $tpl */
+            $tpl = new $smarty->template_class($resource_name, $smarty);
+            $smarty->caching = $_save_stat;
+            if ($tpl->source->exists) {
+                // remove from compileds cache
+                $tpl->source->compileds = array();
+                $_resource_part_1 = basename(str_replace('^', DS, $tpl->compiled->filepath));
+                $_resource_part_1_length = strlen($_resource_part_1);
+            } else {
+                return 0;
+            }
+            $_resource_part_2 = str_replace('.php', '.cache.php', $_resource_part_1);
+            $_resource_part_2_length = strlen($_resource_part_2);
+        }
+        $_dir = $_compile_dir;
+        if ($smarty->use_sub_dirs && isset($_compile_id)) {
+            $_dir .= $_compile_id . $_dir_sep;
+        }
+        if (isset($_compile_id)) {
+            $_compile_id_part = $_compile_dir . $_compile_id . $_dir_sep;
+            $_compile_id_part_length = strlen($_compile_id_part);
+        }
+        $_count = 0;
+        try {
+            $_compileDirs = new RecursiveDirectoryIterator($_dir);
+            // NOTE: UnexpectedValueException thrown for PHP >= 5.3
+        }
+        catch (Exception $e) {
+            return 0;
+        }
+        $_compile = new RecursiveIteratorIterator($_compileDirs, RecursiveIteratorIterator::CHILD_FIRST);
+        foreach ($_compile as $_file) {
+            if (substr(basename($_file->getPathname()), 0, 1) == '.' || strpos($_file, '.svn') !== false) {
+                continue;
+            }
+
+            $_filepath = (string) $_file;
+
+            if ($_file->isDir()) {
+                if (!$_compile->isDot()) {
+                    // delete folder if empty
+                    @rmdir($_file->getPathname());
+                }
+            } else {
+                $unlink = false;
+                if ((!isset($_compile_id) || (isset($_filepath[$_compile_id_part_length]) &&
+                            $a = !strncmp($_filepath, $_compile_id_part, $_compile_id_part_length))) &&
+                    (!isset($resource_name) || (isset($_filepath[$_resource_part_1_length]) &&
+                            substr_compare($_filepath, $_resource_part_1, - $_resource_part_1_length,
+                                           $_resource_part_1_length) == 0) ||
+                        (isset($_filepath[$_resource_part_2_length]) &&
+                            substr_compare($_filepath, $_resource_part_2, - $_resource_part_2_length,
+                                           $_resource_part_2_length) == 0))
+                ) {
+                    if (isset($exp_time)) {
+                        if (time() - @filemtime($_filepath) >= $exp_time) {
+                            $unlink = true;
+                        }
+                    } else {
+                        $unlink = true;
+                    }
+                }
+
+                if ($unlink && @unlink($_filepath)) {
+                    if (isset($smarty->_cache['template_objects'])) {
+                        foreach ($smarty->_cache['template_objects'] as $key => $tpl) {
+                            if (isset($tpl->compiled) && $tpl->compiled->filepath == $_filepath) {
+                                unset($smarty->_cache['template_objects'][$key]);
+                            }
+                        }
+                    }
+                    $_count ++;
+                    if (function_exists('opcache_invalidate')) {
+                        opcache_invalidate($_filepath);
+                    }
+                }
+            }
+        }
+        // clear compiled cache
+        if (!isset($resource_name) && isset($smarty->_cache['source_objects'])) {
+            foreach ($smarty->_cache['source_objects'] as $source) {
+                $source->compileds = array();
+            }
+        }
+        return $_count;
+    }
+}
\ No newline at end of file
diff --git a/include/smarty/libs/sysplugins/smarty_internal_method_clearconfig.php b/include/smarty/libs/sysplugins/smarty_internal_method_clearconfig.php
new file mode 100644
index 000000000..9c6167f4d
--- /dev/null
+++ b/include/smarty/libs/sysplugins/smarty_internal_method_clearconfig.php
@@ -0,0 +1,41 @@
+<?php
+
+/**
+ * Smarty Method ClearConfig
+ *
+ * Smarty::clearConfig() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Method_ClearConfig
+{
+    /**
+     * Valid for all objects
+     *
+     * @var int
+     */
+    public $objMap = 7;
+
+    /**
+     * clear a single or all config variables
+     *
+     * @api  Smarty::clearConfig()
+     * @link http://www.smarty.net/docs/en/api.clear.config.tpl
+     *
+     * @param \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty $data
+     * @param  string|null                                            $name variable name or null
+     *
+     * @return \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty
+     */
+    public function clearConfig(Smarty_Internal_Data $data, $name = null)
+    {
+        if (isset($name)) {
+            unset($data->config_vars[$name]);
+        } else {
+            $data->config_vars = array();
+        }
+        return $data;
+    }
+}
\ No newline at end of file
diff --git a/include/smarty/libs/sysplugins/smarty_internal_method_compileallconfig.php b/include/smarty/libs/sysplugins/smarty_internal_method_compileallconfig.php
new file mode 100644
index 000000000..4d6be65c4
--- /dev/null
+++ b/include/smarty/libs/sysplugins/smarty_internal_method_compileallconfig.php
@@ -0,0 +1,32 @@
+<?php
+
+/**
+ * Smarty Method CompileAllConfig
+ *
+ * Smarty::compileAllConfig() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Method_CompileAllConfig extends Smarty_Internal_Method_CompileAllTemplates
+{
+
+    /**
+     * Compile all config files
+     *
+     * @api  Smarty::compileAllConfig()
+     *
+     * @param \Smarty $smarty
+     * @param  string $extension     file extension
+     * @param  bool   $force_compile force all to recompile
+     * @param  int    $time_limit
+     * @param  int    $max_errors
+     *
+     * @return integer number of template files recompiled
+     */
+    public function compileAllConfig(Smarty $smarty, $extension = '.conf', $force_compile = false, $time_limit = 0, $max_errors = null)
+    {
+        return $this->compileAll($smarty, $extension, $force_compile, $time_limit, $max_errors, true);
+    }
+}
\ No newline at end of file
diff --git a/include/smarty/libs/sysplugins/smarty_internal_method_compilealltemplates.php b/include/smarty/libs/sysplugins/smarty_internal_method_compilealltemplates.php
new file mode 100644
index 000000000..685fc0c0d
--- /dev/null
+++ b/include/smarty/libs/sysplugins/smarty_internal_method_compilealltemplates.php
@@ -0,0 +1,111 @@
+<?php
+
+/**
+ * Smarty Method CompileAllTemplates
+ *
+ * Smarty::compileAllTemplates() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Method_CompileAllTemplates
+{
+    /**
+     * Valid for Smarty object
+     *
+     * @var int
+     */
+    public $objMap = 1;
+
+    /**
+     * Compile all template files
+     *
+     * @api  Smarty::compileAllTemplates()
+     *
+     * @param \Smarty $smarty
+     * @param  string $extension     file extension
+     * @param  bool   $force_compile force all to recompile
+     * @param  int    $time_limit
+     * @param  int    $max_errors
+     *
+     * @return integer number of template files recompiled
+     */
+    public function compileAllTemplates(Smarty $smarty, $extension = '.tpl', $force_compile = false, $time_limit = 0, $max_errors = null)
+    {
+        return $this->compileAll($smarty, $extension, $force_compile, $time_limit, $max_errors);
+    }
+
+    /**
+     * Compile all template or config files
+     *
+     * @param \Smarty $smarty
+     * @param  string $extension     template file name extension
+     * @param  bool   $force_compile force all to recompile
+     * @param  int    $time_limit    set maximum execution time
+     * @param  int    $max_errors    set maximum allowed errors
+     * @param bool    $isConfig      flag true if called for config files
+     *
+     * @return int number of template files compiled
+     */
+    protected function compileAll(Smarty $smarty, $extension, $force_compile, $time_limit, $max_errors, $isConfig = false)
+    {
+        // switch off time limit
+        if (function_exists('set_time_limit')) {
+            @set_time_limit($time_limit);
+        }
+        $_count = 0;
+        $_error_count = 0;
+        $sourceDir = $isConfig ? $smarty->getConfigDir() : $smarty->getTemplateDir();
+        // loop over array of source directories
+        foreach ($sourceDir as $_dir) {
+            $_dir_1 = new RecursiveDirectoryIterator($_dir);
+            $_dir_2 = new RecursiveIteratorIterator($_dir_1);
+            foreach ($_dir_2 as $_fileinfo) {
+                $_file = $_fileinfo->getFilename();
+                if (substr(basename($_fileinfo->getPathname()), 0, 1) == '.' || strpos($_file, '.svn') !== false) {
+                    continue;
+                }
+                if (!substr_compare($_file, $extension, - strlen($extension)) == 0) {
+                    continue;
+                }
+                if ($_fileinfo->getPath() == !substr($_dir, 0, - 1)) {
+                    $_file = substr($_fileinfo->getPath(), strlen($_dir)) . DS . $_file;
+                }
+                echo "\n<br>", $_dir, '---', $_file;
+                flush();
+                $_start_time = microtime(true);
+                $_smarty = clone $smarty;
+                $_smarty->force_compile = $force_compile;
+                try {
+                    /* @var Smarty_Internal_Template $_tpl */
+                    $_tpl = new $smarty->template_class($_file, $_smarty);
+                    $_tpl->caching = Smarty::CACHING_OFF;
+                    $_tpl->source = $isConfig ? Smarty_Template_Config::load($_tpl) : Smarty_Template_Source::load($_tpl);
+                    if ($_tpl->mustCompile()) {
+                        $_tpl->compileTemplateSource();
+                        $_count ++;
+                        echo ' compiled in  ', microtime(true) - $_start_time, ' seconds';
+                        flush();
+                    } else {
+                        echo ' is up to date';
+                        flush();
+                    }
+                }
+                catch (Exception $e) {
+                    echo "\n<br>        ------>Error: ", $e->getMessage(), "<br><br>\n";
+                    $_error_count ++;
+                }
+                // free memory
+                unset($_tpl);
+                $_smarty->_cache['template_objects'] = array();
+                if ($max_errors !== null && $_error_count == $max_errors) {
+                    echo "\n<br><br>too many errors\n";
+                    exit();
+                }
+            }
+        }
+        echo "\n<br>";
+        return $_count;
+    }
+}
\ No newline at end of file
diff --git a/include/smarty/libs/sysplugins/smarty_internal_method_configload.php b/include/smarty/libs/sysplugins/smarty_internal_method_configload.php
new file mode 100644
index 000000000..ec023ec8f
--- /dev/null
+++ b/include/smarty/libs/sysplugins/smarty_internal_method_configload.php
@@ -0,0 +1,182 @@
+<?php
+
+/**
+ * Smarty Method ConfigLoad
+ *
+ * Smarty::configLoad() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Method_ConfigLoad
+{
+    /**
+     * Valid for all objects
+     *
+     * @var int
+     */
+    public $objMap = 7;
+
+    /**
+     * load a config file, optionally load just selected sections
+     *
+     * @api  Smarty::configLoad()
+     * @link http://www.smarty.net/docs/en/api.config.load.tpl
+     *
+     * @param \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty $data
+     * @param  string                                                 $config_file filename
+     * @param  mixed                                                  $sections    array of section names, single
+     *                                                                             section or null
+     *
+     * @return \Smarty|\Smarty_Internal_Data|\Smarty_Internal_Template
+     * @throws \SmartyException
+     */
+    public function configLoad(Smarty_Internal_Data $data, $config_file, $sections = null)
+    {
+        $this->_loadConfigFile($data, $config_file, $sections, 0);
+        return $data;
+    }
+
+    /**
+     * load a config file, optionally load just selected sections
+     *
+     * @api  Smarty::configLoad()
+     * @link http://www.smarty.net/docs/en/api.config.load.tpl
+     *
+     * @param \Smarty|\Smarty_Internal_Data|\Smarty_Internal_Template $data
+     * @param  string                                                 $config_file filename
+     * @param  mixed                                                  $sections    array of section names, single
+     *                                                                             section or null
+     * @param int                                                     $scope       scope into which config variables
+     *                                                                             shall be loaded
+     *
+     * @return \Smarty|\Smarty_Internal_Data|\Smarty_Internal_Template
+     * @throws \SmartyException
+     */
+    public function _loadConfigFile(Smarty_Internal_Data $data, $config_file, $sections = null, $scope = 0)
+    {
+        /* @var \Smarty $smarty */
+        $smarty = isset($data->smarty) ? $data->smarty : $data;
+        /* @var \Smarty_Internal_Template $confObj */
+        $confObj = new Smarty_Internal_Template($config_file, $smarty, $data);
+        $confObj->caching = Smarty::CACHING_OFF;
+        $confObj->source = Smarty_Template_Config::load($confObj);
+        $confObj->source->config_sections = $sections;
+        $confObj->source->scope = $scope;
+        $confObj->compiled = Smarty_Template_Compiled::load($confObj);
+        $confObj->compiled->render($confObj);
+        if ($data->_objType == 2) {
+            $data->compiled->file_dependency[$confObj->source->uid] =
+                array($confObj->source->filepath, $confObj->source->getTimeStamp(), $confObj->source->type);
+        }
+    }
+
+    /**
+     * load config variables into template object
+     *
+     * @param \Smarty_Internal_Template $tpl
+     * @param  array                    $_config_vars
+     *
+     */
+    public function _loadConfigVars(Smarty_Internal_Template $tpl, $_config_vars)
+    {
+        $this->_assignConfigVars($tpl->parent, $tpl, $_config_vars);
+        $scope = $tpl->source->scope;
+        if (!$scope && !$tpl->scope) {
+            return;
+        }
+        foreach (array($scope, $tpl->scope) as $s) {
+            $s = ($bubble_up = $s >= Smarty::SCOPE_BUBBLE_UP) ? $s - Smarty::SCOPE_BUBBLE_UP : $s;
+            if ($bubble_up && $s) {
+                $ptr = $tpl->parent->parent;
+                if (isset($ptr)) {
+                    $this->_assignConfigVars($ptr, $tpl, $_config_vars);
+                    $ptr = $ptr->parent;
+                }
+                if ($s == Smarty::SCOPE_PARENT) {
+                    continue;
+                }
+                while (isset($ptr) && $ptr->_objType == 2) {
+                    $this->_assignConfigVars($ptr, $tpl, $_config_vars);
+                    $ptr = $ptr->parent;
+                }
+                if ($s == Smarty::SCOPE_TPL_ROOT) {
+                    continue;
+                } elseif ($s == Smarty::SCOPE_SMARTY) {
+                    $this->_assignConfigVars($tpl->smarty, $tpl, $_config_vars);
+                } elseif ($s == Smarty::SCOPE_GLOBAL) {
+                    $this->_assignConfigVars($tpl->smarty, $tpl, $_config_vars);
+                } elseif ($s == Smarty::SCOPE_ROOT) {
+                    while (isset($ptr->parent)) {
+                        $ptr = $ptr->parent;
+                    }
+                    $this->_assignConfigVars($ptr, $tpl, $_config_vars);
+                }
+            }
+        }
+    }
+
+    /**
+     * Assign all config variables in given scope
+     *
+     * @param \Smarty_Internal_Data     $scope_ptr
+     * @param \Smarty_Internal_Template $tpl
+     * @param  array                    $_config_vars
+     */
+    public function _assignConfigVars(Smarty_Internal_Data $scope_ptr, Smarty_Internal_Template $tpl, $_config_vars)
+    {
+        // copy global config vars
+        foreach ($_config_vars['vars'] as $variable => $value) {
+            if ($tpl->smarty->config_overwrite || !isset($scope_ptr->config_vars[$variable])) {
+                $scope_ptr->config_vars[$variable] = $value;
+            } else {
+                $scope_ptr->config_vars[$variable] =
+                    array_merge((array) $scope_ptr->config_vars[$variable], (array) $value);
+            }
+        }
+        // scan sections
+        $sections = $tpl->source->config_sections;
+        if (!empty($sections)) {
+            foreach ((array) $sections as $tpl_section) {
+                if (isset($_config_vars['sections'][$tpl_section])) {
+                    foreach ($_config_vars['sections'][$tpl_section]['vars'] as $variable => $value) {
+                        if ($tpl->smarty->config_overwrite || !isset($scope_ptr->config_vars[$variable])) {
+                            $scope_ptr->config_vars[$variable] = $value;
+                        } else {
+                            $scope_ptr->config_vars[$variable] =
+                                array_merge((array) $scope_ptr->config_vars[$variable], (array) $value);
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    /**
+     * gets  a config variable value
+     *
+     * @param \Smarty_Internal_Template $tpl     template object
+     * @param string                    $varName the name of the config variable
+     * @param bool                      $errorEnable
+     *
+     * @return mixed  the value of the config variable
+     */
+    public function _getConfigVariable(\Smarty_Internal_Template $tpl, $varName, $errorEnable = true)
+    {
+        $_ptr = $tpl;
+        while ($_ptr !== null) {
+            if (isset($_ptr->config_vars[$varName])) {
+                // found it, return it
+                return $_ptr->config_vars[$varName];
+            }
+            // not found, try at parent
+            $_ptr = $_ptr->parent;
+        }
+        if ($tpl->smarty->error_unassigned && $errorEnable) {
+            // force a notice
+            $x = $$varName;
+        }
+        return null;
+    }
+}
diff --git a/include/smarty/libs/sysplugins/smarty_internal_method_createdata.php b/include/smarty/libs/sysplugins/smarty_internal_method_createdata.php
new file mode 100644
index 000000000..600bc777c
--- /dev/null
+++ b/include/smarty/libs/sysplugins/smarty_internal_method_createdata.php
@@ -0,0 +1,44 @@
+<?php
+
+/**
+ * Smarty Method CreateData
+ *
+ * Smarty::createData() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Method_CreateData
+{
+    /**
+     * Valid for Smarty and template object
+     *
+     * @var int
+     */
+    public $objMap = 3;
+
+    /**
+     * creates a data object
+     *
+     * @api  Smarty::createData()
+     * @link http://www.smarty.net/docs/en/api.create.data.tpl
+     *
+     * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty      $obj
+     * @param \Smarty_Internal_Template|\Smarty_Internal_Data|\Smarty_Data|\Smarty $parent next higher level of Smarty
+     *                                                                                     variables
+     * @param string                                                               $name   optional data block name
+     *
+     * @returns Smarty_Data data object
+     */
+    public function createData(Smarty_Internal_TemplateBase $obj, Smarty_Internal_Data $parent = null, $name = null)
+    {
+        /* @var Smarty $smarty */
+        $smarty = isset($this->smarty) ? $this->smarty : $obj;
+        $dataObj = new Smarty_Data($parent, $smarty, $name);
+        if ($smarty->debugging) {
+            Smarty_Internal_Debug::register_data($dataObj);
+        }
+        return $dataObj;
+    }
+}
\ No newline at end of file
diff --git a/include/smarty/libs/sysplugins/smarty_internal_method_getautoloadfilters.php b/include/smarty/libs/sysplugins/smarty_internal_method_getautoloadfilters.php
new file mode 100644
index 000000000..e1a7801f7
--- /dev/null
+++ b/include/smarty/libs/sysplugins/smarty_internal_method_getautoloadfilters.php
@@ -0,0 +1,37 @@
+<?php
+
+/**
+ * Smarty Method GetAutoloadFilters
+ *
+ * Smarty::getAutoloadFilters() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Method_GetAutoloadFilters extends Smarty_Internal_Method_SetAutoloadFilters
+{
+
+    /**
+     * Get autoload filters
+     *
+     * @api Smarty::getAutoloadFilters()
+     *
+     * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
+     * @param  string                                                         $type type of filter to get auto loads
+     *                                                                              for. Defaults to all autoload
+     *                                                                              filters
+     *
+     * @return array  array( 'type1' => array( 'filter1', 'filter2', … ) ) or array( 'filter1', 'filter2', …) if $type
+     *                was specified
+     */
+    public function getAutoloadFilters(Smarty_Internal_TemplateBase $obj, $type = null)
+    {
+        $smarty = isset($obj->smarty) ? $obj->smarty : $obj;
+        if ($type !== null) {
+            $this->_checkFilterType($type);
+            return isset($smarty->autoload_filters[$type]) ? $smarty->autoload_filters[$type] : array();
+        }
+        return $smarty->autoload_filters;
+    }
+}
\ No newline at end of file
diff --git a/include/smarty/libs/sysplugins/smarty_internal_method_getconfigvars.php b/include/smarty/libs/sysplugins/smarty_internal_method_getconfigvars.php
new file mode 100644
index 000000000..b15672168
--- /dev/null
+++ b/include/smarty/libs/sysplugins/smarty_internal_method_getconfigvars.php
@@ -0,0 +1,58 @@
+<?php
+
+/**
+ * Smarty Method GetConfigVars
+ *
+ * Smarty::getConfigVars() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Method_GetConfigVars
+{
+    /**
+     * Valid for all objects
+     *
+     * @var int
+     */
+    public $objMap = 7;
+
+    /**
+     * Returns a single or all config variables
+     *
+     * @api  Smarty::getConfigVars()
+     * @link http://www.smarty.net/docs/en/api.get.config.vars.tpl
+     *
+     * @param \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty $data
+     * @param  string                                                 $varname        variable name or null
+     * @param  bool                                                   $search_parents include parent templates?
+     *
+     * @return mixed variable value or or array of variables
+     */
+    public function getConfigVars(Smarty_Internal_Data $data, $varname = null, $search_parents = true)
+    {
+        $_ptr = $data;
+        $var_array = array();
+        while ($_ptr !== null) {
+            if (isset($varname)) {
+                if (isset($_ptr->config_vars[$varname])) {
+                    return $_ptr->config_vars[$varname];
+                }
+            } else {
+                $var_array = array_merge($_ptr->config_vars, $var_array);
+            }
+            // not found, try at parent
+            if ($search_parents) {
+                $_ptr = $_ptr->parent;
+            } else {
+                $_ptr = null;
+            }
+        }
+        if (isset($varname)) {
+            return '';
+        } else {
+            return $var_array;
+        }
+    }
+}
\ No newline at end of file
diff --git a/include/smarty/libs/sysplugins/smarty_internal_method_getdebugtemplate.php b/include/smarty/libs/sysplugins/smarty_internal_method_getdebugtemplate.php
new file mode 100644
index 000000000..3c3432ce1
--- /dev/null
+++ b/include/smarty/libs/sysplugins/smarty_internal_method_getdebugtemplate.php
@@ -0,0 +1,35 @@
+<?php
+
+/**
+ * Smarty Method GetDebugTemplate
+ *
+ * Smarty::getDebugTemplate() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Method_GetDebugTemplate
+{
+    /**
+     * Valid for Smarty and template object
+     *
+     * @var int
+     */
+    public $objMap = 3;
+
+    /**
+     * return name of debugging template
+     *
+     * @api Smarty::getDebugTemplate()
+
+     * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
+     *
+     * @return string
+     */
+    public function getDebugTemplate(Smarty_Internal_TemplateBase $obj)
+    {
+        $smarty = isset($obj->smarty) ? $obj->smarty : $obj;
+        return $smarty->debug_tpl;
+    }
+}
\ No newline at end of file
diff --git a/include/smarty/libs/sysplugins/smarty_internal_method_getdefaultmodifiers.php b/include/smarty/libs/sysplugins/smarty_internal_method_getdefaultmodifiers.php
new file mode 100644
index 000000000..32e0cc413
--- /dev/null
+++ b/include/smarty/libs/sysplugins/smarty_internal_method_getdefaultmodifiers.php
@@ -0,0 +1,35 @@
+<?php
+
+/**
+ * Smarty Method GetDefaultModifiers
+ *
+ * Smarty::getDefaultModifiers() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Method_GetDefaultModifiers
+{
+    /**
+     * Valid for Smarty and template object
+     *
+     * @var int
+     */
+    public $objMap = 3;
+
+    /**
+     * Get default modifiers
+     *
+     * @api Smarty::getDefaultModifiers()
+     *
+     * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
+     *
+     * @return array list of default modifiers
+     */
+    public function getDefaultModifiers(Smarty_Internal_TemplateBase $obj)
+    {
+        $smarty = isset($obj->smarty) ? $obj->smarty : $obj;
+        return $smarty->default_modifiers;
+    }
+}
\ No newline at end of file
diff --git a/include/smarty/libs/sysplugins/smarty_internal_method_getregisteredobject.php b/include/smarty/libs/sysplugins/smarty_internal_method_getregisteredobject.php
new file mode 100644
index 000000000..be0c0dba2
--- /dev/null
+++ b/include/smarty/libs/sysplugins/smarty_internal_method_getregisteredobject.php
@@ -0,0 +1,44 @@
+<?php
+
+/**
+ * Smarty Method GetRegisteredObject
+ *
+ * Smarty::getRegisteredObject() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Method_GetRegisteredObject
+{
+    /**
+     * Valid for Smarty and template object
+     *
+     * @var int
+     */
+    public $objMap = 3;
+
+    /**
+     * return a reference to a registered object
+     *
+     * @api  Smarty::getRegisteredObject()
+     * @link http://www.smarty.net/docs/en/api.get.registered.object.tpl
+     *
+     * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
+     * @param  string                                                         $object_name object name
+     *
+     * @return object
+     * @throws \SmartyException if no such object is found
+     */
+    public function getRegisteredObject(Smarty_Internal_TemplateBase $obj, $object_name)
+    {
+        $smarty = isset($obj->smarty) ? $obj->smarty : $obj;
+        if (!isset($smarty->registered_objects[$object_name])) {
+            throw new SmartyException("'$object_name' is not a registered object");
+        }
+        if (!is_object($smarty->registered_objects[$object_name][0])) {
+            throw new SmartyException("registered '$object_name' is not an object");
+        }
+        return $smarty->registered_objects[$object_name][0];
+    }
+}
\ No newline at end of file
diff --git a/include/smarty/libs/sysplugins/smarty_internal_method_getstreamvariable.php b/include/smarty/libs/sysplugins/smarty_internal_method_getstreamvariable.php
new file mode 100644
index 000000000..b922fd088
--- /dev/null
+++ b/include/smarty/libs/sysplugins/smarty_internal_method_getstreamvariable.php
@@ -0,0 +1,51 @@
+<?php
+
+/**
+ * Smarty Method GetStreamVariable
+ *
+ * Smarty::getStreamVariable() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Method_GetStreamVariable
+{
+    /**
+     * Valid for all objects
+     *
+     * @var int
+     */
+    public $objMap = 7;
+
+    /**
+     * gets  a stream variable
+     *
+     * @api Smarty::getStreamVariable()
+     *
+     * @param \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty $data
+     * @param  string                                                 $variable the stream of the variable
+     *
+     * @return mixed
+     * @throws \SmartyException
+     */
+    public function getStreamVariable(Smarty_Internal_Data $data, $variable)
+    {
+        $_result = '';
+        $fp = fopen($variable, 'r+');
+        if ($fp) {
+            while (!feof($fp) && ($current_line = fgets($fp)) !== false) {
+                $_result .= $current_line;
+            }
+            fclose($fp);
+
+            return $_result;
+        }
+        $smarty = isset($data->smarty) ? $data->smarty : $data;
+        if ($smarty->error_unassigned) {
+            throw new SmartyException('Undefined stream variable "' . $variable . '"');
+        } else {
+            return null;
+        }
+    }
+}
\ No newline at end of file
diff --git a/include/smarty/libs/sysplugins/smarty_internal_method_gettags.php b/include/smarty/libs/sysplugins/smarty_internal_method_gettags.php
new file mode 100644
index 000000000..dd9e8d1ca
--- /dev/null
+++ b/include/smarty/libs/sysplugins/smarty_internal_method_gettags.php
@@ -0,0 +1,62 @@
+<?php
+
+/**
+ * Smarty Method GetTags
+ *
+ * Smarty::getTags() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Method_GetTags
+{
+    /**
+     * Valid for Smarty and template object
+     *
+     * @var int
+     */
+    public $objMap = 3;
+
+    /**
+     * Return array of tag/attributes of all tags used by an template
+     *
+     * @api  Smarty::getTags()
+     * @link http://www.smarty.net/docs/en/api.get.tags.tpl
+     *
+     * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
+     * @param null|string|Smarty_Internal_Template                            $template
+     *
+     * @return array of tag/attributes
+     * @throws \SmartyException
+     */
+    public function getTags(Smarty_Internal_TemplateBase $obj, $template = null)
+    {
+        /* @var Smarty $smarty */
+        $smarty = isset($this->smarty) ? $this->smarty : $obj;
+        if ($obj->_objType == 2 && !isset($template)) {
+            $tpl = clone $obj;
+        } elseif (isset($template) && $template->_objType == 2) {
+            $tpl = clone $template;
+        } elseif (isset($template) && is_string($template)) {
+            /* @var Smarty_Internal_Template $tpl */
+            $tpl = new $smarty->template_class($template, $smarty);
+            // checks if template exists
+            if (!$tpl->source->exists) {
+                throw new SmartyException("Unable to load template {$tpl->source->type} '{$tpl->source->name}'");
+            }
+        }
+        if (isset($tpl)) {
+            $tpl->smarty = clone $tpl->smarty;
+            $tpl->smarty->_cache['get_used_tags'] = true;
+            $tpl->_cache['used_tags'] = array();
+            $tpl->smarty->merge_compiled_includes = false;
+            $tpl->smarty->disableSecurity();
+            $tpl->caching = false;
+            $tpl->loadCompiler();
+            $tpl->compiler->compileTemplate($tpl);
+            return $tpl->_cache['used_tags'];
+        }
+        throw new SmartyException("Missing template specification");
+    }
+}
\ No newline at end of file
diff --git a/include/smarty/libs/sysplugins/smarty_internal_method_gettemplatevars.php b/include/smarty/libs/sysplugins/smarty_internal_method_gettemplatevars.php
new file mode 100644
index 000000000..235bece46
--- /dev/null
+++ b/include/smarty/libs/sysplugins/smarty_internal_method_gettemplatevars.php
@@ -0,0 +1,114 @@
+<?php
+
+/**
+ * Smarty Method GetTemplateVars
+ *
+ * Smarty::getTemplateVars() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Method_GetTemplateVars
+{
+    /**
+     * Valid for all objects
+     *
+     * @var int
+     */
+    public $objMap = 7;
+
+    /**
+     * Returns a single or all template variables
+     *
+     * @api  Smarty::getTemplateVars()
+     * @link http://www.smarty.net/docs/en/api.get.template.vars.tpl
+     *
+     * @param \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty $data
+     * @param  string                                                 $varName        variable name or null
+     * @param \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty $_ptr           optional pointer to data object
+     * @param  bool                                                   $searchParents include parent templates?
+     *
+     * @return mixed variable value or or array of variables
+     */
+    public function getTemplateVars(Smarty_Internal_Data $data, $varName = null, Smarty_Internal_Data $_ptr = null, $searchParents = true)
+    {
+        if (isset($varName)) {
+            $_var = $this->_getVariable($data, $varName, $_ptr, $searchParents, false);
+            if (is_object($_var)) {
+                return $_var->value;
+            } else {
+                return null;
+            }
+        } else {
+            $_result = array();
+            if ($_ptr === null) {
+                $_ptr = $data;
+            }
+            while ($_ptr !== null) {
+                foreach ($_ptr->tpl_vars AS $key => $var) {
+                    if (!array_key_exists($key, $_result)) {
+                        $_result[$key] = $var->value;
+                    }
+                }
+                // not found, try at parent
+                if ($searchParents) {
+                    $_ptr = $_ptr->parent;
+                } else {
+                    $_ptr = null;
+                }
+            }
+            if ($searchParents && isset(Smarty::$global_tpl_vars)) {
+                foreach (Smarty::$global_tpl_vars AS $key => $var) {
+                    if (!array_key_exists($key, $_result)) {
+                        $_result[$key] = $var->value;
+                    }
+                }
+            }
+            return $_result;
+        }
+    }
+
+    /**
+     * gets the object of a Smarty variable
+     *
+     * @param \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty $data
+     * @param string                                                 $varName       the name of the Smarty variable
+     * @param \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty $_ptr           optional pointer to data object
+     * @param bool                                                   $searchParents search also in parent data
+     * @param bool                                                    $errorEnable
+     *
+     * @return \Smarty_Variable
+     */
+    public function _getVariable(Smarty_Internal_Data $data, $varName, Smarty_Internal_Data $_ptr = null, $searchParents = true, $errorEnable = true)
+    {
+        if ($_ptr === null) {
+            $_ptr = $data;
+        }
+        while ($_ptr !== null) {
+            if (isset($_ptr->tpl_vars[$varName])) {
+                // found it, return it
+                return $_ptr->tpl_vars[$varName];
+            }
+            // not found, try at parent
+            if ($searchParents) {
+                $_ptr = $_ptr->parent;
+            } else {
+                $_ptr = null;
+            }
+        }
+        if (isset(Smarty::$global_tpl_vars[$varName])) {
+            // found it, return it
+            return Smarty::$global_tpl_vars[$varName];
+        }
+        /* @var \Smarty $smarty */
+        $smarty = isset($data->smarty) ? $data->smarty : $data;
+        if ($smarty->error_unassigned && $errorEnable) {
+            // force a notice
+            $x = $$varName;
+        }
+
+        return new Smarty_Undefined_Variable;
+    }
+
+}
\ No newline at end of file
diff --git a/include/smarty/libs/sysplugins/smarty_internal_method_loadfilter.php b/include/smarty/libs/sysplugins/smarty_internal_method_loadfilter.php
new file mode 100644
index 000000000..7fb11179f
--- /dev/null
+++ b/include/smarty/libs/sysplugins/smarty_internal_method_loadfilter.php
@@ -0,0 +1,77 @@
+<?php
+
+/**
+ * Smarty Method LoadFilter
+ *
+ * Smarty::loadFilter() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Method_LoadFilter
+{
+    /**
+     * Valid for Smarty and template object
+     *
+     * @var int
+     */
+    public $objMap = 3;
+
+    /**
+     * Valid filter types
+     *
+     * @var array
+     */
+    private $filterTypes = array('pre' => true, 'post' => true, 'output' => true, 'variable' => true);
+
+    /**
+     * load a filter of specified type and name
+     *
+     * @api  Smarty::loadFilter()
+     *
+     * @link http://www.smarty.net/docs/en/api.load.filter.tpl
+     *
+     * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
+     * @param  string                                                         $type filter type
+     * @param  string                                                         $name filter name
+     *
+     * @return bool
+     * @throws SmartyException if filter could not be loaded
+     */
+    public function loadFilter(Smarty_Internal_TemplateBase $obj, $type, $name)
+    {
+        $smarty = isset($obj->smarty) ? $obj->smarty : $obj;
+        $this->_checkFilterType($type);
+        $_plugin = "smarty_{$type}filter_{$name}";
+        $_filter_name = $_plugin;
+        if (is_callable($_plugin)) {
+            $smarty->registered_filters[$type][$_filter_name] = $_plugin;
+            return true;
+        }
+        if ($smarty->loadPlugin($_plugin)) {
+            if (class_exists($_plugin, false)) {
+                $_plugin = array($_plugin, 'execute');
+            }
+            if (is_callable($_plugin)) {
+                $smarty->registered_filters[$type][$_filter_name] = $_plugin;
+                return true;
+            }
+        }
+        throw new SmartyException("{$type}filter \"{$name}\" not found or callable");
+    }
+
+    /**
+     * Check if filter type is valid
+     *
+     * @param string $type
+     *
+     * @throws \SmartyException
+     */
+    public function _checkFilterType($type)
+    {
+        if (!isset($this->filterTypes[$type])) {
+            throw new SmartyException("Illegal filter type \"{$type}\"");
+        }
+    }
+}
\ No newline at end of file
diff --git a/include/smarty/libs/sysplugins/smarty_internal_method_loadplugin.php b/include/smarty/libs/sysplugins/smarty_internal_method_loadplugin.php
new file mode 100644
index 000000000..c153f55f0
--- /dev/null
+++ b/include/smarty/libs/sysplugins/smarty_internal_method_loadplugin.php
@@ -0,0 +1,111 @@
+<?php
+
+/**
+ * Smarty Extension Loadplugin
+ *
+ * $smarty->loadPlugin() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Method_LoadPlugin
+{
+    /**
+     * Cache of searched plugin files
+     *
+     * @var array
+     */
+    public $plugin_files = array();
+
+    /**
+     * Takes unknown classes and loads plugin files for them
+     * class name format: Smarty_PluginType_PluginName
+     * plugin filename format: plugintype.pluginname.php
+     *
+     * @param \Smarty $smarty
+     * @param  string $plugin_name class plugin name to load
+     * @param  bool   $check       check if already loaded
+     *
+     * @return bool|string
+     * @throws \SmartyException
+     */
+    public function loadPlugin(Smarty $smarty, $plugin_name, $check)
+    {
+        // if function or class exists, exit silently (already loaded)
+        if ($check && (is_callable($plugin_name) || class_exists($plugin_name, false))) {
+            return true;
+        }
+        if (!preg_match('#^smarty_((internal)|([^_]+))_(.+)$#i', $plugin_name, $match)) {
+            throw new SmartyException("plugin {$plugin_name} is not a valid name format");
+        }
+        if (!empty($match[2])) {
+            $file = SMARTY_SYSPLUGINS_DIR . strtolower($plugin_name) . '.php';
+            if (isset($this->plugin_files[$file])) {
+                if ($this->plugin_files[$file] !== false) {
+                    return $this->plugin_files[$file];
+                } else {
+                    return false;
+                }
+            } else {
+                if (is_file($file)) {
+                    $this->plugin_files[$file] = $file;
+                    require_once($file);
+                    return $file;
+                } else {
+                    $this->plugin_files[$file] = false;
+                    return false;
+                }
+            }
+        }
+        // plugin filename is expected to be: [type].[name].php
+        $_plugin_filename = "{$match[1]}.{$match[4]}.php";
+        $_lower_filename = strtolower($_plugin_filename);
+        if (isset($this->plugin_files)) {
+            if (isset($this->plugin_files['plugins_dir'][$_lower_filename])) {
+                if (!$smarty->use_include_path || $this->plugin_files['plugins_dir'][$_lower_filename] !== false) {
+                    return $this->plugin_files['plugins_dir'][$_lower_filename];
+                }
+            }
+            if (!$smarty->use_include_path || $smarty->ext->_getIncludePath->isNewIncludePath($smarty)) {
+                unset($this->plugin_files['include_path']);
+            } else {
+                if (isset($this->plugin_files['include_path'][$_lower_filename])) {
+                    return $this->plugin_files['include_path'][$_lower_filename];
+                }
+            }
+        }
+        $_file_names = array($_plugin_filename);
+        if ($_lower_filename != $_plugin_filename) {
+            $_file_names[] = $_lower_filename;
+        }
+        $_p_dirs = $smarty->getPluginsDir();
+        if (!isset($this->plugin_files['plugins_dir'][$_lower_filename])) {
+            // loop through plugin dirs and find the plugin
+            foreach ($_p_dirs as $_plugin_dir) {
+                foreach ($_file_names as $name) {
+                    $file = $_plugin_dir . $name;
+                    if (is_file($file)) {
+                        $this->plugin_files['plugins_dir'][$_lower_filename] = $file;
+                        require_once($file);
+                        return $file;
+                    }
+                    $this->plugin_files['plugins_dir'][$_lower_filename] = false;
+                }
+            }
+        }
+        if ($smarty->use_include_path) {
+            foreach ($_file_names as $_file_name) {
+                // try PHP include_path
+                $file = $smarty->ext->_getIncludePath->getIncludePath($_p_dirs, $_file_name, $smarty);
+                $this->plugin_files['include_path'][$_lower_filename] = $file;
+                if ($file !== false) {
+                    require_once($file);
+                    return $file;
+                }
+            }
+        }
+        // no plugin loaded
+        return false;
+    }
+}
\ No newline at end of file
diff --git a/include/smarty/libs/sysplugins/smarty_internal_method_mustcompile.php b/include/smarty/libs/sysplugins/smarty_internal_method_mustcompile.php
new file mode 100644
index 000000000..f28a68e6d
--- /dev/null
+++ b/include/smarty/libs/sysplugins/smarty_internal_method_mustcompile.php
@@ -0,0 +1,49 @@
+<?php
+
+/**
+ * Smarty Method UnloadFilter
+ *
+ * Smarty_Internal_Template::mustCompile() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Method_MustCompile
+{
+    /**
+     * Valid for template object
+     *
+     * @var int
+     */
+    public $objMap = 2;
+
+    /**
+     * Returns if the current template must be compiled by the Smarty compiler
+     * It does compare the timestamps of template source and the compiled templates and checks the force compile
+     * configuration
+     *
+     * @param \Smarty_Internal_Template $_template
+     *
+     * @return bool
+     * @throws \SmartyException
+     */
+    public function mustCompile(Smarty_Internal_Template $_template)
+    {
+        if (!$_template->source->exists) {
+            if (isset($_template->parent) && $_template->parent->_objType == 2) {
+                $parent_resource = " in '$_template->parent->template_resource}'";
+            } else {
+                $parent_resource = '';
+            }
+            throw new SmartyException("Unable to load template {$_template->source->type} '{$_template->source->name}'{$parent_resource}");
+        }
+        if ($_template->mustCompile === null) {
+            $_template->mustCompile = (!$_template->source->handler->uncompiled &&
+                ($_template->smarty->force_compile || $_template->source->handler->recompiled || !$_template->compiled->exists ||
+                    ($_template->smarty->compile_check && $_template->compiled->getTimeStamp() < $_template->source->getTimeStamp())));
+        }
+
+        return $_template->mustCompile;
+    }
+}
\ No newline at end of file
diff --git a/include/smarty/libs/sysplugins/smarty_internal_method_registercacheresource.php b/include/smarty/libs/sysplugins/smarty_internal_method_registercacheresource.php
new file mode 100644
index 000000000..55c5090ac
--- /dev/null
+++ b/include/smarty/libs/sysplugins/smarty_internal_method_registercacheresource.php
@@ -0,0 +1,39 @@
+<?php
+
+/**
+ * Smarty Method RegisterCacheResource
+ *
+ * Smarty::registerCacheResource() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Method_RegisterCacheResource
+{
+    /**
+     * Valid for Smarty and template object
+     *
+     * @var int
+     */
+    public $objMap = 3;
+
+    /**
+     * Registers a resource to fetch a template
+     *
+     * @api  Smarty::registerCacheResource()
+     * @link http://www.smarty.net/docs/en/api.register.cacheresource.tpl
+     *
+     * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
+     * @param  string                                                         $name name of resource type
+     * @param \Smarty_CacheResource                                           $resource_handler
+     *
+     * @return \Smarty|\Smarty_Internal_Template
+     */
+    public function registerCacheResource(Smarty_Internal_TemplateBase $obj, $name, Smarty_CacheResource $resource_handler)
+    {
+        $smarty = isset($obj->smarty) ? $obj->smarty : $obj;
+        $smarty->registered_cache_resources[$name] = $resource_handler;
+        return $obj;
+    }
+}
\ No newline at end of file
diff --git a/include/smarty/libs/sysplugins/smarty_internal_method_registerclass.php b/include/smarty/libs/sysplugins/smarty_internal_method_registerclass.php
new file mode 100644
index 000000000..d2e5e20bb
--- /dev/null
+++ b/include/smarty/libs/sysplugins/smarty_internal_method_registerclass.php
@@ -0,0 +1,46 @@
+<?php
+
+/**
+ * Smarty Method RegisterClass
+ *
+ * Smarty::registerClass() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Method_RegisterClass
+{
+    /**
+     * Valid for Smarty and template object
+     *
+     * @var int
+     */
+    public $objMap = 3;
+
+    /**
+     * Registers static classes to be used in templates
+     *
+     * @api  Smarty::registerClass()
+     * @link http://www.smarty.net/docs/en/api.register.class.tpl
+     *
+     * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
+     * @param  string                                                         $class_name
+     * @param  string                                                         $class_impl the referenced PHP class to
+     *                                                                                    register
+     *
+     * @return \Smarty|\Smarty_Internal_Template
+     * @throws \SmartyException
+     */
+    public function registerClass(Smarty_Internal_TemplateBase $obj, $class_name, $class_impl)
+    {
+        $smarty = isset($obj->smarty) ? $obj->smarty : $obj;
+        // test if exists
+        if (!class_exists($class_impl)) {
+            throw new SmartyException("Undefined class '$class_impl' in register template class");
+        }
+        // register the class
+        $smarty->registered_classes[$class_name] = $class_impl;
+        return $obj;
+    }
+}
\ No newline at end of file
diff --git a/include/smarty/libs/sysplugins/smarty_internal_method_registerdefaultconfighandler.php b/include/smarty/libs/sysplugins/smarty_internal_method_registerdefaultconfighandler.php
new file mode 100644
index 000000000..370aa38dc
--- /dev/null
+++ b/include/smarty/libs/sysplugins/smarty_internal_method_registerdefaultconfighandler.php
@@ -0,0 +1,42 @@
+<?php
+
+/**
+ * Smarty Method RegisterDefaultConfigHandler
+ *
+ * Smarty::registerDefaultConfigHandler() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Method_RegisterDefaultConfigHandler
+{
+    /**
+     * Valid for Smarty and template object
+     *
+     * @var int
+     */
+    public $objMap = 3;
+
+    /**
+     * Register config default handler
+     *
+     * @api  Smarty::registerDefaultConfigHandler()
+     *
+     * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
+     * @param  callable                                                       $callback class/method name
+     *
+     * @return \Smarty|\Smarty_Internal_Template
+     * @throws SmartyException              if $callback is not callable
+     */
+    public function registerDefaultConfigHandler(Smarty_Internal_TemplateBase $obj, $callback)
+    {
+        $smarty = isset($obj->smarty) ? $obj->smarty : $obj;
+        if (is_callable($callback)) {
+            $smarty->default_config_handler_func = $callback;
+        } else {
+            throw new SmartyException("Default config handler not callable");
+        }
+        return $obj;
+    }
+}
\ No newline at end of file
diff --git a/include/smarty/libs/sysplugins/smarty_internal_method_registerdefaultpluginhandler.php b/include/smarty/libs/sysplugins/smarty_internal_method_registerdefaultpluginhandler.php
new file mode 100644
index 000000000..80b801ce5
--- /dev/null
+++ b/include/smarty/libs/sysplugins/smarty_internal_method_registerdefaultpluginhandler.php
@@ -0,0 +1,43 @@
+<?php
+
+/**
+ * Smarty Method RegisterDefaultPluginHandler
+ *
+ * Smarty::registerDefaultPluginHandler() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Method_RegisterDefaultPluginHandler
+{
+    /**
+     * Valid for Smarty and template object
+     *
+     * @var int
+     */
+    public $objMap = 3;
+
+    /**
+     * Registers a default plugin handler
+     *
+     * @api  Smarty::registerDefaultPluginHandler()
+     * @link http://www.smarty.net/docs/en/api.register.default.plugin.handler.tpl
+     *
+     * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
+     * @param  callable                                                       $callback class/method name
+     *
+     * @return \Smarty|\Smarty_Internal_Template
+     * @throws SmartyException              if $callback is not callable
+     */
+    public function registerDefaultPluginHandler(Smarty_Internal_TemplateBase $obj, $callback)
+    {
+        $smarty = isset($obj->smarty) ? $obj->smarty : $obj;
+        if (is_callable($callback)) {
+            $smarty->default_plugin_handler_func = $callback;
+        } else {
+            throw new SmartyException("Default plugin handler '$callback' not callable");
+        }
+        return $obj;
+    }
+}
\ No newline at end of file
diff --git a/include/smarty/libs/sysplugins/smarty_internal_method_registerdefaulttemplatehandler.php b/include/smarty/libs/sysplugins/smarty_internal_method_registerdefaulttemplatehandler.php
new file mode 100644
index 000000000..40979e7a6
--- /dev/null
+++ b/include/smarty/libs/sysplugins/smarty_internal_method_registerdefaulttemplatehandler.php
@@ -0,0 +1,72 @@
+<?php
+
+/**
+ * Smarty Method RegisterDefaultTemplateHandler
+ *
+ * Smarty::registerDefaultTemplateHandler() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Method_RegisterDefaultTemplateHandler
+{
+    /**
+     * Valid for Smarty and template object
+     *
+     * @var int
+     */
+    public $objMap = 3;
+
+    /**
+     * Register template default handler
+     *
+     * @api  Smarty::registerDefaultTemplateHandler()
+     *
+     * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
+     * @param  callable                                                       $callback class/method name
+     *
+     * @return \Smarty|\Smarty_Internal_Template
+     * @throws SmartyException              if $callback is not callable
+     */
+    public function registerDefaultTemplateHandler(Smarty_Internal_TemplateBase $obj, $callback)
+    {
+        $smarty = isset($obj->smarty) ? $obj->smarty : $obj;
+        if (is_callable($callback)) {
+            $smarty->default_template_handler_func = $callback;
+        } else {
+            throw new SmartyException("Default template handler not callable");
+        }
+        return $obj;
+    }
+
+    /**
+     * get default content from template or config resource handler
+     *
+     * @param Smarty_Template_Source $source
+     */
+    public static function _getDefaultTemplate(Smarty_Template_Source $source)
+    {
+        if ($source->isConfig) {
+            $default_handler = $source->smarty->default_config_handler_func;
+        } else {
+            $default_handler = $source->smarty->default_template_handler_func;
+        }
+        $_content = $_timestamp = null;
+        $_return = call_user_func_array($default_handler, array($source->type, $source->name, &$_content, &$_timestamp,
+                                                                $source->smarty));
+        if (is_string($_return)) {
+            $source->exists = is_file($_return);
+            if ($source->exists) {
+                $source->timestamp = filemtime($_return);
+            }
+            $source->filepath = $_return;
+        } elseif ($_return === true) {
+            $source->content = $_content;
+            $source->timestamp = $_timestamp;
+            $source->exists = true;
+            $source->handler->recompiled = true;
+            $source->filepath = false;
+        }
+    }
+}
\ No newline at end of file
diff --git a/include/smarty/libs/sysplugins/smarty_internal_method_registerfilter.php b/include/smarty/libs/sysplugins/smarty_internal_method_registerfilter.php
new file mode 100644
index 000000000..84b2c2630
--- /dev/null
+++ b/include/smarty/libs/sysplugins/smarty_internal_method_registerfilter.php
@@ -0,0 +1,88 @@
+<?php
+
+/**
+ * Smarty Method RegisterFilter
+ *
+ * Smarty::registerFilter() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Method_RegisterFilter
+{
+    /**
+     * Valid for Smarty and template object
+     *
+     * @var int
+     */
+    public $objMap = 3;
+
+    /**
+     * Valid filter types
+     *
+     * @var array
+     */
+    private $filterTypes = array('pre' => true, 'post' => true, 'output' => true, 'variable' => true);
+
+    /**
+     * Registers a filter function
+     *
+     * @api  Smarty::registerFilter()
+     *
+     * @link http://www.smarty.net/docs/en/api.register.filter.tpl
+     *
+     * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
+     * @param  string                                                         $type filter type
+     * @param  callback                                                       $callback
+     * @param  string|null                                                    $name optional filter name
+     *
+     * @return \Smarty|\Smarty_Internal_Template
+     * @throws \SmartyException
+     */
+    public function registerFilter(Smarty_Internal_TemplateBase $obj, $type, $callback, $name = null)
+    {
+        $smarty = isset($obj->smarty) ? $obj->smarty : $obj;
+        $this->_checkFilterType($type);
+        $name = isset($name) ? $name : $this->_getFilterName($callback);
+        if (!is_callable($callback)) {
+            throw new SmartyException("{$type}filter \"{$name}\" not callable");
+        }
+        $smarty->registered_filters[$type][$name] = $callback;
+        return $obj;
+    }
+
+    /**
+     * Return internal filter name
+     *
+     * @param  callback $function_name
+     *
+     * @return string   internal filter name
+     */
+    public function _getFilterName($function_name)
+    {
+        if (is_array($function_name)) {
+            $_class_name = (is_object($function_name[0]) ? get_class($function_name[0]) : $function_name[0]);
+
+            return $_class_name . '_' . $function_name[1];
+        } elseif (is_string($function_name)) {
+            return $function_name;
+        } else {
+            return 'closure';
+        }
+    }
+
+    /**
+     * Check if filter type is valid
+     *
+     * @param string $type
+     *
+     * @throws \SmartyException
+     */
+    public function _checkFilterType($type)
+    {
+        if (!isset($this->filterTypes[$type])) {
+            throw new SmartyException("Illegal filter type \"{$type}\"");
+        }
+    }
+}
\ No newline at end of file
diff --git a/include/smarty/libs/sysplugins/smarty_internal_method_registerobject.php b/include/smarty/libs/sysplugins/smarty_internal_method_registerobject.php
new file mode 100644
index 000000000..f27f1720b
--- /dev/null
+++ b/include/smarty/libs/sysplugins/smarty_internal_method_registerobject.php
@@ -0,0 +1,71 @@
+<?php
+
+/**
+ * Smarty Method RegisterObject
+ *
+ * Smarty::registerObject() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Method_RegisterObject
+{
+    /**
+     * Valid for Smarty and template object
+     *
+     * @var int
+     */
+    public $objMap = 3;
+
+    /**
+     * Registers object to be used in templates
+     *
+     * @api  Smarty::registerObject()
+     * @link http://www.smarty.net/docs/en/api.register.object.tpl
+     *
+     * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
+     * @param  string                                                         $object_name
+     * @param  object                                                         $object                     the
+     *                                                                                                    referenced
+     *                                                                                                    PHP object to
+     *                                                                                                    register
+     * @param  array                                                          $allowed_methods_properties list of
+     *                                                                                                    allowed
+     *                                                                                                    methods
+     *                                                                                                    (empty = all)
+     * @param  bool                                                           $format                     smarty
+     *                                                                                                    argument
+     *                                                                                                    format, else
+     *                                                                                                    traditional
+     * @param  array                                                          $block_methods              list of
+     *                                                                                                    block-methods
+     *
+     * @return \Smarty|\Smarty_Internal_Template
+     * @throws \SmartyException
+     */
+    public function registerObject(Smarty_Internal_TemplateBase $obj, $object_name, $object, $allowed_methods_properties = array(), $format = true, $block_methods = array())
+    {
+        $smarty = isset($obj->smarty) ? $obj->smarty : $obj;
+        // test if allowed methods callable
+        if (!empty($allowed_methods_properties)) {
+            foreach ((array) $allowed_methods_properties as $method) {
+                if (!is_callable(array($object, $method)) && !property_exists($object, $method)) {
+                    throw new SmartyException("Undefined method or property '$method' in registered object");
+                }
+            }
+        }
+        // test if block methods callable
+        if (!empty($block_methods)) {
+            foreach ((array) $block_methods as $method) {
+                if (!is_callable(array($object, $method))) {
+                    throw new SmartyException("Undefined method '$method' in registered object");
+                }
+            }
+        }
+        // register the object
+        $smarty->registered_objects[$object_name] = array($object, (array) $allowed_methods_properties,
+                                                          (boolean) $format, (array) $block_methods);
+        return $obj;
+    }
+}
\ No newline at end of file
diff --git a/include/smarty/libs/sysplugins/smarty_internal_method_registerplugin.php b/include/smarty/libs/sysplugins/smarty_internal_method_registerplugin.php
new file mode 100644
index 000000000..95814581d
--- /dev/null
+++ b/include/smarty/libs/sysplugins/smarty_internal_method_registerplugin.php
@@ -0,0 +1,50 @@
+<?php
+
+/**
+ * Smarty Method RegisterPlugin
+ *
+ * Smarty::registerPlugin() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Method_RegisterPlugin
+{
+    /**
+     * Valid for Smarty and template object
+     *
+     * @var int
+     */
+    public $objMap = 3;
+
+    /**
+     * Registers plugin to be used in templates
+     *
+     * @api  Smarty::registerPlugin()
+     * @link http://www.smarty.net/docs/en/api.register.plugin.tpl
+     *
+     * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
+     * @param  string                                                         $type       plugin type
+     * @param  string                                                         $name       name of template tag
+     * @param  callback                                                       $callback   PHP callback to register
+     * @param  bool                                                           $cacheable  if true (default) this
+     *                                                                                    function is cache able
+     * @param  mixed                                                          $cache_attr caching attributes if any
+     *
+     * @return \Smarty|\Smarty_Internal_Template
+     * @throws SmartyException              when the plugin tag is invalid
+     */
+    public function registerPlugin(Smarty_Internal_TemplateBase $obj, $type, $name, $callback, $cacheable = true, $cache_attr = null)
+    {
+        $smarty = isset($obj->smarty) ? $obj->smarty : $obj;
+        if (isset($smarty->registered_plugins[$type][$name])) {
+            throw new SmartyException("Plugin tag \"{$name}\" already registered");
+        } elseif (!is_callable($callback)) {
+            throw new SmartyException("Plugin \"{$name}\" not callable");
+        } else {
+            $smarty->registered_plugins[$type][$name] = array($callback, (bool) $cacheable, (array) $cache_attr);
+        }
+        return $obj;
+    }
+}
\ No newline at end of file
diff --git a/include/smarty/libs/sysplugins/smarty_internal_method_registerresource.php b/include/smarty/libs/sysplugins/smarty_internal_method_registerresource.php
new file mode 100644
index 000000000..43246ee9b
--- /dev/null
+++ b/include/smarty/libs/sysplugins/smarty_internal_method_registerresource.php
@@ -0,0 +1,44 @@
+<?php
+
+/**
+ * Smarty Method RegisterResource
+ *
+ * Smarty::registerResource() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Method_RegisterResource
+{
+    /**
+     * Valid for Smarty and template object
+     *
+     * @var int
+     */
+    public $objMap = 3;
+
+    /**
+     * Registers a resource to fetch a template
+     *
+     * @api  Smarty::registerResource()
+     * @link http://www.smarty.net/docs/en/api.register.resource.tpl
+     *
+     * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
+     * @param  string                                                         $name             name of resource type
+     * @param  Smarty_Resource|array                                          $resource_handler or instance of
+     *                                                                                          Smarty_Resource, or
+     *                                                                                          array of callbacks to
+     *                                                                                          handle resource
+     *                                                                                          (deprecated)
+     *
+     * @return \Smarty|\Smarty_Internal_Template
+     */
+    public function registerResource(Smarty_Internal_TemplateBase $obj, $name, $resource_handler)
+    {
+        $smarty = isset($obj->smarty) ? $obj->smarty : $obj;
+        $smarty->registered_resources[$name] = $resource_handler instanceof
+        Smarty_Resource ? $resource_handler : array($resource_handler, false);
+        return $obj;
+    }
+}
\ No newline at end of file
diff --git a/include/smarty/libs/sysplugins/smarty_internal_method_setautoloadfilters.php b/include/smarty/libs/sysplugins/smarty_internal_method_setautoloadfilters.php
new file mode 100644
index 000000000..b1f965cd9
--- /dev/null
+++ b/include/smarty/libs/sysplugins/smarty_internal_method_setautoloadfilters.php
@@ -0,0 +1,70 @@
+<?php
+
+/**
+ * Smarty Method SetAutoloadFilters
+ *
+ * Smarty::setAutoloadFilters() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Method_SetAutoloadFilters
+{
+    /**
+     * Valid for Smarty and template object
+     *
+     * @var int
+     */
+    public $objMap = 3;
+
+    /**
+     * Valid filter types
+     *
+     * @var array
+     */
+    private $filterTypes = array('pre' => true, 'post' => true, 'output' => true, 'variable' => true);
+
+    /**
+     * Set autoload filters
+     *
+     * @api Smarty::setAutoloadFilters()
+     *
+     * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
+     * @param  array                                                          $filters filters to load automatically
+     * @param  string                                                         $type    "pre", "output", … specify the
+     *                                                                                 filter type to set. Defaults to
+     *                                                                                 none treating $filters' keys as
+     *                                                                                 the appropriate types
+     *
+     * @return \Smarty|\Smarty_Internal_Template
+     */
+    public function setAutoloadFilters(Smarty_Internal_TemplateBase $obj, $filters, $type = null)
+    {
+        $smarty = isset($obj->smarty) ? $obj->smarty : $obj;
+        if ($type !== null) {
+            $this->_checkFilterType($type);
+            $smarty->autoload_filters[$type] = (array) $filters;
+        } else {
+            foreach ((array) $filters as $type => $value) {
+                $this->_checkFilterType($type);
+            }
+            $smarty->autoload_filters = (array) $filters;
+        }
+        return $obj;
+    }
+
+    /**
+     * Check if filter type is valid
+     *
+     * @param string $type
+     *
+     * @throws \SmartyException
+     */
+    public function _checkFilterType($type)
+    {
+        if (!isset($this->filterTypes[$type])) {
+            throw new SmartyException("Illegal filter type \"{$type}\"");
+        }
+    }
+}
\ No newline at end of file
diff --git a/include/smarty/libs/sysplugins/smarty_internal_method_setdebugtemplate.php b/include/smarty/libs/sysplugins/smarty_internal_method_setdebugtemplate.php
new file mode 100644
index 000000000..4ff5d7f82
--- /dev/null
+++ b/include/smarty/libs/sysplugins/smarty_internal_method_setdebugtemplate.php
@@ -0,0 +1,41 @@
+<?php
+
+/**
+ * Smarty Method SetDebugTemplate
+ *
+ * Smarty::setDebugTemplate() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Method_SetDebugTemplate
+{
+    /**
+     * Valid for Smarty and template object
+     *
+     * @var int
+     */
+    public $objMap = 3;
+
+    /**
+     * set the debug template
+     *
+     * @api Smarty::setDebugTemplate()
+     *
+     * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
+     * @param  string                                                         $tpl_name
+     *
+     * @return \Smarty|\Smarty_Internal_Template
+     * @throws SmartyException if file is not readable
+     */
+    public function setDebugTemplate(Smarty_Internal_TemplateBase $obj, $tpl_name)
+    {
+        $smarty = isset($obj->smarty) ? $obj->smarty : $obj;
+        if (!is_readable($tpl_name)) {
+            throw new SmartyException("Unknown file '{$tpl_name}'");
+        }
+        $smarty->debug_tpl = $tpl_name;
+        return $obj;
+    }
+}
\ No newline at end of file
diff --git a/include/smarty/libs/sysplugins/smarty_internal_method_setdefaultmodifiers.php b/include/smarty/libs/sysplugins/smarty_internal_method_setdefaultmodifiers.php
new file mode 100644
index 000000000..5a707287a
--- /dev/null
+++ b/include/smarty/libs/sysplugins/smarty_internal_method_setdefaultmodifiers.php
@@ -0,0 +1,38 @@
+<?php
+
+/**
+ * Smarty Method SetDefaultModifiers
+ *
+ * Smarty::setDefaultModifiers() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Method_SetDefaultModifiers
+{
+    /**
+     * Valid for Smarty and template object
+     *
+     * @var int
+     */
+    public $objMap = 3;
+
+    /**
+     * Set default modifiers
+     *
+     * @api Smarty::setDefaultModifiers()
+     *
+     * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
+     * @param  array|string                                                   $modifiers modifier or list of modifiers
+     *                                                                                   to set
+     *
+     * @return \Smarty|\Smarty_Internal_Template
+     */
+    public function setDefaultModifiers(Smarty_Internal_TemplateBase $obj, $modifiers)
+    {
+        $smarty = isset($obj->smarty) ? $obj->smarty : $obj;
+        $smarty->default_modifiers = (array) $modifiers;
+        return $obj;
+    }
+}
\ No newline at end of file
diff --git a/include/smarty/libs/sysplugins/smarty_internal_method_unloadfilter.php b/include/smarty/libs/sysplugins/smarty_internal_method_unloadfilter.php
new file mode 100644
index 000000000..e3d966e1c
--- /dev/null
+++ b/include/smarty/libs/sysplugins/smarty_internal_method_unloadfilter.php
@@ -0,0 +1,42 @@
+<?php
+
+/**
+ * Smarty Method UnloadFilter
+ *
+ * Smarty::unloadFilter() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Method_UnloadFilter extends Smarty_Internal_Method_LoadFilter
+{
+    /**
+     * load a filter of specified type and name
+     *
+     * @api  Smarty::unloadFilter()
+     *
+     * @link http://www.smarty.net/docs/en/api.unload.filter.tpl
+     *
+     * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
+     * @param  string                                                         $type filter type
+     * @param  string                                                         $name filter name
+     *
+     * @return bool
+     */
+    public function unloadFilter(Smarty_Internal_TemplateBase $obj, $type, $name)
+    {
+        $smarty = isset($obj->smarty) ? $obj->smarty : $obj;
+        $this->_checkFilterType($type);
+        if (isset($smarty->registered_filters[$type])) {
+            $_filter_name = "smarty_{$type}filter_{$name}";
+            if (isset($smarty->registered_filters[$type][$_filter_name])) {
+                unset ($smarty->registered_filters[$type][$_filter_name]);
+                if (empty($smarty->registered_filters[$type])) {
+                    unset($smarty->registered_filters[$type]);
+                }
+            }
+        }
+        return $obj;
+    }
+}
\ No newline at end of file
diff --git a/include/smarty/libs/sysplugins/smarty_internal_method_unregistercacheresource.php b/include/smarty/libs/sysplugins/smarty_internal_method_unregistercacheresource.php
new file mode 100644
index 000000000..80381015a
--- /dev/null
+++ b/include/smarty/libs/sysplugins/smarty_internal_method_unregistercacheresource.php
@@ -0,0 +1,40 @@
+<?php
+
+/**
+ * Smarty Method UnregisterCacheResource
+ *
+ * Smarty::unregisterCacheResource() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Method_UnregisterCacheResource
+{
+    /**
+     * Valid for Smarty and template object
+     *
+     * @var int
+     */
+    public $objMap = 3;
+
+    /**
+     * Registers a resource to fetch a template
+     *
+     * @api  Smarty::unregisterCacheResource()
+     * @link http://www.smarty.net/docs/en/api.unregister.cacheresource.tpl
+     *
+     * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
+     * @param  string                                                         $type     name of cache resource type
+      *
+     * @return \Smarty|\Smarty_Internal_Template
+     */
+    public function unregisterCacheResource(Smarty_Internal_TemplateBase $obj, $name)
+    {
+        $smarty = isset($obj->smarty) ? $obj->smarty : $obj;
+        if (isset($smarty->registered_cache_resources[$name])) {
+            unset($smarty->registered_cache_resources[$name]);
+        }
+        return $obj;
+    }
+}
\ No newline at end of file
diff --git a/include/smarty/libs/sysplugins/smarty_internal_method_unregisterfilter.php b/include/smarty/libs/sysplugins/smarty_internal_method_unregisterfilter.php
new file mode 100644
index 000000000..c80ae9a65
--- /dev/null
+++ b/include/smarty/libs/sysplugins/smarty_internal_method_unregisterfilter.php
@@ -0,0 +1,42 @@
+<?php
+
+/**
+ * Smarty Method UnregisterFilter
+ *
+ * Smarty::unregisterFilter() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Method_UnregisterFilter extends Smarty_Internal_Method_RegisterFilter
+{
+    /**
+     * Unregisters a filter function
+     *
+     * @api  Smarty::unregisterFilter()
+     *
+     * @link http://www.smarty.net/docs/en/api.unregister.filter.tpl
+     *
+     * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
+     * @param  string                                                         $type filter type
+     * @param  callback|string                                                $callback
+     *
+     * @return \Smarty|\Smarty_Internal_Template
+     */
+    public function unregisterFilter(Smarty_Internal_TemplateBase $obj, $type, $callback)
+    {
+        $smarty = isset($obj->smarty) ? $obj->smarty : $obj;
+        $this->_checkFilterType($type);
+        if (isset($smarty->registered_filters[$type])) {
+            $name = is_string($callback) ? $callback : $this->_getFilterName($callback);
+            if (isset($smarty->registered_filters[$type][$name])) {
+                unset($smarty->registered_filters[$type][$name]);
+                if (empty($smarty->registered_filters[$type])) {
+                    unset($smarty->registered_filters[$type]);
+                }
+            }
+        }
+        return $obj;
+    }
+}
\ No newline at end of file
diff --git a/include/smarty/libs/sysplugins/smarty_internal_method_unregisterobject.php b/include/smarty/libs/sysplugins/smarty_internal_method_unregisterobject.php
new file mode 100644
index 000000000..a94331683
--- /dev/null
+++ b/include/smarty/libs/sysplugins/smarty_internal_method_unregisterobject.php
@@ -0,0 +1,40 @@
+<?php
+
+/**
+ * Smarty Method UnregisterObject
+ *
+ * Smarty::unregisterObject() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Method_UnregisterObject
+{
+    /**
+     * Valid for Smarty and template object
+     *
+     * @var int
+     */
+    public $objMap = 3;
+
+    /**
+     * Registers plugin to be used in templates
+     *
+     * @api  Smarty::unregisterObject()
+     * @link http://www.smarty.net/docs/en/api.unregister.object.tpl
+     *
+     * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
+     * @param  string                                                         $object_name name of object
+     *
+     * @return \Smarty|\Smarty_Internal_Template
+     */
+    public function unregisterObject(Smarty_Internal_TemplateBase $obj, $object_name)
+    {
+        $smarty = isset($obj->smarty) ? $obj->smarty : $obj;
+        if (isset($smarty->registered_objects[$object_name])) {
+            unset($smarty->registered_objects[$object_name]);
+        }
+        return $obj;
+    }
+}
\ No newline at end of file
diff --git a/include/smarty/libs/sysplugins/smarty_internal_method_unregisterplugin.php b/include/smarty/libs/sysplugins/smarty_internal_method_unregisterplugin.php
new file mode 100644
index 000000000..06cb2d354
--- /dev/null
+++ b/include/smarty/libs/sysplugins/smarty_internal_method_unregisterplugin.php
@@ -0,0 +1,41 @@
+<?php
+
+/**
+ * Smarty Method UnregisterPlugin
+ *
+ * Smarty::unregisterPlugin() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Method_UnregisterPlugin
+{
+    /**
+     * Valid for Smarty and template object
+     *
+     * @var int
+     */
+    public $objMap = 3;
+
+    /**
+     * Registers plugin to be used in templates
+     *
+     * @api  Smarty::unregisterPlugin()
+     * @link http://www.smarty.net/docs/en/api.unregister.plugin.tpl
+     *
+     * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
+     * @param  string                                                         $type       plugin type
+     * @param  string                                                         $name       name of template tag
+     *
+     * @return \Smarty|\Smarty_Internal_Template
+      */
+    public function unregisterPlugin(Smarty_Internal_TemplateBase $obj, $type, $name)
+    {
+        $smarty = isset($obj->smarty) ? $obj->smarty : $obj;
+        if (isset($smarty->registered_plugins[$type][$name])) {
+            unset($smarty->registered_plugins[$type][$name]);
+        }
+        return $obj;
+    }
+}
\ No newline at end of file
diff --git a/include/smarty/libs/sysplugins/smarty_internal_method_unregisterresource.php b/include/smarty/libs/sysplugins/smarty_internal_method_unregisterresource.php
new file mode 100644
index 000000000..767bd74ab
--- /dev/null
+++ b/include/smarty/libs/sysplugins/smarty_internal_method_unregisterresource.php
@@ -0,0 +1,40 @@
+<?php
+
+/**
+ * Smarty Method UnregisterResource
+ *
+ * Smarty::unregisterResource() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Method_UnregisterResource
+{
+    /**
+     * Valid for Smarty and template object
+     *
+     * @var int
+     */
+    public $objMap = 3;
+
+    /**
+     * Registers a resource to fetch a template
+     *
+     * @api  Smarty::unregisterResource()
+     * @link http://www.smarty.net/docs/en/api.unregister.resource.tpl
+     *
+     * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
+     * @param  string                                                         $type     name of resource type
+      *
+     * @return \Smarty|\Smarty_Internal_Template
+     */
+    public function unregisterResource(Smarty_Internal_TemplateBase $obj, $type)
+    {
+        $smarty = isset($obj->smarty) ? $obj->smarty : $obj;
+        if (isset($smarty->registered_resources[$type])) {
+            unset($smarty->registered_resources[$type]);
+        }
+        return $obj;
+    }
+}
\ No newline at end of file
diff --git a/include/smarty/libs/sysplugins/smarty_internal_nocache_insert.php b/include/smarty/libs/sysplugins/smarty_internal_nocache_insert.php
index 64a2b1e1b..b3d5fa86a 100644
--- a/include/smarty/libs/sysplugins/smarty_internal_nocache_insert.php
+++ b/include/smarty/libs/sysplugins/smarty_internal_nocache_insert.php
@@ -1,31 +1,31 @@
 <?php
 /**
  * Smarty Internal Plugin Nocache Insert
- *
  * Compiles the {insert} tag into the cache file
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage Compiler
- * @author Uwe Tews
+ * @author     Uwe Tews
  */
 
 /**
  * Smarty Internal Plugin Compile Insert Class
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage Compiler
  */
-class Smarty_Internal_Nocache_Insert {
-
+class Smarty_Internal_Nocache_Insert
+{
     /**
      * Compiles code for the {insert} tag into cache file
      *
-     * @param string                   $_function insert function name
-     * @param array                    $_attr     array with parameter
-     * @param Smarty_Internal_Template $_template template object
-     * @param string                   $_script   script name to load or 'null'
-     * @param string                   $_assign   optional variable name
-     * @return string compiled code
+     * @param  string                   $_function insert function name
+     * @param  array                    $_attr     array with parameter
+     * @param  Smarty_Internal_Template $_template template object
+     * @param  string                   $_script   script name to load or 'null'
+     * @param  string                   $_assign   optional variable name
+     *
+     * @return string                   compiled code
      */
     public static function compile($_function, $_attr, $_template, $_script, $_assign = null)
     {
@@ -42,12 +42,10 @@ class Smarty_Internal_Nocache_Insert {
             $_output .= "echo {$_function}(" . var_export($_attr, true) . ",\$_smarty_tpl);?>";
         }
         $_tpl = $_template;
-        while ($_tpl->parent instanceof Smarty_Internal_Template) {
+        while (isset($_tpl->parent) && $_tpl->parent->_objType == 2) {
             $_tpl = $_tpl->parent;
         }
-        return "/*%%SmartyNocache:{$_tpl->properties['nocache_hash']}%%*/" . $_output . "/*/%%SmartyNocache:{$_tpl->properties['nocache_hash']}%%*/";
-    }
 
+        return "/*%%SmartyNocache:{$_tpl->compiled->nocache_hash}%%*/" . $_output . "/*/%%SmartyNocache:{$_tpl->compiled->nocache_hash}%%*/";
+    }
 }
-
-?>
diff --git a/include/smarty/libs/sysplugins/smarty_internal_parsetree.php b/include/smarty/libs/sysplugins/smarty_internal_parsetree.php
index 99f4c6566..32c9df094 100644
--- a/include/smarty/libs/sysplugins/smarty_internal_parsetree.php
+++ b/include/smarty/libs/sysplugins/smarty_internal_parsetree.php
@@ -1,395 +1,54 @@
 <?php
 /**
  * Smarty Internal Plugin Templateparser Parsetrees
- *
  * These are classes to build parsetrees in the template parser
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage Compiler
- * @author Thue Kristensen
- * @author Uwe Tews
+ * @author     Thue Kristensen
+ * @author     Uwe Tews
  */
 
 /**
- * @package Smarty
+ * @package    Smarty
  * @subpackage Compiler
  * @ignore
  */
-abstract class _smarty_parsetree {
+abstract class Smarty_Internal_ParseTree
+{
 
     /**
-     * Parser object
-     * @var object
-     */
-    public $parser;
-    /**
      * Buffer content
+     *
      * @var mixed
      */
     public $data;
 
     /**
-     * Return buffer
-     *
-     * @return string  buffer content
-     */
-    abstract public function to_smarty_php();
-
-}
-
-/**
- * A complete smarty tag.
- *
- * @package Smarty
- * @subpackage Compiler
- * @ignore
- */
-class _smarty_tag extends _smarty_parsetree {
-
-    /**
-     * Saved block nesting level
-     * @var int
-     */
-    public $saved_block_nesting;
-
-    /**
-     * Create parse tree buffer for Smarty tag
-     *
-     * @param object $parser    parser object
-     * @param string $data      content
-     */
-    public function __construct($parser, $data)
-    {
-        $this->parser = $parser;
-        $this->data = $data;
-        $this->saved_block_nesting = $parser->block_nesting_level;
-    }
-
-    /**
-     * Return buffer content
-     *
-     * @return string  content
-     */
-    public function to_smarty_php()
-    {
-        return $this->data;
-    }
-
-    /**
-     * Return complied code that loads the evaluated outout of buffer content into a temporary variable
-     *
-     * @return string template code
-     */
-    public function assign_to_var()
-    {
-        $var = sprintf('$_tmp%d', ++$this->parser->prefix_number);
-        $this->parser->compiler->prefix_code[] = sprintf('<?php ob_start();?>%s<?php %s=ob_get_clean();?>', $this->data, $var);
-        return $var;
-    }
-
-}
-
-/**
- * Code fragment inside a tag.
- *
- * @package Smarty
- * @subpackage Compiler
- * @ignore
- */
-class _smarty_code extends _smarty_parsetree {
-
-
-    /**
-     * Create parse tree buffer for code fragment
-     *
-     * @param object $parser    parser object
-     * @param string $data      content
-     */
-    public function __construct($parser, $data)
-    {
-        $this->parser = $parser;
-        $this->data = $data;
-    }
-
-    /**
-     * Return buffer content in parentheses
-     *
-     * @return string  content
-     */
-    public function to_smarty_php()
-    {
-        return sprintf("(%s)", $this->data);
-    }
-
-}
-
-/**
- * Double quoted string inside a tag.
- *
- * @package Smarty
- * @subpackage Compiler
- * @ignore
- */
-class _smarty_doublequoted extends _smarty_parsetree {
-
-    /**
-     * Create parse tree buffer for double quoted string subtrees
-     *
-     * @param object $parser    parser object
-     * @param _smarty_parsetree $subtree    parsetree buffer
-     */
-    public function __construct($parser, _smarty_parsetree $subtree)
-    {
-        $this->parser = $parser;
-        $this->subtrees[] = $subtree;
-        if ($subtree instanceof _smarty_tag) {
-            $this->parser->block_nesting_level = count($this->parser->compiler->_tag_stack);
-        }
-    }
-
-    /**
-     * Append buffer to subtree
-     *
-     * @param _smarty_parsetree $subtree  parsetree buffer
-     */
-    public function append_subtree(_smarty_parsetree $subtree)
-    {
-        $last_subtree = count($this->subtrees) - 1;
-        if ($last_subtree >= 0 && $this->subtrees[$last_subtree] instanceof _smarty_tag && $this->subtrees[$last_subtree]->saved_block_nesting < $this->parser->block_nesting_level) {
-            if ($subtree instanceof _smarty_code) {
-                $this->subtrees[$last_subtree]->data .= '<?php echo ' . $subtree->data . ';?>';
-            } elseif ($subtree instanceof _smarty_dq_content) {
-                $this->subtrees[$last_subtree]->data .= '<?php echo "' . $subtree->data . '";?>';
-            } else {
-                $this->subtrees[$last_subtree]->data .= $subtree->data;
-            }
-        } else {
-            $this->subtrees[] = $subtree;
-        }
-        if ($subtree instanceof _smarty_tag) {
-            $this->parser->block_nesting_level = count($this->parser->compiler->_tag_stack);
-        }
-    }
-
-    /**
-     * Merge subtree buffer content together
-     *
-     * @return string  compiled template code
-     */
-    public function to_smarty_php()
-    {
-        $code = '';
-        foreach ($this->subtrees as $subtree) {
-            if ($code !== "") {
-                $code .= ".";
-            }
-            if ($subtree instanceof _smarty_tag) {
-                $more_php = $subtree->assign_to_var();
-            } else {
-                $more_php = $subtree->to_smarty_php();
-            }
-
-            $code .= $more_php;
-
-            if (!$subtree instanceof _smarty_dq_content) {
-                $this->parser->compiler->has_variable_string = true;
-            }
-        }
-        return $code;
-    }
-
-}
-
-/**
- * Raw chars as part of a double quoted string.
- *
- * @package Smarty
- * @subpackage Compiler
- * @ignore
- */
-class _smarty_dq_content extends _smarty_parsetree {
-
-
-    /**
-     * Create parse tree buffer with string content
-     *
-     * @param object $parser  parser object
-     * @param string $data    string section
-     */
-    public function __construct($parser, $data)
-    {
-        $this->parser = $parser;
-        $this->data = $data;
-    }
-
-    /**
-     * Return content as double quoted string
-     *
-     * @return string doubled quoted string
-     */
-    public function to_smarty_php()
-    {
-        return '"' . $this->data . '"';
-    }
-
-}
-
-/**
- * Template element
- *
- * @package Smarty
- * @subpackage Compiler
- * @ignore
- */
-class _smarty_template_buffer extends _smarty_parsetree {
-
-    /**
-     * Array of template elements
+     * Subtree array
      *
      * @var array
      */
-    public $subtrees = Array();
-
-    /**
-     * Create root of parse tree for template elements
-     *
-     * @param object $parser    parse object
-     */
-    public function __construct($parser)
-    {
-        $this->parser = $parser;
-    }
-
-    /**
-     * Append buffer to subtree
-     *
-     * @param _smarty_parsetree $subtree
-     */
-    public function append_subtree(_smarty_parsetree $subtree)
-    {
-        $this->subtrees[] = $subtree;
-    }
+    public $subtrees = array();
 
     /**
-     * Sanitize and merge subtree buffers together
+     * Return buffer
      *
-     * @return string template code content
-     */
-    public function to_smarty_php()
-    {
-        $code = '';
-        for ($key = 0, $cnt = count($this->subtrees); $key < $cnt; $key++) {
-            if ($key + 2 < $cnt) {
-                if ($this->subtrees[$key] instanceof _smarty_linebreak && $this->subtrees[$key + 1] instanceof _smarty_tag && $this->subtrees[$key + 1]->data == '' && $this->subtrees[$key + 2] instanceof _smarty_linebreak) {
-                    $key = $key + 1;
-                    continue;
-                }
-                if (substr($this->subtrees[$key]->data, -1) == '<' && $this->subtrees[$key + 1]->data == '' && substr($this->subtrees[$key + 2]->data, -1) == '?') {
-                    $key = $key + 2;
-                    continue;
-                }
-            }
-            if (substr($code, -1) == '<') {
-                $subtree = $this->subtrees[$key]->to_smarty_php();
-                if (substr($subtree, 0, 1) == '?') {
-                    $code = substr($code, 0, strlen($code) - 1) . '<<?php ?>?' . substr($subtree, 1);
-                } elseif ($this->parser->asp_tags && substr($subtree, 0, 1) == '%') {
-                    $code = substr($code, 0, strlen($code) - 1) . '<<?php ?>%' . substr($subtree, 1);
-                } else {
-                    $code .= $subtree;
-                }
-                continue;
-            }
-            if ($this->parser->asp_tags && substr($code, -1) == '%') {
-                $subtree = $this->subtrees[$key]->to_smarty_php();
-                if (substr($subtree, 0, 1) == '>') {
-                    $code = substr($code, 0, strlen($code) - 1) . '%<?php ?>>' . substr($subtree, 1);
-                } else {
-                    $code .= $subtree;
-                }
-                continue;
-            }
-            if (substr($code, -1) == '?') {
-                $subtree = $this->subtrees[$key]->to_smarty_php();
-                if (substr($subtree, 0, 1) == '>') {
-                    $code = substr($code, 0, strlen($code) - 1) . '?<?php ?>>' . substr($subtree, 1);
-                } else {
-                    $code .= $subtree;
-                }
-                continue;
-            }
-            $code .= $this->subtrees[$key]->to_smarty_php();
-        }
-        return $code;
-    }
-
-}
-
-/**
- * template text
- *
- * @package Smarty
- * @subpackage Compiler
- * @ignore
- */
-class _smarty_text extends _smarty_parsetree {
-
-
-    /**
-     * Create template text buffer
+     * @param \Smarty_Internal_Templateparser $parser
      *
-     * @param object $parser    parser object
-     * @param string $data      text
+     * @return string buffer content
      */
-    public function __construct($parser, $data)
-    {
-        $this->parser = $parser;
-        $this->data = $data;
-    }
+    abstract public function to_smarty_php(Smarty_Internal_Templateparser $parser);
 
     /**
-     * Return buffer content
-     *
-     * @return strint text
+     * Template data object destructor
      */
-    public function to_smarty_php()
+    public function __destruct()
     {
-        return $this->data;
+        $this->data = null;
+        $this->subtrees = null;
     }
 
 }
 
-/**
- * template linebreaks
- *
- * @package Smarty
- * @subpackage Compiler
- * @ignore
- */
-class _smarty_linebreak extends _smarty_parsetree {
-
-    /**
-     * Create buffer with linebreak content
-     *
-     * @param object $parser    parser object
-     * @param string  $data     linebreak string
-     */
-    public function __construct($parser, $data)
-    {
-        $this->parser = $parser;
-        $this->data = $data;
-    }
-
-    /**
-     * Return linebrak
-     *
-     * @return string linebreak
-     */
-    public function to_smarty_php()
-    {
-        return $this->data;
-    }
-
-}
 
-?>
\ No newline at end of file
diff --git a/include/smarty/libs/sysplugins/smarty_internal_parsetree_code.php b/include/smarty/libs/sysplugins/smarty_internal_parsetree_code.php
new file mode 100644
index 000000000..d0f0b3fd9
--- /dev/null
+++ b/include/smarty/libs/sysplugins/smarty_internal_parsetree_code.php
@@ -0,0 +1,42 @@
+<?php
+/**
+ * Smarty Internal Plugin Templateparser Parse Tree
+ * These are classes to build parse trees in the template parser
+ *
+ * @package    Smarty
+ * @subpackage Compiler
+ * @author     Thue Kristensen
+ * @author     Uwe Tews
+ */
+
+/**
+ * Code fragment inside a tag .
+ *
+ * @package    Smarty
+ * @subpackage Compiler
+ * @ignore
+ */
+class Smarty_Internal_ParseTree_Code extends Smarty_Internal_ParseTree
+{
+    /**
+     * Create parse tree buffer for code fragment
+     *
+     * @param string $data content
+     */
+    public function __construct($data)
+    {
+        $this->data = $data;
+    }
+
+    /**
+     * Return buffer content in parentheses
+     *
+     * @param \Smarty_Internal_Templateparser $parser
+     *
+     * @return string content
+     */
+    public function to_smarty_php(Smarty_Internal_Templateparser $parser)
+    {
+        return sprintf("(%s)", $this->data);
+    }
+}
diff --git a/include/smarty/libs/sysplugins/smarty_internal_parsetree_dq.php b/include/smarty/libs/sysplugins/smarty_internal_parsetree_dq.php
new file mode 100644
index 000000000..607389cb5
--- /dev/null
+++ b/include/smarty/libs/sysplugins/smarty_internal_parsetree_dq.php
@@ -0,0 +1,88 @@
+<?php
+
+/**
+ * Double quoted string inside a tag.
+ *
+ * @package    Smarty
+ * @subpackage Compiler
+ * @ignore
+ */
+
+/**
+ * Double quoted string inside a tag.
+ *
+ * @package    Smarty
+ * @subpackage Compiler
+ * @ignore
+ */
+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 parse tree buffer
+     */
+    public function __construct($parser, Smarty_Internal_ParseTree $subtree)
+    {
+        $this->subtrees[] = $subtree;
+        if ($subtree instanceof Smarty_Internal_ParseTree_Tag) {
+            $parser->block_nesting_level = count($parser->compiler->_tag_stack);
+        }
+    }
+
+    /**
+     * Append buffer to subtree
+     *
+     * @param \Smarty_Internal_Templateparser $parser
+     * @param Smarty_Internal_ParseTree       $subtree parse tree buffer
+     */
+    public function append_subtree(Smarty_Internal_Templateparser $parser, 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 < $parser->block_nesting_level) {
+            if ($subtree instanceof Smarty_Internal_ParseTree_Code) {
+                $this->subtrees[$last_subtree]->data = $parser->compiler->appendCode($this->subtrees[$last_subtree]->data, '<?php echo ' . $subtree->data . ';?>');
+            } elseif ($subtree instanceof Smarty_Internal_ParseTree_DqContent) {
+                $this->subtrees[$last_subtree]->data = $parser->compiler->appendCode($this->subtrees[$last_subtree]->data, '<?php echo "' . $subtree->data . '";?>');
+            } else {
+                $this->subtrees[$last_subtree]->data = $parser->compiler->appendCode($this->subtrees[$last_subtree]->data, $subtree->data);
+            }
+        } else {
+            $this->subtrees[] = $subtree;
+        }
+        if ($subtree instanceof Smarty_Internal_ParseTree_Tag) {
+            $parser->block_nesting_level = count($parser->compiler->_tag_stack);
+        }
+    }
+
+    /**
+     * Merge subtree buffer content together
+     *
+     * @param \Smarty_Internal_Templateparser $parser
+     *
+     * @return string compiled template code
+     */
+    public function to_smarty_php(Smarty_Internal_Templateparser $parser)
+    {
+        $code = '';
+        foreach ($this->subtrees as $subtree) {
+            if ($code !== "") {
+                $code .= ".";
+            }
+            if ($subtree instanceof Smarty_Internal_ParseTree_Tag) {
+                $more_php = $subtree->assign_to_var($parser);
+            } else {
+                $more_php = $subtree->to_smarty_php($parser);
+            }
+
+            $code .= $more_php;
+
+            if (!$subtree instanceof Smarty_Internal_ParseTree_DqContent) {
+                $parser->compiler->has_variable_string = true;
+            }
+        }
+
+        return $code;
+    }
+}
diff --git a/include/smarty/libs/sysplugins/smarty_internal_parsetree_dqcontent.php b/include/smarty/libs/sysplugins/smarty_internal_parsetree_dqcontent.php
new file mode 100644
index 000000000..a8ca389d9
--- /dev/null
+++ b/include/smarty/libs/sysplugins/smarty_internal_parsetree_dqcontent.php
@@ -0,0 +1,42 @@
+<?php
+/**
+ * Smarty Internal Plugin Templateparser Parse Tree
+ * These are classes to build parse tree  in the template parser
+ *
+ * @package    Smarty
+ * @subpackage Compiler
+ * @author     Thue Kristensen
+ * @author     Uwe Tews
+ */
+
+/**
+ * Raw chars as part of a double quoted string.
+ *
+ * @package    Smarty
+ * @subpackage Compiler
+ * @ignore
+ */
+class Smarty_Internal_ParseTree_DqContent extends Smarty_Internal_ParseTree
+{
+    /**
+     * Create parse tree buffer with string content
+     *
+     * @param string $data string section
+     */
+    public function __construct($data)
+    {
+        $this->data = $data;
+    }
+
+    /**
+     * Return content as double quoted string
+     *
+     * @param \Smarty_Internal_Templateparser $parser
+     *
+     * @return string doubled quoted string
+     */
+    public function to_smarty_php(Smarty_Internal_Templateparser $parser)
+    {
+        return '"' . $this->data . '"';
+    }
+}
diff --git a/include/smarty/libs/sysplugins/smarty_internal_parsetree_tag.php b/include/smarty/libs/sysplugins/smarty_internal_parsetree_tag.php
new file mode 100644
index 000000000..575c8c9e8
--- /dev/null
+++ b/include/smarty/libs/sysplugins/smarty_internal_parsetree_tag.php
@@ -0,0 +1,69 @@
+<?php
+/**
+ * Smarty Internal Plugin Templateparser Parse Tree
+ * These are classes to build parse tree in the template parser
+ *
+ * @package    Smarty
+ * @subpackage Compiler
+ * @author     Thue Kristensen
+ * @author     Uwe Tews
+ */
+
+/**
+ * A complete smarty tag.
+ *
+ * @package    Smarty
+ * @subpackage Compiler
+ * @ignore
+ */
+class Smarty_Internal_ParseTree_Tag extends Smarty_Internal_ParseTree
+{
+
+    /**
+     * Saved block nesting level
+     *
+     * @var int
+     */
+    public $saved_block_nesting;
+
+    /**
+     * Create parse tree buffer for Smarty tag
+     *
+     * @param \Smarty_Internal_Templateparser $parser parser object
+     * @param string                          $data   content
+     */
+    public function __construct(Smarty_Internal_Templateparser $parser, $data)
+    {
+        $this->data = $data;
+        $this->saved_block_nesting = $parser->block_nesting_level;
+    }
+
+    /**
+     * Return buffer content
+     *
+     * @param \Smarty_Internal_Templateparser $parser
+     *
+     * @return string content
+     */
+    public function to_smarty_php(Smarty_Internal_Templateparser $parser)
+    {
+        return $this->data;
+    }
+
+    /**
+     * Return complied code that loads the evaluated output of buffer content into a temporary variable
+     *
+     * @param \Smarty_Internal_Templateparser $parser
+     *
+     * @return string template code
+     */
+    public function assign_to_var(Smarty_Internal_Templateparser $parser)
+    {
+        $var = sprintf('$_tmp%d', ++ Smarty_Internal_Templateparser::$prefix_number);
+        $tmp = $parser->compiler->appendCode('<?php ob_start();?>', $this->data);
+        $tmp = $parser->compiler->appendCode($tmp, "<?php {$var}=ob_get_clean();?>");
+        $parser->compiler->prefix_code[] = sprintf("%s", $tmp);
+
+        return $var;
+    }
+}
diff --git a/include/smarty/libs/sysplugins/smarty_internal_parsetree_template.php b/include/smarty/libs/sysplugins/smarty_internal_parsetree_template.php
new file mode 100644
index 000000000..623ae51a3
--- /dev/null
+++ b/include/smarty/libs/sysplugins/smarty_internal_parsetree_template.php
@@ -0,0 +1,128 @@
+<?php
+/**
+ * Smarty Internal Plugin Templateparser Parse Tree
+ * These are classes to build parse tree in the template parser
+ *
+ * @package    Smarty
+ * @subpackage Compiler
+ * @author     Thue Kristensen
+ * @author     Uwe Tews
+ */
+
+/**
+ * Template element
+ *
+ * @package    Smarty
+ * @subpackage Compiler
+ * @ignore
+ */
+class Smarty_Internal_ParseTree_Template extends Smarty_Internal_ParseTree
+{
+
+    /**
+     * Array of template elements
+     *
+     * @var array
+     */
+    public $subtrees = Array();
+
+    /**
+     * Create root of parse tree for template elements
+     *
+     */
+    public function __construct()
+    {
+    }
+
+    /**
+     * Append buffer to subtree
+     *
+     * @param \Smarty_Internal_Templateparser $parser
+     * @param Smarty_Internal_ParseTree       $subtree
+     */
+    public function append_subtree(Smarty_Internal_Templateparser $parser, Smarty_Internal_ParseTree $subtree)
+    {
+        if (!empty($subtree->subtrees)) {
+            $this->subtrees = array_merge($this->subtrees, $subtree->subtrees);
+        } else {
+            if ($subtree->data !== '') {
+                $this->subtrees[] = $subtree;
+            }
+        }
+    }
+
+    /**
+     * Append array to subtree
+     *
+     * @param \Smarty_Internal_Templateparser $parser
+     * @param \Smarty_Internal_ParseTree[]    $array
+     */
+    public function append_array(Smarty_Internal_Templateparser $parser, $array = array())
+    {
+        if (!empty($array)) {
+            $this->subtrees = array_merge($this->subtrees, (array) $array);
+        }
+    }
+
+    /**
+     * Prepend array to subtree
+     *
+     * @param \Smarty_Internal_Templateparser $parser
+     * @param \Smarty_Internal_ParseTree[]    $array
+     */
+    public function prepend_array(Smarty_Internal_Templateparser $parser, $array = array())
+    {
+        if (!empty($array)) {
+            $this->subtrees = array_merge((array) $array, $this->subtrees);
+        }
+    }
+
+    /**
+     * Sanitize and merge subtree buffers together
+     *
+     * @param \Smarty_Internal_Templateparser $parser
+     *
+     * @return string template code content
+     */
+    public function to_smarty_php(Smarty_Internal_Templateparser $parser)
+    {
+        $code = '';
+        for ($key = 0, $cnt = count($this->subtrees); $key < $cnt; $key ++) {
+            if ($this->subtrees[$key] instanceof Smarty_Internal_ParseTree_Text) {
+                $subtree = $this->subtrees[$key]->to_smarty_php($parser);
+                while ($key + 1 < $cnt && ($this->subtrees[$key + 1] instanceof Smarty_Internal_ParseTree_Text ||
+                        $this->subtrees[$key + 1]->data == '')) {
+                    $key ++;
+                    if ($this->subtrees[$key]->data == '') {
+                        continue;
+                    }
+                    $subtree .= $this->subtrees[$key]->to_smarty_php($parser);
+                }
+                if ($subtree == '') {
+                    continue;
+                }
+                $code .= preg_replace('/((<%)|(%>)|(<\?php)|(<\?)|(\?>)|(<\/?script))/', "<?php echo '\$1'; ?>\n",
+                                      $subtree);
+                continue;
+            }
+            if ($this->subtrees[$key] instanceof Smarty_Internal_ParseTree_Tag) {
+                $subtree = $this->subtrees[$key]->to_smarty_php($parser);
+                while ($key + 1 < $cnt && ($this->subtrees[$key + 1] instanceof Smarty_Internal_ParseTree_Tag ||
+                        $this->subtrees[$key + 1]->data == '')) {
+                    $key ++;
+                    if ($this->subtrees[$key]->data == '') {
+                        continue;
+                    }
+                    $subtree = $parser->compiler->appendCode($subtree, $this->subtrees[$key]->to_smarty_php($parser));
+                }
+                if ($subtree == '') {
+                    continue;
+                }
+                $code .= $subtree;
+                continue;
+            }
+            $code .= $this->subtrees[$key]->to_smarty_php($parser);
+        }
+        return $code;
+    }
+}
diff --git a/include/smarty/libs/sysplugins/smarty_internal_parsetree_text.php b/include/smarty/libs/sysplugins/smarty_internal_parsetree_text.php
new file mode 100644
index 000000000..b3100fa09
--- /dev/null
+++ b/include/smarty/libs/sysplugins/smarty_internal_parsetree_text.php
@@ -0,0 +1,40 @@
+<?php
+
+/**
+ * Smarty Internal Plugin Templateparser Parse Tree
+ * These are classes to build parse tree in the template parser
+ *
+ * @package    Smarty
+ * @subpackage Compiler
+ * @author     Thue Kristensen
+ * @author     Uwe Tews
+ *             *
+ *             template text
+ * @package    Smarty
+ * @subpackage Compiler
+ * @ignore
+ */
+class Smarty_Internal_ParseTree_Text extends Smarty_Internal_ParseTree
+{
+    /**
+     * Create template text buffer
+     *
+     * @param string $data text
+     */
+    public function __construct($data)
+    {
+        $this->data = $data;
+    }
+
+    /**
+     * Return buffer content
+     *
+     * @param \Smarty_Internal_Templateparser $parser
+     *
+     * @return string text
+     */
+    public function to_smarty_php(Smarty_Internal_Templateparser $parser)
+    {
+        return $this->data;
+    }
+}
diff --git a/include/smarty/libs/sysplugins/smarty_internal_resource_eval.php b/include/smarty/libs/sysplugins/smarty_internal_resource_eval.php
index c025dc26d..aca710350 100644
--- a/include/smarty/libs/sysplugins/smarty_internal_resource_eval.php
+++ b/include/smarty/libs/sysplugins/smarty_internal_resource_eval.php
@@ -2,32 +2,31 @@
 /**
  * Smarty Internal Plugin Resource Eval
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage TemplateResources
- * @author Uwe Tews
- * @author Rodney Rehm
+ * @author     Uwe Tews
+ * @author     Rodney Rehm
  */
 
 /**
  * Smarty Internal Plugin Resource Eval
- *
  * Implements the strings as resource for Smarty template
- *
  * {@internal unlike string-resources the compiled state of eval-resources is NOT saved for subsequent access}}
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage TemplateResources
  */
-class Smarty_Internal_Resource_Eval extends Smarty_Resource_Recompiled {
-
+class Smarty_Internal_Resource_Eval extends Smarty_Resource_Recompiled
+{
     /**
      * populate Source Object with meta data from Resource
      *
-     * @param Smarty_Template_Source   $source    source object
-     * @param Smarty_Internal_Template $_template template object
+     * @param  Smarty_Template_Source   $source    source object
+     * @param  Smarty_Internal_Template $_template template object
+     *
      * @return void
      */
-    public function populate(Smarty_Template_Source $source, Smarty_Internal_Template $_template=null)
+    public function populate(Smarty_Template_Source $source, Smarty_Internal_Template $_template = null)
     {
         $source->uid = $source->filepath = sha1($source->name);
         $source->timestamp = false;
@@ -38,18 +37,21 @@ class Smarty_Internal_Resource_Eval extends Smarty_Resource_Recompiled {
      * Load template's source from $resource_name into current template object
      *
      * @uses decode() to decode base64 and urlencoded template_resources
-     * @param Smarty_Template_Source $source source object
-     * @return string template source
+     *
+     * @param  Smarty_Template_Source $source source object
+     *
+     * @return string                 template source
      */
     public function getContent(Smarty_Template_Source $source)
     {
         return $this->decode($source->name);
     }
-    
+
     /**
      * decode base64 and urlencode
      *
-     * @param string $string template_resource to decode
+     * @param  string $string template_resource to decode
+     *
      * @return string decoded template_resource
      */
     protected function decode($string)
@@ -62,33 +64,33 @@ class Smarty_Internal_Resource_Eval extends Smarty_Resource_Recompiled {
                 return urldecode(substr($string, 10));
             }
         }
-        
+
         return $string;
     }
-    
+
     /**
      * modify resource_name according to resource handlers specifications
      *
-     * @param Smarty $smarty        Smarty instance
-     * @param string $resource_name resource_name to make unique
+     * @param  Smarty  $smarty        Smarty instance
+     * @param  string  $resource_name resource_name to make unique
+     * @param  boolean $isConfig      flag for config resource
+     *
      * @return string unique resource name
      */
-    protected function buildUniqueResourceName(Smarty $smarty, $resource_name)
+    public function buildUniqueResourceName(Smarty $smarty, $resource_name, $isConfig = false)
     {
-        return get_class($this) . '#' .$this->decode($resource_name);
+        return get_class($this) . '#' . $this->decode($resource_name);
     }
 
     /**
      * Determine basename for compiled filename
      *
-     * @param Smarty_Template_Source $source source object
-     * @return string resource's basename
+     * @param  Smarty_Template_Source $source source object
+     *
+     * @return string                 resource's basename
      */
-    protected function getBasename(Smarty_Template_Source $source)
+    public function getBasename(Smarty_Template_Source $source)
     {
         return '';
     }
-
 }
-
-?>
\ No newline at end of file
diff --git a/include/smarty/libs/sysplugins/smarty_internal_resource_extends.php b/include/smarty/libs/sysplugins/smarty_internal_resource_extends.php
index 29734ae05..0c0802d62 100644
--- a/include/smarty/libs/sysplugins/smarty_internal_resource_extends.php
+++ b/include/smarty/libs/sysplugins/smarty_internal_resource_extends.php
@@ -1,162 +1,113 @@
 <?php
 /**
-* Smarty Internal Plugin Resource Extends
-*
-* @package Smarty
-* @subpackage TemplateResources
-* @author Uwe Tews
-* @author Rodney Rehm
-*/
+ * Smarty Internal Plugin Resource Extends
+ *
+ * @package    Smarty
+ * @subpackage TemplateResources
+ * @author     Uwe Tews
+ * @author     Rodney Rehm
+ */
 
 /**
-* Smarty Internal Plugin Resource Extends
-*
-* Implements the file system as resource for Smarty which {extend}s a chain of template files templates
-*
-* @package Smarty
-* @subpackage TemplateResources
-*/
-class Smarty_Internal_Resource_Extends extends Smarty_Resource {
-
+ * Smarty Internal Plugin Resource Extends
+ * Implements the file system as resource for Smarty which {extend}s a chain of template files templates
+ *
+ * @package    Smarty
+ * @subpackage TemplateResources
+ */
+class Smarty_Internal_Resource_Extends extends Smarty_Resource
+{
     /**
-    * mbstring.overload flag
-    *
-    * @var int
-    */
+     * mbstring.overload flag
+     *
+     * @var int
+     */
     public $mbstring_overload = 0;
 
     /**
-    * populate Source Object with meta data from Resource
-    *
-    * @param Smarty_Template_Source   $source    source object
-    * @param Smarty_Internal_Template $_template template object
-    */
-    public function populate(Smarty_Template_Source $source, Smarty_Internal_Template $_template=null)
+     * populate Source Object with meta data from Resource
+     *
+     * @param Smarty_Template_Source   $source    source object
+     * @param Smarty_Internal_Template $_template template object
+     *
+     * @throws SmartyException
+     */
+    public function populate(Smarty_Template_Source $source, Smarty_Internal_Template $_template = null)
     {
         $uid = '';
         $sources = array();
         $components = explode('|', $source->name);
         $exists = true;
         foreach ($components as $component) {
-            $s = Smarty_Resource::source(null, $source->smarty, $component);
-            if ($s->type == 'php') {
-                throw new SmartyException("Resource type {$s->type} cannot be used with the extends resource type");
+            /* @var \Smarty_Template_Source $_s */
+            $_s = Smarty_Template_Source::load(null, $source->smarty, $component);
+            if ($_s->type == 'php') {
+                throw new SmartyException("Resource type {$_s->type} cannot be used with the extends resource type");
             }
-            $sources[$s->uid] = $s;
-            $uid .= $s->filepath;
-            if ($_template && $_template->smarty->compile_check) {
-                $exists = $exists && $s->exists;
+            $sources[$_s->uid] = $_s;
+            $uid .= $_s->filepath;
+            if ($_template) {
+                $exists = $exists && $_s->exists;
             }
         }
         $source->components = $sources;
-        $source->filepath = $s->filepath;
+        $source->filepath = $_s->filepath;
         $source->uid = sha1($uid);
-        if ($_template && $_template->smarty->compile_check) {
-            $source->timestamp = $s->timestamp;
-            $source->exists = $exists;
+        $source->exists = $exists;
+        if ($_template) {
+            $source->timestamp = $_s->timestamp;
         }
-        // need the template at getContent()
-        $source->template = $_template;
     }
 
     /**
-    * populate Source Object with timestamp and exists from Resource
-    *
-    * @param Smarty_Template_Source $source source object
-    */
+     * populate Source Object with timestamp and exists from Resource
+     *
+     * @param Smarty_Template_Source $source source object
+     */
     public function populateTimestamp(Smarty_Template_Source $source)
     {
         $source->exists = true;
-        foreach ($source->components as $s) {
-            $source->exists = $source->exists && $s->exists;
+        /* @var \Smarty_Template_Source $_s */
+        foreach ($source->components as $_s) {
+            $source->exists = $source->exists && $_s->exists;
         }
-        $source->timestamp = $s->timestamp;
+        $source->timestamp = $source->exists ? $_s->getTimeStamp() : false;
     }
 
     /**
-    * Load template's source from files into current template object
-    *
-    * @param Smarty_Template_Source $source source object
-    * @return string template source
-    * @throws SmartyException if source cannot be loaded
-    */
+     * Load template's source from files into current template object
+     *
+     * @param Smarty_Template_Source $source source object
+     *
+     * @return string template source
+     * @throws SmartyException if source cannot be loaded
+     */
     public function getContent(Smarty_Template_Source $source)
     {
         if (!$source->exists) {
             throw new SmartyException("Unable to read template {$source->type} '{$source->name}'");
         }
 
-        $this->mbstring_overload = ini_get('mbstring.func_overload') & 2;
-        $_rdl = preg_quote($source->smarty->right_delimiter);
-        $_ldl = preg_quote($source->smarty->left_delimiter);
-        if (!$source->smarty->auto_literal) {
-            $al = '\s*';
-        } else {
-            $al = '';
-        }
         $_components = array_reverse($source->components);
-        $_first = reset($_components);
-        $_last = end($_components);
-
-        foreach ($_components as $_component) {
-            // register dependency
-            if ($_component != $_first) {
-                $source->template->properties['file_dependency'][$_component->uid] = array($_component->filepath, $_component->timestamp, $_component->type);
-            }
 
+        $_content = '';
+        /* @var \Smarty_Template_Source $_s */
+        foreach ($_components as $_s) {
             // read content
-            $source->filepath = $_component->filepath;
-            $_content = $_component->content;
-
-            // extend sources
-            if ($_component != $_last) {
-                if (preg_match_all("!({$_ldl}{$al}block\s(.+?)\s*{$_rdl})!", $_content, $_open) !=
-                preg_match_all("!({$_ldl}{$al}/block\s*{$_rdl})!", $_content, $_close)) {
-                    throw new SmartyException("unmatched {block} {/block} pairs in template {$_component->type} '{$_component->name}'");
-                }
-                preg_match_all("!{$_ldl}{$al}block\s(.+?)\s*{$_rdl}|{$_ldl}{$al}/block\s*{$_rdl}|{$_ldl}\*([\S\s]*?)\*{$_rdl}!", $_content, $_result, PREG_OFFSET_CAPTURE);
-                $_result_count = count($_result[0]);
-                $_start = 0;
-                while ($_start+1 < $_result_count) {
-                    $_end = 0;
-                    $_level = 1;
-                    if (($this->mbstring_overload ? mb_substr($_result[0][$_start][0],0,mb_strlen($source->smarty->left_delimiter,'latin1')+1, 'latin1') : substr($_result[0][$_start][0],0,strlen($source->smarty->left_delimiter)+1)) == $source->smarty->left_delimiter.'*') {
-                        $_start++;
-                        continue;
-                    }
-                    while ($_level != 0) {
-                        $_end++;
-                        if (($this->mbstring_overload ? mb_substr($_result[0][$_start + $_end][0],0,mb_strlen($source->smarty->left_delimiter,'latin1')+1, 'latin1') : substr($_result[0][$_start + $_end][0],0,strlen($source->smarty->left_delimiter)+1)) == $source->smarty->left_delimiter.'*') {
-                            continue;
-                        }
-                        if (!strpos($_result[0][$_start + $_end][0], '/')) {
-                            $_level++;
-                        } else {
-                            $_level--;
-                        }
-                    }
-                    $_block_content = str_replace($source->smarty->left_delimiter . '$smarty.block.parent' . $source->smarty->right_delimiter, '%%%%SMARTY_PARENT%%%%',
-                    ($this->mbstring_overload ? mb_substr($_content, $_result[0][$_start][1] + mb_strlen($_result[0][$_start][0], 'latin1'), $_result[0][$_start + $_end][1] - $_result[0][$_start][1] - + mb_strlen($_result[0][$_start][0], 'latin1'), 'latin1') : substr($_content, $_result[0][$_start][1] + strlen($_result[0][$_start][0]), $_result[0][$_start + $_end][1] - $_result[0][$_start][1] - + strlen($_result[0][$_start][0]))));
-                    Smarty_Internal_Compile_Block::saveBlockData($_block_content, $_result[0][$_start][0], $source->template, $_component->filepath);
-                    $_start = $_start + $_end + 1;
-                }
-            } else {
-                return $_content;
-            }
+            $_content .= $_s->getContent();
         }
+        return $_content;
     }
 
     /**
-    * Determine basename for compiled filename
-    *
-    * @param Smarty_Template_Source $source source object
-    * @return string resource's basename
-    */
+     * Determine basename for compiled filename
+     *
+     * @param Smarty_Template_Source $source source object
+     *
+     * @return string resource's basename
+     */
     public function getBasename(Smarty_Template_Source $source)
     {
         return str_replace(':', '.', basename($source->filepath));
     }
-
 }
-
-?>
\ No newline at end of file
diff --git a/include/smarty/libs/sysplugins/smarty_internal_resource_file.php b/include/smarty/libs/sysplugins/smarty_internal_resource_file.php
index 48b391d20..b15e3cc6a 100644
--- a/include/smarty/libs/sysplugins/smarty_internal_resource_file.php
+++ b/include/smarty/libs/sysplugins/smarty_internal_resource_file.php
@@ -2,21 +2,111 @@
 /**
  * Smarty Internal Plugin Resource File
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage TemplateResources
- * @author Uwe Tews
- * @author Rodney Rehm
+ * @author     Uwe Tews
+ * @author     Rodney Rehm
  */
 
 /**
  * Smarty Internal Plugin Resource File
- *
  * Implements the file system as resource for Smarty templates
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage TemplateResources
  */
-class Smarty_Internal_Resource_File extends Smarty_Resource {
+class Smarty_Internal_Resource_File extends Smarty_Resource
+{
+    /**
+     * build template filepath by traversing the template_dir array
+     *
+     * @param Smarty_Template_Source    $source    source object
+     * @param  Smarty_Internal_Template $_template template object
+     *
+     * @return string fully qualified filepath
+     * @throws SmartyException
+     */
+    protected function buildFilepath(Smarty_Template_Source $source, Smarty_Internal_Template $_template = null)
+    {
+        $file = $source->name;
+        // absolute file ?
+        if ($file[0] == '/' || $file[1] == ':') {
+            $file = $source->smarty->_realpath($file, true);
+            return is_file($file) ? $file : false;
+        }
+        // go relative to a given template?
+        if ($file[0] == '.' && $_template && isset($_template->parent) && $_template->parent->_objType == 2 &&
+            preg_match('#^[.]{1,2}[\\\/]#', $file)
+        ) {
+            if ($_template->parent->source->type != 'file' && $_template->parent->source->type != 'extends' &&
+                !isset($_template->parent->_cache['allow_relative_path'])
+            ) {
+                throw new SmartyException("Template '{$file}' cannot be relative to template of resource type '{$_template->parent->source->type}'");
+            }
+            $path = dirname($_template->parent->source->filepath) . DS . $file;
+            // normalize path
+            $path = $source->smarty->_realpath($path);
+            // files relative to a template only get one shot
+            return is_file($path) ? $path : false;
+        }
+        // normalize DS
+        if (strpos($file, DS == '/' ? '\\' : '/') !== false) {
+            $file = str_replace(DS == '/' ? '\\' : '/', DS, $file);
+        }
+
+        $_directories = $source->smarty->getTemplateDir(null, $source->isConfig);
+        // template_dir index?
+        if ($file[0] == '[' && preg_match('#^\[([^\]]+)\](.+)$#', $file, $fileMatch)) {
+            $file = $fileMatch[2];
+            $_indices = explode(',', $fileMatch[1]);
+            $_index_dirs = array();
+            foreach ($_indices as $index) {
+                $index = trim($index);
+                // try string indexes
+                if (isset($_directories[$index])) {
+                    $_index_dirs[] = $_directories[$index];
+                } elseif (is_numeric($index)) {
+                    // try numeric index
+                    $index = (int) $index;
+                    if (isset($_directories[$index])) {
+                        $_index_dirs[] = $_directories[$index];
+                    } else {
+                        // try at location index
+                        $keys = array_keys($_directories);
+                        if (isset($_directories[$keys[$index]])) {
+                            $_index_dirs[] = $_directories[$keys[$index]];
+                        }
+                    }
+                }
+            }
+            if (empty($_index_dirs)) {
+                // index not found
+                return false;
+            } else {
+                $_directories = $_index_dirs;
+            }
+        }
+
+        // relative file name?
+        foreach ($_directories as $_directory) {
+            $path = $_directory . $file;
+            if (is_file($path)) {
+                return (strpos($path, '.' . DS) !== false) ? $source->smarty->_realpath($path) : $path;
+            }
+        }
+        if (!isset($_index_dirs)) {
+            // Could be relative to cwd
+            $path = $source->smarty->_realpath($file, true);
+            if (is_file($path)) {
+                return $path;
+            }
+        }
+        // Use include path ?
+        if ($source->smarty->use_include_path) {
+            return $source->smarty->ext->_getIncludePath->getIncludePath($_directories, $file, $source->smarty);
+        }
+        return false;
+    }
 
     /**
      * populate Source Object with meta data from Resource
@@ -24,20 +114,22 @@ class Smarty_Internal_Resource_File extends Smarty_Resource {
      * @param Smarty_Template_Source   $source    source object
      * @param Smarty_Internal_Template $_template template object
      */
-    public function populate(Smarty_Template_Source $source, Smarty_Internal_Template $_template=null)
+    public function populate(Smarty_Template_Source $source, Smarty_Internal_Template $_template = null)
     {
         $source->filepath = $this->buildFilepath($source, $_template);
 
         if ($source->filepath !== false) {
-            if (is_object($source->smarty->security_policy)) {
-                $source->smarty->security_policy->isTrustedResourceDir($source->filepath);
+            if (isset($source->smarty->security_policy) && is_object($source->smarty->security_policy)) {
+                $source->smarty->security_policy->isTrustedResourceDir($source->filepath, $source->isConfig);
             }
-
+            $source->exists = true;
             $source->uid = sha1($source->filepath);
-            if ($source->smarty->compile_check && !isset($source->timestamp)) {
-                $source->timestamp = @filemtime($source->filepath);
-                $source->exists = !!$source->timestamp;
+            if ($source->smarty->compile_check == 1) {
+                $source->timestamp = filemtime($source->filepath);
             }
+        } else {
+            $source->timestamp = false;
+            $source->exists = false;
         }
     }
 
@@ -48,43 +140,40 @@ class Smarty_Internal_Resource_File extends Smarty_Resource {
      */
     public function populateTimestamp(Smarty_Template_Source $source)
     {
-        $source->timestamp = @filemtime($source->filepath);
-        $source->exists = !!$source->timestamp;
+        if (!$source->exists) {
+            $source->timestamp = $source->exists = is_file($source->filepath);
+        }
+        if ($source->exists) {
+            $source->timestamp = filemtime($source->filepath);
+        }
     }
 
     /**
      * Load template's source from file into current template object
      *
-     * @param Smarty_Template_Source $source source object
-     * @return string template source
-     * @throws SmartyException if source cannot be loaded
+     * @param  Smarty_Template_Source $source source object
+     *
+     * @return string                 template source
+     * @throws SmartyException        if source cannot be loaded
      */
     public function getContent(Smarty_Template_Source $source)
     {
-        if ($source->timestamp) {
+        if ($source->exists) {
             return file_get_contents($source->filepath);
         }
-        if ($source instanceof Smarty_Config_Source) {
-            throw new SmartyException("Unable to read config {$source->type} '{$source->name}'");
-        }
-        throw new SmartyException("Unable to read template {$source->type} '{$source->name}'");
+        throw new SmartyException('Unable to read ' . ($source->isConfig ? 'config' : 'template') .
+                                  " {$source->type} '{$source->name}'");
     }
 
     /**
      * Determine basename for compiled filename
      *
-     * @param Smarty_Template_Source $source source object
-     * @return string resource's basename
+     * @param  Smarty_Template_Source $source source object
+     *
+     * @return string                 resource's basename
      */
     public function getBasename(Smarty_Template_Source $source)
     {
-        $_file = $source->name;
-        if (($_pos = strpos($_file, ']')) !== false) {
-            $_file = substr($_file, $_pos + 1);
-        }
-        return basename($_file);
+        return basename($source->filepath);
     }
-
 }
-
-?>
\ No newline at end of file
diff --git a/include/smarty/libs/sysplugins/smarty_internal_resource_php.php b/include/smarty/libs/sysplugins/smarty_internal_resource_php.php
index 7cd8baeec..62680625c 100644
--- a/include/smarty/libs/sysplugins/smarty_internal_resource_php.php
+++ b/include/smarty/libs/sysplugins/smarty_internal_resource_php.php
@@ -2,76 +2,56 @@
 
 /**
  * Smarty Internal Plugin Resource PHP
- *
  * Implements the file system as resource for PHP templates
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage TemplateResources
- * @author Uwe Tews
- * @author Rodney Rehm
+ * @author     Uwe Tews
+ * @author     Rodney Rehm
  */
-class Smarty_Internal_Resource_PHP extends Smarty_Resource_Uncompiled {
+class Smarty_Internal_Resource_Php extends Smarty_Internal_Resource_File
+{
     /**
-     * container for short_open_tag directive's value before executing PHP templates
-     * @var string
+     * Flag that it's an uncompiled resource
+     *
+     * @var bool
      */
-    protected $short_open_tag;
-
+    public $uncompiled = true;
     /**
-     * Create a new PHP Resource
+     * container for short_open_tag directive's value before executing PHP templates
      *
+     * @var string
      */
-    public function __construct()
-    {
-        $this->short_open_tag = ini_get( 'short_open_tag' );
-    }
+    protected $short_open_tag;
 
     /**
-     * populate Source Object with meta data from Resource
+     * Resource does implement populateCompiledFilepath() method
      *
-     * @param Smarty_Template_Source $source source object
-     * @param Smarty_Internal_Template $_template template object
-     * @return void
+     * @var bool
      */
-    public function populate(Smarty_Template_Source $source, Smarty_Internal_Template $_template=null)
-    {
-        $source->filepath = $this->buildFilepath($source, $_template);
+    public $hasCompiledHandler = true;
 
-        if ($source->filepath !== false) {
-            if (is_object($source->smarty->security_policy)) {
-                $source->smarty->security_policy->isTrustedResourceDir($source->filepath);
-            }
-
-            $source->uid = sha1($source->filepath);
-            if ($source->smarty->compile_check) {
-                $source->timestamp = @filemtime($source->filepath);
-                $source->exists = !!$source->timestamp;
-            }
-        }
-    }
 
     /**
-     * populate Source Object with timestamp and exists from Resource
-     *
-     * @param Smarty_Template_Source $source source object
-     * @return void
+     * Create a new PHP Resource
+
      */
-    public function populateTimestamp(Smarty_Template_Source $source)
+    public function __construct()
     {
-        $source->timestamp = @filemtime($source->filepath);
-        $source->exists = !!$source->timestamp;
+        $this->short_open_tag = ini_get('short_open_tag');
     }
 
     /**
      * Load template's source from file into current template object
      *
-     * @param Smarty_Template_Source $source source object
-     * @return string template source
-     * @throws SmartyException if source cannot be loaded
+     * @param  Smarty_Template_Source $source source object
+     *
+     * @return string                 template source
+     * @throws SmartyException        if source cannot be loaded
      */
     public function getContent(Smarty_Template_Source $source)
     {
-        if ($source->timestamp) {
+        if ($source->exists) {
             return '';
         }
         throw new SmartyException("Unable to read template {$source->type} '{$source->name}'");
@@ -80,20 +60,19 @@ class Smarty_Internal_Resource_PHP extends Smarty_Resource_Uncompiled {
     /**
      * Render and output the template (without using the compiler)
      *
-     * @param Smarty_Template_Source $source source object
-     * @param Smarty_Internal_Template $_template template object
+     * @param  Smarty_Template_Source   $source    source object
+     * @param  Smarty_Internal_Template $_template template object
+     *
      * @return void
-     * @throws SmartyException if template cannot be loaded or allow_php_templates is disabled
+     * @throws SmartyException          if template cannot be loaded or allow_php_templates is disabled
      */
     public function renderUncompiled(Smarty_Template_Source $source, Smarty_Internal_Template $_template)
     {
-        $_smarty_template = $_template;
-
         if (!$source->smarty->allow_php_templates) {
             throw new SmartyException("PHP templates are disabled");
         }
         if (!$source->exists) {
-            if ($_template->parent instanceof Smarty_Internal_Template) {
+            if (isset($_template->parent) && $_template->parent->_objType == 2) {
                 $parent_resource = " in '{$_template->parent->template_resource}'";
             } else {
                 $parent_resource = '';
@@ -105,10 +84,25 @@ class Smarty_Internal_Resource_PHP extends Smarty_Resource_Uncompiled {
         extract($_template->getTemplateVars());
 
         // include PHP template with short open tags enabled
-        ini_set( 'short_open_tag', '1' );
+        ini_set('short_open_tag', '1');
+        /** @var Smarty_Internal_Template $_smarty_template
+         * used in included file
+         */
+        $_smarty_template = $_template;
         include($source->filepath);
-        ini_set( 'short_open_tag', $this->short_open_tag );
+        ini_set('short_open_tag', $this->short_open_tag);
     }
-}
 
-?>
\ No newline at end of file
+    /**
+     * populate compiled object with compiled filepath
+     *
+     * @param Smarty_Template_Compiled $compiled  compiled object
+     * @param Smarty_Internal_Template $_template template object (is ignored)
+     */
+    public function populateCompiledFilepath(Smarty_Template_Compiled $compiled, Smarty_Internal_Template $_template)
+    {
+        $compiled->filepath = false;
+        $compiled->timestamp = false;
+        $compiled->exists = false;
+    }
+}
diff --git a/include/smarty/libs/sysplugins/smarty_internal_resource_registered.php b/include/smarty/libs/sysplugins/smarty_internal_resource_registered.php
index 44497b922..69b396b6a 100644
--- a/include/smarty/libs/sysplugins/smarty_internal_resource_registered.php
+++ b/include/smarty/libs/sysplugins/smarty_internal_resource_registered.php
@@ -2,31 +2,31 @@
 /**
  * Smarty Internal Plugin Resource Registered
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage TemplateResources
- * @author Uwe Tews
- * @author Rodney Rehm
+ * @author     Uwe Tews
+ * @author     Rodney Rehm
  */
 
 /**
  * Smarty Internal Plugin Resource Registered
- *
  * Implements the registered resource for Smarty template
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage TemplateResources
  * @deprecated
  */
-class Smarty_Internal_Resource_Registered extends Smarty_Resource {
-
+class Smarty_Internal_Resource_Registered extends Smarty_Resource
+{
     /**
      * populate Source Object with meta data from Resource
      *
-     * @param Smarty_Template_Source   $source    source object
-     * @param Smarty_Internal_Template $_template template object
+     * @param  Smarty_Template_Source   $source    source object
+     * @param  Smarty_Internal_Template $_template template object
+     *
      * @return void
      */
-    public function populate(Smarty_Template_Source $source, Smarty_Internal_Template $_template=null)
+    public function populate(Smarty_Template_Source $source, Smarty_Internal_Template $_template = null)
     {
         $source->filepath = $source->type . ':' . $source->name;
         $source->uid = sha1($source->filepath);
@@ -39,7 +39,8 @@ class Smarty_Internal_Resource_Registered extends Smarty_Resource {
     /**
      * populate Source Object with timestamp and exists from Resource
      *
-     * @param Smarty_Template_Source $source source object
+     * @param  Smarty_Template_Source $source source object
+     *
      * @return void
      */
     public function populateTimestamp(Smarty_Template_Source $source)
@@ -51,45 +52,48 @@ class Smarty_Internal_Resource_Registered extends Smarty_Resource {
     /**
      * Get timestamp (epoch) the template source was modified
      *
-     * @param Smarty_Template_Source $source source object
-     * @return integer|boolean timestamp (epoch) the template was modified, false if resources has no timestamp
+     * @param  Smarty_Template_Source $source source object
+     *
+     * @return integer|boolean        timestamp (epoch) the template was modified, false if resources has no timestamp
      */
     public function getTemplateTimestamp(Smarty_Template_Source $source)
     {
         // return timestamp
         $time_stamp = false;
         call_user_func_array($source->smarty->registered_resources[$source->type][0][1], array($source->name, &$time_stamp, $source->smarty));
+
         return is_numeric($time_stamp) ? (int) $time_stamp : $time_stamp;
     }
 
     /**
      * Load template's source by invoking the registered callback into current template object
      *
-     * @param Smarty_Template_Source $source source object
-     * @return string template source
-     * @throws SmartyException if source cannot be loaded
+     * @param  Smarty_Template_Source $source source object
+     *
+     * @return string                 template source
+     * @throws SmartyException        if source cannot be loaded
      */
     public function getContent(Smarty_Template_Source $source)
     {
         // return template string
-        $t = call_user_func_array($source->smarty->registered_resources[$source->type][0][0], array($source->name, &$source->content, $source->smarty));
+        $content = null;
+        $t = call_user_func_array($source->smarty->registered_resources[$source->type][0][0], array($source->name, &$content, $source->smarty));
         if (is_bool($t) && !$t) {
             throw new SmartyException("Unable to read template {$source->type} '{$source->name}'");
         }
-        return $source->content;
+
+        return $content;
     }
 
     /**
      * Determine basename for compiled filename
      *
-     * @param Smarty_Template_Source $source source object
-     * @return string resource's basename
+     * @param  Smarty_Template_Source $source source object
+     *
+     * @return string                 resource's basename
      */
-    protected function getBasename(Smarty_Template_Source $source)
+    public function getBasename(Smarty_Template_Source $source)
     {
         return basename($source->name);
     }
-
 }
-
-?>
\ No newline at end of file
diff --git a/include/smarty/libs/sysplugins/smarty_internal_resource_stream.php b/include/smarty/libs/sysplugins/smarty_internal_resource_stream.php
index 58086c179..8a902268c 100644
--- a/include/smarty/libs/sysplugins/smarty_internal_resource_stream.php
+++ b/include/smarty/libs/sysplugins/smarty_internal_resource_stream.php
@@ -1,36 +1,35 @@
 <?php
 /**
-* Smarty Internal Plugin Resource Stream
-*
-* Implements the streams as resource for Smarty template
-*
-* @package Smarty
-* @subpackage TemplateResources
-* @author Uwe Tews
-* @author Rodney Rehm
-*/
+ * Smarty Internal Plugin Resource Stream
+ * Implements the streams as resource for Smarty template
+ *
+ * @package    Smarty
+ * @subpackage TemplateResources
+ * @author     Uwe Tews
+ * @author     Rodney Rehm
+ */
 
 /**
-* Smarty Internal Plugin Resource Stream
-*
-* Implements the streams as resource for Smarty template
-*
-* @link http://php.net/streams
-* @package Smarty
-* @subpackage TemplateResources
-*/
-class Smarty_Internal_Resource_Stream extends Smarty_Resource_Recompiled {
-
+ * Smarty Internal Plugin Resource Stream
+ * Implements the streams as resource for Smarty template
+ *
+ * @link       http://php.net/streams
+ * @package    Smarty
+ * @subpackage TemplateResources
+ */
+class Smarty_Internal_Resource_Stream extends Smarty_Resource_Recompiled
+{
     /**
-    * populate Source Object with meta data from Resource
-    *
-    * @param Smarty_Template_Source   $source    source object
-    * @param Smarty_Internal_Template $_template template object
-    * @return void
-    */
-    public function populate(Smarty_Template_Source $source, Smarty_Internal_Template $_template=null)
+     * populate Source Object with meta data from Resource
+     *
+     * @param Smarty_Template_Source   $source    source object
+     * @param Smarty_Internal_Template $_template template object
+     *
+     * @return void
+     */
+    public function populate(Smarty_Template_Source $source, Smarty_Internal_Template $_template = null)
     {
-        if(strpos($source->resource, '://') !== false) {
+        if (strpos($source->resource, '://') !== false) {
             $source->filepath = $source->resource;
         } else {
             $source->filepath = str_replace(':', '://', $source->resource);
@@ -42,12 +41,13 @@ class Smarty_Internal_Resource_Stream extends Smarty_Resource_Recompiled {
     }
 
     /**
-    * Load template's source from stream into current template object
-    *
-    * @param Smarty_Template_Source $source source object
-    * @return string template source
-    * @throws SmartyException if source cannot be loaded
-    */
+     * Load template's source from stream into current template object
+     *
+     * @param Smarty_Template_Source $source source object
+     *
+     * @return string template source
+     * @throws SmartyException if source cannot be loaded
+     */
     public function getContent(Smarty_Template_Source $source)
     {
         $t = '';
@@ -58,6 +58,7 @@ class Smarty_Internal_Resource_Stream extends Smarty_Resource_Recompiled {
                 $t .= $current_line;
             }
             fclose($fp);
+
             return $t;
         } else {
             return false;
@@ -65,13 +66,15 @@ class Smarty_Internal_Resource_Stream extends Smarty_Resource_Recompiled {
     }
 
     /**
-    * modify resource_name according to resource handlers specifications
-    *
-    * @param Smarty $smarty        Smarty instance
-    * @param string $resource_name resource_name to make unique
-    * @return string unique resource name
-    */
-    protected function buildUniqueResourceName(Smarty $smarty, $resource_name)
+     * modify resource_name according to resource handlers specifications
+     *
+     * @param Smarty   $smarty        Smarty instance
+     * @param string   $resource_name resource_name to make unique
+     * @param  boolean $isConfig      flag for config resource
+     *
+     * @return string unique resource name
+     */
+    public function buildUniqueResourceName(Smarty $smarty, $resource_name, $isConfig = false)
     {
         return get_class($this) . '#' . $resource_name;
     }
diff --git a/include/smarty/libs/sysplugins/smarty_internal_resource_string.php b/include/smarty/libs/sysplugins/smarty_internal_resource_string.php
index 9571337b0..75e99e6fb 100644
--- a/include/smarty/libs/sysplugins/smarty_internal_resource_string.php
+++ b/include/smarty/libs/sysplugins/smarty_internal_resource_string.php
@@ -2,32 +2,31 @@
 /**
  * Smarty Internal Plugin Resource String
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage TemplateResources
- * @author Uwe Tews
- * @author Rodney Rehm
+ * @author     Uwe Tews
+ * @author     Rodney Rehm
  */
 
 /**
  * Smarty Internal Plugin Resource String
- *
  * Implements the strings as resource for Smarty template
- *
  * {@internal unlike eval-resources the compiled state of string-resources is saved for subsequent access}}
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage TemplateResources
  */
-class Smarty_Internal_Resource_String extends Smarty_Resource {
-
+class Smarty_Internal_Resource_String extends Smarty_Resource
+{
     /**
      * populate Source Object with meta data from Resource
      *
-     * @param Smarty_Template_Source   $source    source object
-     * @param Smarty_Internal_Template $_template template object
+     * @param  Smarty_Template_Source   $source    source object
+     * @param  Smarty_Internal_Template $_template template object
+     *
      * @return void
      */
-    public function populate(Smarty_Template_Source $source, Smarty_Internal_Template $_template=null)
+    public function populate(Smarty_Template_Source $source, Smarty_Internal_Template $_template = null)
     {
         $source->uid = $source->filepath = sha1($source->name);
         $source->timestamp = 0;
@@ -38,18 +37,21 @@ class Smarty_Internal_Resource_String extends Smarty_Resource {
      * Load template's source from $resource_name into current template object
      *
      * @uses decode() to decode base64 and urlencoded template_resources
-     * @param Smarty_Template_Source $source source object
-     * @return string template source
+     *
+     * @param  Smarty_Template_Source $source source object
+     *
+     * @return string                 template source
      */
     public function getContent(Smarty_Template_Source $source)
     {
         return $this->decode($source->name);
     }
-    
+
     /**
      * decode base64 and urlencode
      *
-     * @param string $string template_resource to decode
+     * @param  string $string template_resource to decode
+     *
      * @return string decoded template_resource
      */
     protected function decode($string)
@@ -62,35 +64,34 @@ class Smarty_Internal_Resource_String extends Smarty_Resource {
                 return urldecode(substr($string, 10));
             }
         }
-        
+
         return $string;
     }
-    
+
     /**
      * modify resource_name according to resource handlers specifications
      *
-     * @param Smarty $smarty        Smarty instance
-     * @param string $resource_name resource_name to make unique
+     * @param  Smarty  $smarty        Smarty instance
+     * @param  string  $resource_name resource_name to make unique
+     * @param  boolean $isConfig      flag for config resource
+     *
      * @return string unique resource name
      */
-    protected function buildUniqueResourceName(Smarty $smarty, $resource_name)
+    public function buildUniqueResourceName(Smarty $smarty, $resource_name, $isConfig = false)
     {
-        return get_class($this) . '#' .$this->decode($resource_name);
+        return get_class($this) . '#' . $this->decode($resource_name);
     }
 
     /**
      * Determine basename for compiled filename
-     *
      * Always returns an empty string.
      *
-     * @param Smarty_Template_Source $source source object
-     * @return string resource's basename
+     * @param  Smarty_Template_Source $source source object
+     *
+     * @return string                 resource's basename
      */
-    protected function getBasename(Smarty_Template_Source $source)
+    public function getBasename(Smarty_Template_Source $source)
     {
         return '';
     }
-
 }
-
-?>
\ No newline at end of file
diff --git a/include/smarty/libs/sysplugins/smarty_internal_runtime_cachemodify.php b/include/smarty/libs/sysplugins/smarty_internal_runtime_cachemodify.php
new file mode 100644
index 000000000..4e2fb83e6
--- /dev/null
+++ b/include/smarty/libs/sysplugins/smarty_internal_runtime_cachemodify.php
@@ -0,0 +1,67 @@
+<?php
+
+/**
+ * Inline Runtime Methods render, setSourceByUid, setupSubTemplate
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ *
+ **/
+class Smarty_Internal_Runtime_CacheModify
+{
+    /**
+     * check client side cache
+     *
+     * @param Smarty_Internal_Template $_template
+     * @param  string                  $content
+     */
+    public function cacheModifiedCheck(Smarty_Template_Cached $cached, Smarty_Internal_Template $_template, $content)
+    {
+        $_isCached = $_template->isCached() && !$_template->compiled->has_nocache_code;
+        $_last_modified_date =
+            @substr($_SERVER['HTTP_IF_MODIFIED_SINCE'], 0, strpos($_SERVER['HTTP_IF_MODIFIED_SINCE'], 'GMT') + 3);
+        if ($_isCached && $cached->timestamp <= strtotime($_last_modified_date)) {
+            switch (PHP_SAPI) {
+                case 'cgi': // php-cgi < 5.3
+                case 'cgi-fcgi': // php-cgi >= 5.3
+                case 'fpm-fcgi': // php-fpm >= 5.3.3
+                    header('Status: 304 Not Modified');
+                    break;
+
+                case 'cli':
+                    if ( /* ^phpunit */
+                    !empty($_SERVER['SMARTY_PHPUNIT_DISABLE_HEADERS']) /* phpunit$ */
+                    ) {
+                        $_SERVER['SMARTY_PHPUNIT_HEADERS'][] = '304 Not Modified';
+                    }
+                    break;
+
+                default:
+                    if ( /* ^phpunit */
+                    !empty($_SERVER['SMARTY_PHPUNIT_DISABLE_HEADERS']) /* phpunit$ */
+                    ) {
+                        $_SERVER['SMARTY_PHPUNIT_HEADERS'][] = '304 Not Modified';
+                    } else {
+                        header($_SERVER['SERVER_PROTOCOL'] . ' 304 Not Modified');
+                    }
+                    break;
+            }
+        } else {
+            switch (PHP_SAPI) {
+                case 'cli':
+                    if ( /* ^phpunit */
+                    !empty($_SERVER['SMARTY_PHPUNIT_DISABLE_HEADERS']) /* phpunit$ */
+                    ) {
+                        $_SERVER['SMARTY_PHPUNIT_HEADERS'][] =
+                            'Last-Modified: ' . gmdate('D, d M Y H:i:s', $cached->timestamp) . ' GMT';
+                    }
+                    break;
+                default:
+                    header('Last-Modified: ' . gmdate('D, d M Y H:i:s', $cached->timestamp) . ' GMT');
+                    break;
+            }
+            echo $content;
+        }
+    }
+}
diff --git a/include/smarty/libs/sysplugins/smarty_internal_runtime_codeframe.php b/include/smarty/libs/sysplugins/smarty_internal_runtime_codeframe.php
new file mode 100644
index 000000000..21e6e5221
--- /dev/null
+++ b/include/smarty/libs/sysplugins/smarty_internal_runtime_codeframe.php
@@ -0,0 +1,94 @@
+<?php
+/**
+ * Smarty Internal Extension
+ * This file contains the Smarty template extension to create a code frame
+ *
+ * @package    Smarty
+ * @subpackage Template
+ * @author     Uwe Tews
+ */
+
+/**
+ * Class Smarty_Internal_Extension_CodeFrame
+ * Create code frame for compiled and cached templates
+ */
+class Smarty_Internal_Runtime_CodeFrame
+{
+    /**
+     * Create code frame for compiled and cached templates
+     *
+     * @param Smarty_Internal_Template              $_template
+     * @param string                                $content optional template content
+     * @param string                                $functions compiled template function and block code
+     * @param bool                                  $cache   flag for cache file
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler
+     *
+     * @return string
+     */
+    public function create(Smarty_Internal_Template $_template, $content = '', $functions = '', $cache = false,
+                           Smarty_Internal_TemplateCompilerBase $compiler = null)
+    {
+        // build property code
+        $properties[ 'has_nocache_code' ] = $_template->compiled->has_nocache_code;
+        $properties[ 'version' ] = Smarty::SMARTY_VERSION;
+        $properties[ 'unifunc' ] = 'content_' . str_replace(array('.', ','), '_', uniqid('', true));
+        if (!$cache) {
+            $properties[ 'file_dependency' ] = $_template->compiled->file_dependency;
+            $properties[ 'includes' ] = $_template->compiled->includes;
+            if (!empty($compiler->tpl_function)) {
+                $properties[ 'tpl_function' ] = $compiler->tpl_function;
+            }
+        } else {
+            $properties[ 'file_dependency' ] = $_template->cached->file_dependency;
+            $properties[ 'cache_lifetime' ] = $_template->cache_lifetime;
+            if (!empty($_template->tpl_function)) {
+                $properties[ 'tpl_function' ] = $_template->tpl_function;
+            }
+        }
+        $output = "<?php\n";
+        $output .= "/* Smarty version " . Smarty::SMARTY_VERSION . ", created on " . strftime("%Y-%m-%d %H:%M:%S") .
+            "\n  from \"" . $_template->source->filepath . "\" */\n\n";
+
+        $dec = "\$_smarty_tpl->smarty->ext->_validateCompiled->decodeProperties(\$_smarty_tpl, " .
+            var_export($properties, true) . ',' . ($cache ? 'true' : 'false') . ")";
+        $output .= "if ({$dec}) {\n";
+        $output .= "function {$properties['unifunc']} (\$_smarty_tpl) {\n";
+        // include code for plugins
+        if (!$cache) {
+            if (!empty($_template->compiled->required_plugins[ 'compiled' ])) {
+                foreach ($_template->compiled->required_plugins[ 'compiled' ] as $tmp) {
+                    foreach ($tmp as $data) {
+                        $file = addslashes($data[ 'file' ]);
+                        if (is_array($data[ 'function' ])) {
+                            $output .= "if (!is_callable(array('{$data['function'][0]}','{$data['function'][1]}'))) require_once '{$file}';\n";
+                        } else {
+                            $output .= "if (!is_callable('{$data['function']}')) require_once '{$file}';\n";
+                        }
+                    }
+                }
+            }
+            if ($_template->caching && !empty($_template->compiled->required_plugins[ 'nocache' ])) {
+                $_template->compiled->has_nocache_code = true;
+                $output .= "echo '/*%%SmartyNocache:{$_template->compiled->nocache_hash}%%*/<?php \$_smarty = \$_smarty_tpl->smarty; ";
+                foreach ($_template->compiled->required_plugins[ 'nocache' ] as $tmp) {
+                    foreach ($tmp as $data) {
+                        $file = addslashes($data[ 'file' ]);
+                        if (is_Array($data[ 'function' ])) {
+                            $output .= addslashes("if (!is_callable(array('{$data['function'][0]}','{$data['function'][1]}'))) require_once '{$file}';\n");
+                        } else {
+                            $output .= addslashes("if (!is_callable('{$data['function']}')) require_once '{$file}';\n");
+                        }
+                    }
+                }
+                $output .= "?>/*/%%SmartyNocache:{$_template->compiled->nocache_hash}%%*/';\n";
+            }
+        }
+        $output .= "?>\n";
+        $output .= $content;
+        $output .= "<?php }\n?>";
+        $output .= $functions;
+        $output .= "<?php }\n";
+        // remove unneeded PHP tags
+        return preg_replace('/\s*\?>[\n]?<\?php\s*/', "\n", $output);
+    }
+}
\ No newline at end of file
diff --git a/include/smarty/libs/sysplugins/smarty_internal_runtime_filterhandler.php b/include/smarty/libs/sysplugins/smarty_internal_runtime_filterhandler.php
new file mode 100644
index 000000000..4b664c38e
--- /dev/null
+++ b/include/smarty/libs/sysplugins/smarty_internal_runtime_filterhandler.php
@@ -0,0 +1,73 @@
+<?php
+/**
+ * Smarty Internal Plugin Filter Handler
+ * Smarty filter handler class
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+
+/**
+ * Class for filter processing
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ */
+class Smarty_Internal_Runtime_FilterHandler
+{
+    /**
+     * Run filters over content
+     * The filters will be lazy loaded if required
+     * class name format: Smarty_FilterType_FilterName
+     * plugin filename format: filtertype.filtername.php
+     * Smarty2 filter plugins could be used
+     *
+     * @param  string                   $type     the type of filter ('pre','post','output') which shall run
+     * @param  string                   $content  the content which shall be processed by the filters
+     * @param  Smarty_Internal_Template $template template object
+     *
+     * @throws SmartyException
+     * @return string                   the filtered content
+     */
+    public function runFilter($type, $content, Smarty_Internal_Template $template)
+    {
+        // loop over autoload filters of specified type
+        if (!empty($template->smarty->autoload_filters[$type])) {
+            foreach ((array) $template->smarty->autoload_filters[$type] as $name) {
+                $plugin_name = "Smarty_{$type}filter_{$name}";
+                if (function_exists($plugin_name)) {
+                    $callback = $plugin_name;
+                } elseif (class_exists($plugin_name, false) && is_callable(array($plugin_name, 'execute'))) {
+                    $callback = array($plugin_name, 'execute');
+                } elseif ($template->smarty->loadPlugin($plugin_name, false)) {
+                    if (function_exists($plugin_name)) {
+                        // use loaded Smarty2 style plugin
+                        $callback = $plugin_name;
+                    } elseif (class_exists($plugin_name, false) && is_callable(array($plugin_name, 'execute'))) {
+                        // loaded class of filter plugin
+                        $callback = array($plugin_name, 'execute');
+                    } else {
+                        throw new SmartyException("Auto load {$type}-filter plugin method \"{$plugin_name}::execute\" not callable");
+                    }
+                } else {
+                    // nothing found, throw exception
+                    throw new SmartyException("Unable to auto load {$type}-filter plugin \"{$plugin_name}\"");
+                }
+                $content = call_user_func($callback, $content, $template);
+            }
+        }
+        // loop over registered filters of specified type
+        if (!empty($template->smarty->registered_filters[$type])) {
+            foreach ($template->smarty->registered_filters[$type] as $key => $name) {
+                if (is_array($template->smarty->registered_filters[$type][$key])) {
+                    $content = call_user_func($template->smarty->registered_filters[$type][$key], $content, $template);
+                } else {
+                    $content = $template->smarty->registered_filters[$type][$key]($content, $template);
+                }
+            }
+        }
+        // return filtered output
+        return $content;
+    }
+}
diff --git a/include/smarty/libs/sysplugins/smarty_internal_runtime_foreach.php b/include/smarty/libs/sysplugins/smarty_internal_runtime_foreach.php
new file mode 100644
index 000000000..87bb0cf4a
--- /dev/null
+++ b/include/smarty/libs/sysplugins/smarty_internal_runtime_foreach.php
@@ -0,0 +1,44 @@
+<?php
+
+/**
+ * Foreach Runtime Methods count
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ *
+ **/
+class Smarty_Internal_Runtime_Foreach
+{
+    /**
+     * [util function] counts an array, arrayAccess/traversable or PDOStatement object
+     *
+     * @param  mixed $value
+     *
+     * @return int   the count for arrays and objects that implement countable, 1 for other objects that don't, and 0
+     *               for empty elements
+     */
+    public function count($value)
+    {
+        if (is_array($value) === true || $value instanceof Countable) {
+            return count($value);
+        } elseif ($value instanceof IteratorAggregate) {
+            // Note: getIterator() returns a Traversable, not an Iterator
+            // thus rewind() and valid() methods may not be present
+            return iterator_count($value->getIterator());
+        } elseif ($value instanceof Iterator) {
+            return iterator_count($value);
+        } elseif ($value instanceof PDOStatement) {
+            return $value->rowCount();
+        } elseif ($value instanceof Traversable) {
+            return iterator_count($value);
+        } elseif ($value instanceof ArrayAccess) {
+            if ($value->offsetExists(0)) {
+                return 1;
+            }
+        } elseif (is_object($value)) {
+            return count($value);
+        }
+        return 0;
+    }
+}
diff --git a/include/smarty/libs/sysplugins/smarty_internal_runtime_getincludepath.php b/include/smarty/libs/sysplugins/smarty_internal_runtime_getincludepath.php
new file mode 100644
index 000000000..72149cd35
--- /dev/null
+++ b/include/smarty/libs/sysplugins/smarty_internal_runtime_getincludepath.php
@@ -0,0 +1,180 @@
+<?php
+/**
+ * Smarty read include path plugin
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Monte Ohrt
+ */
+
+/**
+ * Smarty Internal Read Include Path Class
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ */
+class Smarty_Internal_Runtime_GetIncludePath
+{
+    /**
+     * include path cache
+     *
+     * @var string
+     */
+    public $_include_path = '';
+
+    /**
+     * include path directory cache
+     *
+     * @var array
+     */
+    public $_include_dirs = array();
+
+    /**
+     * include path directory cache
+     *
+     * @var array
+     */
+    public $_user_dirs = array();
+
+    /**
+     * stream cache
+     *
+     * @var string[]
+     */
+    public $isFile = array();
+
+    /**
+     * stream cache
+     *
+     * @var string[]
+     */
+    public $isPath = array();
+
+    /**
+     * stream cache
+     *
+     * @var int[]
+     */
+    public $number = array();
+
+    /**
+     * status cache
+     *
+     * @var bool
+     */
+    public $_has_stream_include = null;
+
+    /**
+     * Number for array index
+     *
+     * @var int
+     */
+    public $counter = 0;
+
+    /**
+     * Check if include path was updated
+     *
+     * @param \Smarty $smarty
+     *
+     * @return bool
+     */
+    public function isNewIncludePath(Smarty $smarty)
+    {
+        $_i_path = get_include_path();
+        if ($this->_include_path != $_i_path) {
+            $this->_include_dirs = array();
+            $this->_include_path = $_i_path;
+            $_dirs = (array) explode(PATH_SEPARATOR, $_i_path);
+            foreach ($_dirs as $_path) {
+                if (is_dir($_path)) {
+                    $this->_include_dirs[] = $smarty->_realpath($_path . DS, true);
+                }
+            }
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * return array with include path directories
+     *
+     * @param \Smarty $smarty
+     *
+     * @return array
+     */
+    public function getIncludePathDirs(Smarty $smarty)
+    {
+        $this->isNewIncludePath($smarty);
+        return $this->_include_dirs;
+    }
+
+    /**
+     * Return full file path from PHP include_path
+     *
+     * @param  string[] $dirs
+     * @param  string   $file
+     * @param \Smarty   $smarty
+     *
+     * @return bool|string full filepath or false
+     *
+     */
+    public function getIncludePath($dirs, $file, Smarty $smarty)
+    {
+        //if (!(isset($this->_has_stream_include) ? $this->_has_stream_include : $this->_has_stream_include = false)) {
+           if (!(isset($this->_has_stream_include) ? $this->_has_stream_include : $this->_has_stream_include = function_exists('stream_resolve_include_path'))) {
+                $this->isNewIncludePath($smarty);
+        }
+        // try PHP include_path
+        foreach ($dirs as $dir) {
+            $dir_n = isset($this->number[$dir]) ? $this->number[$dir] : $this->number[$dir] = $this->counter ++;
+            if (isset($this->isFile[$dir_n][$file])) {
+                if ($this->isFile[$dir_n][$file]) {
+                    return $this->isFile[$dir_n][$file];
+                } else {
+                    continue;
+                }
+            }
+            if (isset($this->_user_dirs[$dir_n])) {
+                if (false === $this->_user_dirs[$dir_n]) {
+                    continue;
+                } else {
+                    $dir = $this->_user_dirs[$dir_n];
+                }
+            } else {
+                if ($dir[0] == '/' || $dir[1] == ':') {
+                    $dir = str_ireplace(getcwd(), '.', $dir);
+                    if ($dir[0] == '/' || $dir[1] == ':') {
+                        $this->_user_dirs[$dir_n] = false;
+                        continue;
+                    }
+                }
+                $dir = substr($dir, 2);
+                $this->_user_dirs[$dir_n] = $dir;
+            }
+            if ($this->_has_stream_include) {
+                $path = stream_resolve_include_path($dir . (isset($file) ? $file : ''));
+                if ($path) {
+                    return $this->isFile[$dir_n][$file] = $path;
+                }
+            } else {
+                foreach ($this->_include_dirs as $key => $_i_path) {
+                    $path = isset($this->isPath[$key][$dir_n]) ? $this->isPath[$key][$dir_n] : $this->isPath[$key][$dir_n] = is_dir($_dir_path = $_i_path .
+                        $dir) ? $_dir_path : false;
+                    if ($path === false) {
+                        continue;
+                    }
+                    if (isset($file)) {
+                        $_file = $this->isFile[$dir_n][$file] = (is_file($path . $file)) ? $path . $file : false;
+                        if ($_file) {
+                            return $_file;
+                        }
+                    } else {
+                        // no file was given return directory path
+                        return $path;
+                    }
+                }
+            }
+        }
+        return false;
+    }
+}
diff --git a/include/smarty/libs/sysplugins/smarty_internal_runtime_hhvm.php b/include/smarty/libs/sysplugins/smarty_internal_runtime_hhvm.php
new file mode 100644
index 000000000..117cd8166
--- /dev/null
+++ b/include/smarty/libs/sysplugins/smarty_internal_runtime_hhvm.php
@@ -0,0 +1,30 @@
+<?php
+
+/**
+ * Runtime Extension Hhvm
+ *
+ * include patch for modified compiled or cached templates
+ * HHVM does not check if file was modified when including same file multiple times
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Runtime_Hhvm
+{
+    /**
+     * @param \Smarty_Internal_Template $_template
+     * @param string                    $file file name
+     *
+     * @return mixed
+     */
+    static function includeHhvm(Smarty_Internal_Template $_template, $file)
+    {
+        $_smarty_tpl = $_template;
+        $tmp_file = $file . preg_replace('![^\w]+!', '_', uniqid(rand(), true)) . '.php';
+        file_put_contents($tmp_file, file_get_contents($file));
+        $result = @include $tmp_file;
+        @unlink($tmp_file);
+        return $result;
+    }
+}
\ No newline at end of file
diff --git a/include/smarty/libs/sysplugins/smarty_internal_runtime_inheritance.php b/include/smarty/libs/sysplugins/smarty_internal_runtime_inheritance.php
new file mode 100644
index 000000000..ed21281d0
--- /dev/null
+++ b/include/smarty/libs/sysplugins/smarty_internal_runtime_inheritance.php
@@ -0,0 +1,213 @@
+<?php
+
+/**
+ * Inheritance Runtime Methods processBlock, endChild, init
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ *
+ **/
+class Smarty_Internal_Runtime_Inheritance
+{
+
+    /**
+     * State machine
+     * - 0 idle next extends will create a new inheritance tree
+     * - 1 processing child template
+     * - 2 wait for next inheritance template
+     * - 3 assume parent template, if child will loaded goto state 1
+     *     a call to a sub template resets the state to 0
+     *
+     * @var int
+     */
+    public $state = 0;
+
+    /**
+     * Array of block parameter of known {block} tags
+     *
+     * @var array
+     */
+    public $blockParameter = array();
+
+    /**
+     * inheritance template nesting level
+     *
+     * @var int
+     */
+    public $inheritanceLevel = 0;
+
+    /**
+     * inheritance template index
+     *
+     * @var int
+     */
+    public $tplIndex = - 1;
+
+    /**
+     * Array of compiled template file path
+     * - key template index
+     * only used when caching is enabled
+     *
+     * @var []string
+     */
+    public $compiledFilePath = array();
+
+    /**
+     * Current {block} nesting level
+     *
+     * @var int
+     */
+    public $blockNesting = 0;
+
+    /**
+     * Initialize inheritance
+     *
+     * @param \Smarty_Internal_Template $tpl        template object of caller
+     * @param bool                      $initChild  if true init for child template
+     * @param array                     $blockNames outer level block name
+     *
+     */
+    public function init(Smarty_Internal_Template $tpl, $initChild, $blockNames = array())
+    {
+        // if template was from an inner block or template is a parent template create new inheritance root
+        if ($initChild && ($this->blockNesting || $this->state == 3)) {
+            $tpl->ext->_inheritance = new Smarty_Internal_Runtime_Inheritance();
+            $tpl->ext->_inheritance->init($tpl, $initChild, $blockNames);
+            return;
+        }
+        // start of child sub template(s)
+        if ($initChild) {
+            $this->state = 1;
+            if (!$this->inheritanceLevel) {
+                //grab any output of child templates
+                ob_start();
+            }
+            $this->inheritanceLevel ++;
+        }
+        // in parent state {include} will not increment template index
+        if ($this->state != 3) {
+            $this->tplIndex ++;
+        }
+        // if state was waiting for parent change state to parent
+        if ($this->state == 2) {
+            $this->state = 3;
+        }
+    }
+
+    /**
+     * End of child template(s)
+     * - if outer level is reached flush output buffer and switch to wait for parent template state
+     *
+     * @param \Smarty_Internal_Template $tpl template object of caller
+     */
+    public function endChild(Smarty_Internal_Template $tpl)
+    {
+        $this->inheritanceLevel --;
+        if (!$this->inheritanceLevel) {
+            ob_end_clean();
+            $this->state = 2;
+        }
+    }
+
+    /**
+     * Process inheritance {block} tag
+     *
+     * $type 0 = {block}:
+     *  - search in inheritance template hierarchy for child blocks
+     *    if found call it, otherwise call current block
+     *  - ignored for outer level blocks in child templates
+     *
+     * $type 1 = {block}:
+     *  - nested {block}
+     *  - search in inheritance template hierarchy for child blocks
+     *    if found call it, otherwise call current block
+     *
+     * $type 2 = {$smarty.block.child}:
+     *  - search in inheritance template hierarchy for child blocks
+     *    if found call it, otherwise ignore
+     *
+     * $type 3 = {$smarty.block.parent}:
+     *  - get block id from parent stack and call parent block
+     *
+     * @param \Smarty_Internal_Template $tpl       template object of caller
+     * @param int                       $type      call type see above
+     * @param string                    $name      block name
+     * @param array                     $block     block parameter
+     * @param array                     $callStack call stack with block parameters
+     *
+     * @throws \SmartyException
+     */
+    public function processBlock(Smarty_Internal_Template $tpl, $type = 0, $name, $block, $callStack = array())
+    {
+        if (!isset($this->blockParameter[$name])) {
+            $this->blockParameter[$name] = array();
+        }
+        if ($this->state == 1) {
+            $block[2] = count($this->blockParameter[$name]);
+            $block[3] = $this->tplIndex;
+            $this->blockParameter[$name][] = $block;
+            return;
+        }
+        if ($type == 3) {
+            if (!empty($callStack)) {
+                array_shift($callStack);
+                if (empty($callStack)) {
+                    throw new SmartyException("inheritance: tag {\$smarty.block.parent} used in parent template block '{$name}'");
+                }
+                $block = array_shift($callStack);
+            } else {
+                return;
+            }
+        } else {
+            $blockParameter = &$this->blockParameter[$name];
+            if ($type == 0) {
+                $index = $block[2] = count($blockParameter);
+                $block[3] = $this->tplIndex;
+                $callStack = array(&$block);
+            } elseif ($type == 1) {
+                $block[3] = $callStack[0][3];
+                $index = 0;
+                for ($i = 0; $i < count($blockParameter); $i ++) {
+                    if ($blockParameter[$i][3] <= $block[3]) {
+                        $index = $blockParameter[$i][2];
+                    }
+                }
+                $block[2] = $index;
+                $callStack = array(&$block);
+            } else {
+                $index = $callStack[0][2];
+                if ($index == 0) {
+                    return;
+                }
+                $callStack = $block = array(1 => false);
+            }
+            $index --;
+            // find lowest level child block
+            while ($index >= 0 && ($type || !$block[1])) {
+                $block = &$blockParameter[$index];
+                array_unshift($callStack, $block);
+                if ($block[1]) {
+                    break;
+                }
+                $index --;
+            }
+            if (isset($block['hide']) && $index <= 0) {
+                return;
+            }
+        }
+        $this->blockNesting ++;
+        if (isset($block['append'])) {
+            $this->processBlock($tpl, 3, $name, null, $callStack);
+        }
+        if (isset($block[6])) {
+            $block[6]($tpl, $callStack);
+        } else {
+            $block[0]($tpl, $callStack);
+        }
+        if (isset($block['prepend'])) {
+            $this->processBlock($tpl, 3, $name, null, $callStack);
+        }
+        $this->blockNesting --;
+    }
+}
diff --git a/include/smarty/libs/sysplugins/smarty_internal_runtime_subtemplate.php b/include/smarty/libs/sysplugins/smarty_internal_runtime_subtemplate.php
new file mode 100644
index 000000000..2c7623f93
--- /dev/null
+++ b/include/smarty/libs/sysplugins/smarty_internal_runtime_subtemplate.php
@@ -0,0 +1,203 @@
+<?php
+
+/**
+ * Sub Template Runtime Methods render, setupSubTemplate
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ *
+ **/
+class Smarty_Internal_Runtime_SubTemplate
+{
+
+    /**
+     * Subtemplate template object cache
+     *
+     * @var Smarty_Internal_Template[]
+     */
+    public $tplObjects = array();
+
+    /**
+     * Subtemplate call count
+     *
+     * @var int[]
+     */
+    public $subTplInfo = array();
+
+    /**
+     * Runtime function to render subtemplate
+     *
+     * @param \Smarty_Internal_Template $parent
+     * @param string                    $template       template name
+     * @param mixed                     $cache_id       cache id
+     * @param mixed                     $compile_id     compile id
+     * @param integer                   $caching        cache mode
+     * @param integer                   $cache_lifetime life time of cache data
+     * @param array                     $data           passed parameter template variables
+     * @param int                       $scope          scope in which {include} should execute
+     * @param bool                      $forceTplCache  cache template object
+     * @param string                    $uid            file dependency uid
+     * @param string                    $content_func   function name
+     *
+     */
+    public function render(Smarty_Internal_Template $parent, $template, $cache_id, $compile_id, $caching,
+                           $cache_lifetime, $data, $scope, $forceTplCache, $uid = null, $content_func = null)
+    {
+        // if there are cached template objects calculate $templateID
+        $_templateId =
+            !empty($this->tplObjects) ? $parent->smarty->_getTemplateId($template, $cache_id, $compile_id, $caching) :
+                null;
+        // already in template cache?
+        /* @var Smarty_Internal_Template $tpl */
+        if (isset($_templateId) && isset($this->tplObjects[$_templateId])) {
+            // clone cached template object because of possible recursive call
+            $tpl = clone $this->tplObjects[$_templateId];
+            $tpl->parent = $parent;
+            // if $caching mode changed the compiled resource is invalid
+            if ((bool) $tpl->caching !== (bool) $caching) {
+                unset($tpl->compiled);
+            }
+            // get variables from calling scope
+            $tpl->tpl_vars = $parent->tpl_vars;
+            $tpl->config_vars = $parent->config_vars;
+            // get template functions
+            $tpl->tpl_function = $parent->tpl_function;
+            // copy inheritance object?
+            if (isset($parent->ext->_inheritance)) {
+                $tpl->ext->_inheritance = $parent->ext->_inheritance;
+            } else {
+                unset($tpl->ext->_inheritance);
+            }
+        } else {
+            $tpl = clone $parent;
+            $tpl->parent = $parent;
+            if (!isset($tpl->templateId) || $tpl->templateId !== $_templateId) {
+                $tpl->templateId = $_templateId;
+                $tpl->template_resource = $template;
+                $tpl->cache_id = $cache_id;
+                $tpl->compile_id = $compile_id;
+                if (isset($uid)) {
+                    // for inline templates we can get all resource information from file dependency
+                    if (isset($tpl->compiled->file_dependency[$uid])) {
+                        list($filepath, $timestamp, $resource) = $tpl->compiled->file_dependency[$uid];
+                        $tpl->source =
+                            new Smarty_Template_Source(isset($tpl->smarty->_cache['resource_handlers'][$resource]) ?
+                                                           $tpl->smarty->_cache['resource_handlers'][$resource] :
+                                                           Smarty_Resource::load($tpl->smarty, $resource), $tpl->smarty,
+                                                       $filepath, $resource, $filepath);
+                        $tpl->source->filepath = $filepath;
+                        $tpl->source->timestamp = $timestamp;
+                        $tpl->source->exists = true;
+                        $tpl->source->uid = $uid;
+                    } else {
+                        $tpl->source = null;
+                    }
+                } else {
+                    $tpl->source = null;
+                }
+                if (!isset($tpl->source)) {
+                    $tpl->source = Smarty_Template_Source::load($tpl);
+                    unset($tpl->compiled);
+                }
+                unset($tpl->cached);
+            }
+        }
+        $tpl->caching = $caching;
+        $tpl->cache_lifetime = $cache_lifetime;
+        if ($caching == 9999) {
+            $tpl->cached = $parent->cached;
+        }
+        // set template scope
+        $tpl->scope = $scope;
+        $scopePtr = false;
+        if ($scope & ~Smarty::SCOPE_BUBBLE_UP) {
+            if ($scope == Smarty::SCOPE_GLOBAL) {
+                $tpl->tpl_vars = Smarty::$global_tpl_vars;
+                $tpl->config_vars = $tpl->smarty->config_vars;
+                $scopePtr = true;
+            } else {
+                if ($scope == Smarty::SCOPE_PARENT) {
+                    $scopePtr = $parent;
+                } elseif ($scope == Smarty::SCOPE_SMARTY) {
+                    $scopePtr = $tpl->smarty;
+                } else {
+                    $scopePtr = $tpl;
+                    while (isset($scopePtr->parent)) {
+                        if ($scopePtr->parent->_objType != 2 && $scope & Smarty::SCOPE_TPL_ROOT) {
+                            break;
+                        }
+                        $scopePtr = $scopePtr->parent;
+                    }
+                }
+                $tpl->tpl_vars = $scopePtr->tpl_vars;
+                $tpl->config_vars = $scopePtr->config_vars;
+            }
+        }
+
+        if (!isset($this->tplObjects[$tpl->_getTemplateId()]) && !$tpl->source->handler->recompiled) {
+            // if template is called multiple times set flag to to cache template objects
+            $forceTplCache = $forceTplCache ||
+                (isset($this->subTplInfo[$tpl->template_resource]) && $this->subTplInfo[$tpl->template_resource] > 1);
+            // check if template object should be cached
+            if ($tpl->parent->_objType == 2 && isset($this->tplObjects[$tpl->parent->templateId]) ||
+                ($forceTplCache && $tpl->smarty->resource_cache_mode & Smarty::RESOURCE_CACHE_AUTOMATIC) ||
+                ($tpl->smarty->resource_cache_mode & Smarty::RESOURCE_CACHE_ON)
+            ) {
+                $this->tplObjects[$tpl->_getTemplateId()] = $tpl;
+            }
+        }
+
+        if (!empty($data)) {
+            // set up variable values
+            foreach ($data as $_key => $_val) {
+                $tpl->tpl_vars[$_key] = new Smarty_Variable($_val);
+            }
+        }
+        if (isset($uid)) {
+            if ($parent->smarty->debugging) {
+                $parent->smarty->_debug->start_template($tpl);
+                $parent->smarty->_debug->start_render($tpl);
+            }
+            $tpl->compiled->getRenderedTemplateCode($tpl, $content_func);
+            if ($parent->smarty->debugging) {
+                $parent->smarty->_debug->end_template($tpl);
+                $parent->smarty->_debug->end_render($tpl);
+            }
+            if ($tpl->caching == 9999 && $tpl->compiled->has_nocache_code) {
+                $parent->cached->hashes[$tpl->compiled->nocache_hash] = true;
+            }
+        } else {
+            if (isset($tpl->compiled)) {
+                $tpl->compiled->render($tpl);
+            } else {
+                $tpl->render();
+            }
+        }
+        if ($scopePtr) {
+            if ($scope == Smarty::SCOPE_GLOBAL) {
+                Smarty::$global_tpl_vars = $tpl->tpl_vars;
+                $tpl->smarty->config_vars = $tpl->config_vars;
+            } else {
+                $scopePtr->tpl_vars = $tpl->tpl_vars;
+                $scopePtr->config_vars = $tpl->config_vars;
+            }
+        }
+    }
+
+    /**
+     * Get called subtemplates from compiled template and save call count
+     *
+     * @param \Smarty_Internal_Template $tpl
+     */
+    public function registerSubTemplates(Smarty_Internal_Template $tpl)
+    {
+        foreach ($tpl->compiled->includes as $name => $count) {
+            if (isset($this->subTplInfo[$name])) {
+                $this->subTplInfo[$name] += $count;
+            } else {
+                $this->subTplInfo[$name] = $count;
+            }
+        }
+    }
+}
diff --git a/include/smarty/libs/sysplugins/smarty_internal_runtime_tplfunction.php b/include/smarty/libs/sysplugins/smarty_internal_runtime_tplfunction.php
new file mode 100644
index 000000000..cc529c633
--- /dev/null
+++ b/include/smarty/libs/sysplugins/smarty_internal_runtime_tplfunction.php
@@ -0,0 +1,97 @@
+<?php
+
+/**
+ * Tplfunc Runtime Methods callTemplateFunction
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ *
+ **/
+class Smarty_Internal_Runtime_TplFunction
+{
+    /**
+     * Call template function
+     *
+     * @param \Smarty_Internal_Template $tpl     template object
+     * @param string                    $name    template function name
+     * @param array                     $params  parameter array
+     * @param bool                      $nocache true if called nocache
+     *
+     * @throws \SmartyException
+     */
+    public function callTemplateFunction(\Smarty_Internal_Template $tpl, $name, $params, $nocache)
+    {
+        if (isset($tpl->tpl_function[$name])) {
+            if (!$tpl->caching || ($tpl->caching && $nocache)) {
+                $function = $tpl->tpl_function[$name]['call_name'];
+            } else {
+                if (isset($tpl->tpl_function[$name]['call_name_caching'])) {
+                    $function = $tpl->tpl_function[$name]['call_name_caching'];
+                } else {
+                    $function = $tpl->tpl_function[$name]['call_name'];
+                }
+            }
+            if (function_exists($function)) {
+                $function ($tpl, $params);
+                return;
+            }
+            // try to load template function dynamically
+            if ($this->addTplFuncToCache($tpl, $name, $function)) {
+                $function ($tpl, $params);
+                return;
+            }
+        }
+        throw new SmartyException("Unable to find template function '{$name}'");
+    }
+
+    /**
+     *
+     * Add template function to cache file for nocache calls
+     *
+     * @param Smarty_Internal_Template $tpl
+     * @param string                   $_name     template function name
+     * @param string                   $_function PHP function name
+     *
+     * @return bool
+     */
+    public function addTplFuncToCache(Smarty_Internal_Template $tpl, $_name, $_function)
+    {
+        $funcParam = $tpl->tpl_function[$_name];
+        if (is_file($funcParam['compiled_filepath'])) {
+            // read compiled file
+            $code = file_get_contents($funcParam['compiled_filepath']);
+            // grab template function
+            if (preg_match("/\/\* {$_function} \*\/([\S\s]*?)\/\*\/ {$_function} \*\//", $code, $match)) {
+                // grab source info from file dependency
+                preg_match("/\s*'{$funcParam['uid']}'([\S\s]*?)\),/", $code, $match1);
+                unset($code);
+                // make PHP function known
+                eval($match[0]);
+                if (function_exists($_function)) {
+                    // search cache file template
+                    $tplPtr = $tpl;
+                    while (!isset($tplPtr->cached) && isset($tplPtr->parent)) {
+                        $tplPtr = $tplPtr->parent;
+                    }
+                    // add template function code to cache file
+                    if (isset($tplPtr->cached)) {
+                        $cache = $tplPtr->cached;
+                        $content = $cache->read($tplPtr);
+                        if ($content) {
+                            // check if we must update file dependency
+                            if (!preg_match("/'{$funcParam['uid']}'(.*?)'nocache_hash'/", $content, $match2)) {
+                                $content = preg_replace("/('file_dependency'(.*?)\()/", "\\1{$match1[0]}", $content);
+                            }
+                            $tplPtr->smarty->ext->_updateCache->write($cache, $tplPtr, preg_replace('/\s*\?>\s*$/', "\n", $content) . "\n" .
+                                                 preg_replace(array('/^\s*<\?php\s+/', '/\s*\?>\s*$/'), "\n",
+                                                              $match[0]));
+                        }
+                    }
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+}
diff --git a/include/smarty/libs/sysplugins/smarty_internal_runtime_updatecache.php b/include/smarty/libs/sysplugins/smarty_internal_runtime_updatecache.php
new file mode 100644
index 000000000..73de954f3
--- /dev/null
+++ b/include/smarty/libs/sysplugins/smarty_internal_runtime_updatecache.php
@@ -0,0 +1,184 @@
+<?php
+
+/**
+ * Inline Runtime Methods render, setSourceByUid, setupSubTemplate
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ *
+ **/
+class Smarty_Internal_Runtime_UpdateCache
+{
+    /**
+     * check client side cache
+     *
+     * @param \Smarty_Template_Cached  $cached
+     * @param Smarty_Internal_Template $_template
+     * @param  string                  $content
+     */
+    public function cacheModifiedCheck(Smarty_Template_Cached $cached, Smarty_Internal_Template $_template, $content)
+    {
+    }
+
+    /**
+     * Sanitize content and write it to cache resource
+     *
+     * @param \Smarty_Template_Cached  $cached
+     * @param Smarty_Internal_Template $_template
+     * @param bool                     $no_output_filter
+     *
+     * @throws \SmartyException
+     */
+    public function removeNoCacheHash(Smarty_Template_Cached $cached, Smarty_Internal_Template $_template,
+                                      $no_output_filter)
+    {
+        $content = ob_get_clean();
+        unset($cached->hashes[$_template->compiled->nocache_hash]);
+        if (!empty($cached->hashes)) {
+            $hash_array = array();
+            foreach ($cached->hashes as $hash => $foo) {
+                $hash_array[] = "/{$hash}/";
+            }
+            $content = preg_replace($hash_array, $_template->compiled->nocache_hash, $content);
+        }
+        $_template->cached->has_nocache_code = false;
+        // get text between non-cached items
+        $cache_split =
+            preg_split("!/\*%%SmartyNocache:{$_template->compiled->nocache_hash}%%\*\/(.+?)/\*/%%SmartyNocache:{$_template->compiled->nocache_hash}%%\*/!s",
+                       $content);
+        // get non-cached items
+        preg_match_all("!/\*%%SmartyNocache:{$_template->compiled->nocache_hash}%%\*\/(.+?)/\*/%%SmartyNocache:{$_template->compiled->nocache_hash}%%\*/!s",
+                       $content, $cache_parts);
+        $content = '';
+        // loop over items, stitch back together
+        foreach ($cache_split as $curr_idx => $curr_split) {
+            // escape PHP tags in template content
+            $content .= preg_replace('/(<%|%>|<\?php|<\?|\?>|<script\s+language\s*=\s*[\"\']?\s*php\s*[\"\']?\s*>)/',
+                                     "<?php echo '\$1'; ?>\n", $curr_split);
+            if (isset($cache_parts[0][$curr_idx])) {
+                $_template->cached->has_nocache_code = true;
+                $content .= $cache_parts[1][$curr_idx];
+            }
+        }
+        if (!$no_output_filter && !$_template->compiled->has_nocache_code &&
+            (isset($_template->smarty->autoload_filters['output']) ||
+                isset($_template->smarty->registered_filters['output']))
+        ) {
+            $content = $_template->smarty->ext->_filterHandler->runFilter('output', $content, $_template);
+        }
+        // write cache file content
+        $this->writeCachedContent($cached, $_template, $content);
+    }
+
+    /**
+     * Cache was invalid , so render from compiled and write to cache
+     * 
+     * @param \Smarty_Template_Cached   $cached
+     * @param \Smarty_Internal_Template $_template
+     * @param                           $no_output_filter
+     *
+     * @throws \Exception
+     */
+    public function updateCache(Smarty_Template_Cached $cached, Smarty_Internal_Template $_template, $no_output_filter)
+    {
+        if ($_template->source->handler->uncompiled) {
+            ob_start();
+            $_template->source->render($_template);
+        } else {
+            ob_start();
+            if (!isset($_template->compiled)) {
+                $_template->loadCompiled();
+            }
+            $_template->compiled->render($_template);
+        }
+        if ($_template->smarty->debugging) {
+            $_template->smarty->_debug->start_cache($_template);
+        }
+        $this->removeNoCacheHash($cached, $_template, $no_output_filter);
+        $compile_check = $_template->smarty->compile_check;
+        $_template->smarty->compile_check = false;
+        if (isset($_template->parent) && $_template->parent->_objType == 2) {
+            $_template->compiled->unifunc = $_template->parent->compiled->unifunc;
+        }
+        if (!$_template->cached->processed) {
+            $_template->cached->process($_template, true);
+        }
+        $_template->smarty->compile_check = $compile_check;
+        $cached->getRenderedTemplateCode($_template);
+        if ($_template->smarty->debugging) {
+            $_template->smarty->_debug->end_cache($_template);
+        }
+    }
+
+    /**
+     * Writes the content to cache resource
+     *
+     * @param \Smarty_Template_Cached  $cached
+     * @param Smarty_Internal_Template $_template
+     * @param string                   $content
+     *
+     * @return bool
+     */
+    public function writeCachedContent(Smarty_Template_Cached $cached, Smarty_Internal_Template $_template, $content)
+    {
+        if ($_template->source->handler->recompiled || !($_template->caching == Smarty::CACHING_LIFETIME_CURRENT ||
+                $_template->caching == Smarty::CACHING_LIFETIME_SAVED)
+        ) {
+            // don't write cache file
+            return false;
+        }
+        $content = $_template->smarty->ext->_codeFrame->create($_template, $content, '', true);
+        if (!empty($_template->cached->tpl_function)) {
+            foreach ($_template->cached->tpl_function as $funcParam) {
+                if (is_file($funcParam['compiled_filepath'])) {
+                    // read compiled file
+                    $code = file_get_contents($funcParam['compiled_filepath']);
+                    // grab template function
+                    if (preg_match("/\/\* {$funcParam['call_name']} \*\/([\S\s]*?)\/\*\/ {$funcParam['call_name']} \*\//",
+                                   $code, $match)) {
+                        unset($code);
+                        $content .= "<?php " . $match[0] . "?>\n";
+                    }
+                }
+            }
+        }
+        return $this->write($cached, $_template, $content);
+    }
+
+    /**
+     * Write this cache object to handler
+     *
+     * @param \Smarty_Template_Cached  $cached
+     * @param Smarty_Internal_Template $_template template object
+     * @param string                   $content   content to cache
+     *
+     * @return bool success
+     */
+    public function write(Smarty_Template_Cached $cached, Smarty_Internal_Template $_template, $content)
+    {
+        if (!$_template->source->handler->recompiled) {
+            if ($cached->handler->writeCachedContent($_template, $content)) {
+                $cached->content = null;
+                $cached->timestamp = time();
+                $cached->exists = true;
+                $cached->valid = true;
+                $cached->cache_lifetime = $_template->cache_lifetime;
+                $cached->processed = false;
+                if ($_template->smarty->cache_locking) {
+                    $cached->handler->releaseLock($_template->smarty, $cached);
+                }
+
+                return true;
+            }
+            $cached->content = null;
+            $cached->timestamp = false;
+            $cached->exists = false;
+            $cached->valid = false;
+            $cached->processed = false;
+        }
+
+        return false;
+    }
+
+}
\ No newline at end of file
diff --git a/include/smarty/libs/sysplugins/smarty_internal_runtime_updatescope.php b/include/smarty/libs/sysplugins/smarty_internal_runtime_updatescope.php
new file mode 100644
index 000000000..3d80c859a
--- /dev/null
+++ b/include/smarty/libs/sysplugins/smarty_internal_runtime_updatescope.php
@@ -0,0 +1,55 @@
+<?php
+
+/**
+ * Runtime Methods updateScope
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ *
+ **/
+class Smarty_Internal_Runtime_UpdateScope
+{
+    /**
+     * Update new assigned template variable in other effected scopes
+     *
+     * @param \Smarty_Internal_Template $tpl     template object
+     * @param string $varName variable name
+     * @param int    $scope   scope to which bubble up variable value
+     */
+    public function updateScope(\Smarty_Internal_Template $tpl, $varName, $scope = Smarty::SCOPE_LOCAL)
+    {
+        if (!$scope && !$tpl->scope) {
+            return;
+        }
+        foreach (array($scope, $tpl->scope) as $s) {
+            $s = ($bubble_up = $s >= Smarty::SCOPE_BUBBLE_UP) ? $s - Smarty::SCOPE_BUBBLE_UP : $s;
+            if ($bubble_up && $s) {
+                $ptr = $tpl->parent;
+                if (isset($ptr)) {
+                    $ptr->tpl_vars[$varName] = $tpl->tpl_vars[$varName];
+                    $ptr = $ptr->parent;
+                }
+                if ($s == Smarty::SCOPE_PARENT) {
+                    continue;
+                }
+                while (isset($ptr) && $ptr->_objType == 2) {
+                    $ptr->tpl_vars[$varName] = $tpl->tpl_vars[$varName];
+                    $ptr = $ptr->parent;
+                }
+                if ($s == Smarty::SCOPE_TPL_ROOT) {
+                    continue;
+                } elseif ($s == Smarty::SCOPE_SMARTY) {
+                    $tpl->smarty->tpl_vars[$varName] = $tpl->tpl_vars[$varName];
+                } elseif ($s == Smarty::SCOPE_GLOBAL) {
+                    Smarty::$global_tpl_vars[$varName] = $tpl->tpl_vars[$varName];
+                } elseif ($s == Smarty::SCOPE_ROOT) {
+                    while (isset($ptr->parent)) {
+                        $ptr = $ptr->parent;
+                    }
+                    $ptr->tpl_vars[$varName] = $tpl->tpl_vars[$varName];
+                }
+            }
+        }
+    }
+}
diff --git a/include/smarty/libs/sysplugins/smarty_internal_runtime_validatecompiled.php b/include/smarty/libs/sysplugins/smarty_internal_runtime_validatecompiled.php
new file mode 100644
index 000000000..6624eb0bf
--- /dev/null
+++ b/include/smarty/libs/sysplugins/smarty_internal_runtime_validatecompiled.php
@@ -0,0 +1,81 @@
+<?php
+
+/**
+ * Runtime Methods decodeProperties
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ *
+ **/
+class Smarty_Internal_Runtime_ValidateCompiled
+{
+    /**
+     * This function is executed automatically when a compiled or cached template file is included
+     * - Decode saved properties from compiled template and cache files
+     * - Check if compiled or cache file is valid
+     *
+     * @param  array $properties special template properties
+     * @param  bool  $cache      flag if called from cache file
+     *
+     * @return bool  flag if compiled or cache file is valid
+     */
+    public function decodeProperties(Smarty_Internal_Template $tpl, $properties, $cache = false)
+    {
+        $is_valid = true;
+        if (Smarty::SMARTY_VERSION != $properties['version']) {
+            // new version must rebuild
+            $is_valid = false;
+        } elseif ($is_valid && !empty($properties['file_dependency']) &&
+            ((!$cache && $tpl->smarty->compile_check) || $tpl->smarty->compile_check == 1)
+        ) {
+            // check file dependencies at compiled code
+            foreach ($properties['file_dependency'] as $_file_to_check) {
+                if ($_file_to_check[2] == 'file' || $_file_to_check[2] == 'extends' || $_file_to_check[2] == 'php') {
+                    if ($tpl->source->filepath == $_file_to_check[0]) {
+                        // do not recheck current template
+                        continue;
+                        //$mtime = $tpl->source->getTimeStamp();
+                    } else {
+                        // file and php types can be checked without loading the respective resource handlers
+                        $mtime = is_file($_file_to_check[0]) ? filemtime($_file_to_check[0]) : false;
+                    }
+                } elseif ($_file_to_check[2] == 'string') {
+                    continue;
+                } else {
+                    $source = Smarty_Template_Source::load(null, $tpl->smarty, $_file_to_check[0]);
+                    $mtime = $source->getTimeStamp();
+                }
+                if (!$mtime || $mtime > $_file_to_check[1]) {
+                    $is_valid = false;
+                    break;
+                }
+            }
+        }
+        if ($cache) {
+            // CACHING_LIFETIME_SAVED cache expiry has to be validated here since otherwise we'd define the unifunc
+            if ($tpl->caching === Smarty::CACHING_LIFETIME_SAVED && $properties['cache_lifetime'] >= 0 &&
+                (time() > ($tpl->cached->timestamp + $properties['cache_lifetime']))
+            ) {
+                $is_valid = false;
+            }
+            $tpl->cached->cache_lifetime = $properties['cache_lifetime'];
+            $tpl->cached->valid = $is_valid;
+            $resource = $tpl->cached;
+        } else {
+            $tpl->mustCompile = !$is_valid;
+            $resource = $tpl->compiled;
+            $resource->includes = isset($properties['includes']) ? $properties['includes'] : array();
+        }
+        if ($is_valid) {
+            $resource->unifunc = $properties['unifunc'];
+            $resource->has_nocache_code = $properties['has_nocache_code'];
+            //            $tpl->compiled->nocache_hash = $properties['nocache_hash'];
+            $resource->file_dependency = $properties['file_dependency'];
+            if (isset($properties['tpl_function'])) {
+                $tpl->tpl_function = $properties['tpl_function'];
+            }
+        }
+        return $is_valid && !function_exists($properties['unifunc']);
+    }
+}
diff --git a/include/smarty/libs/sysplugins/smarty_internal_runtime_var.php b/include/smarty/libs/sysplugins/smarty_internal_runtime_var.php
new file mode 100644
index 000000000..fe4f94d91
--- /dev/null
+++ b/include/smarty/libs/sysplugins/smarty_internal_runtime_var.php
@@ -0,0 +1,33 @@
+<?php
+
+/**
+ * Runtime Methods createLocalArrayVariable
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ *
+ **/
+class Smarty_Internal_Runtime_Var
+{
+    /**
+     * Template code runtime function to create a local Smarty variable for array assignments
+     *
+     * @param \Smarty_Internal_Template $tpl     template object
+     * @param string                    $varName template variable name
+     * @param bool                      $nocache cache mode of variable
+     */
+    public function createLocalArrayVariable(\Smarty_Internal_Template $tpl, $varName, $nocache = false)
+    {
+        if (!isset($tpl->tpl_vars[$varName])) {
+            $tpl->tpl_vars[$varName] = new Smarty_Variable(array(), $nocache);
+        } else {
+            $tpl->tpl_vars[$varName] = clone $tpl->tpl_vars[$varName];
+            if (!(is_array($tpl->tpl_vars[$varName]->value) ||
+                $tpl->tpl_vars[$varName]->value instanceof ArrayAccess)
+            ) {
+                settype($tpl->tpl_vars[$varName]->value, 'array');
+            }
+        }
+    }
+}
diff --git a/include/smarty/libs/sysplugins/smarty_internal_write_file.php b/include/smarty/libs/sysplugins/smarty_internal_runtime_writefile.php
index e5d19ce8d..05c973783 100644
--- a/include/smarty/libs/sysplugins/smarty_internal_write_file.php
+++ b/include/smarty/libs/sysplugins/smarty_internal_runtime_writefile.php
@@ -2,59 +2,64 @@
 /**
  * Smarty write file plugin
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage PluginsInternal
- * @author Monte Ohrt
+ * @author     Monte Ohrt
  */
 
 /**
  * Smarty Internal Write File Class
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage PluginsInternal
  */
-class Smarty_Internal_Write_File {
-
+class Smarty_Internal_Runtime_WriteFile
+{
     /**
      * Writes file in a safe way to disk
      *
-     * @param string $_filepath complete filepath
-     * @param string $_contents file content
-     * @param Smarty $smarty    smarty instance
+     * @param  string $_filepath complete filepath
+     * @param  string $_contents file content
+     * @param  Smarty $smarty    smarty instance
+     *
+     * @throws SmartyException
      * @return boolean true
      */
-    public static function writeFile($_filepath, $_contents, Smarty $smarty)
+    public function writeFile($_filepath, $_contents, Smarty $smarty)
     {
         $_error_reporting = error_reporting();
         error_reporting($_error_reporting & ~E_NOTICE & ~E_WARNING);
-        if ($smarty->_file_perms !== null) {
+        $_file_perms = property_exists($smarty, '_file_perms') ? $smarty->_file_perms : 0644;
+        $_dir_perms = property_exists($smarty, '_dir_perms') ? (isset($smarty->_dir_perms) ? $smarty->_dir_perms : 0777)  : 0771;
+        if ($_file_perms !== null) {
             $old_umask = umask(0);
         }
 
         $_dirpath = dirname($_filepath);
         // if subdirs, create dir structure
         if ($_dirpath !== '.' && !file_exists($_dirpath)) {
-            mkdir($_dirpath, $smarty->_dir_perms === null ? 0777 : $smarty->_dir_perms, true);
+            mkdir($_dirpath, $_dir_perms, true);
         }
 
         // write to tmp file, then move to overt file lock race condition
-        $_tmp_file = $_dirpath . DS . uniqid('wrt', true);
+        $_tmp_file = $_dirpath . DS . str_replace(array('.', ','), '_', uniqid('wrt', true));
         if (!file_put_contents($_tmp_file, $_contents)) {
             error_reporting($_error_reporting);
             throw new SmartyException("unable to write file {$_tmp_file}");
-            return false;
-        }
-        
+       }
+
         /*
          * Windows' rename() fails if the destination exists,
          * Linux' rename() properly handles the overwrite.
-         * Simply unlink()ing a file might cause other processes 
+         * Simply unlink()ing a file might cause other processes
          * currently reading that file to fail, but linux' rename()
          * seems to be smart enough to handle that for us.
          */
         if (Smarty::$_IS_WINDOWS) {
             // remove original file
-            @unlink($_filepath);
+            if (is_file($_filepath)) {
+                @unlink($_filepath);
+            }
             // rename tmp file
             $success = @rename($_tmp_file, $_filepath);
         } else {
@@ -62,27 +67,24 @@ 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}");
-            return false;
         }
-
-        if ($smarty->_file_perms !== null) {
+        if ($_file_perms !== null) {
             // set file permissions
-            chmod($_filepath, $smarty->_file_perms);
+            chmod($_filepath, $_file_perms);
             umask($old_umask);
         }
         error_reporting($_error_reporting);
+
         return true;
     }
-
 }
-
-?>
\ No newline at end of file
diff --git a/include/smarty/libs/sysplugins/smarty_internal_smartytemplatecompiler.php b/include/smarty/libs/sysplugins/smarty_internal_smartytemplatecompiler.php
index 1ec1aa430..116bbea7b 100644
--- a/include/smarty/libs/sysplugins/smarty_internal_smartytemplatecompiler.php
+++ b/include/smarty/libs/sysplugins/smarty_internal_smartytemplatecompiler.php
@@ -1,27 +1,21 @@
 <?php
 /**
  * Smarty Internal Plugin Smarty Template Compiler Base
+ * This file contains the basic classes and methods for compiling Smarty templates with lexer/parser
  *
- * This file contains the basic classes and methodes for compiling Smarty templates with lexer/parser
- *
- * @package Smarty
+ * @package    Smarty
  * @subpackage Compiler
- * @author Uwe Tews
+ * @author     Uwe Tews
  */
 
 /**
- * @ignore
- */
-include ("smarty_internal_parsetree.php");
-
-/**
  * Class SmartyTemplateCompiler
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage Compiler
  */
-class Smarty_Internal_SmartyTemplateCompiler extends Smarty_Internal_TemplateCompilerBase {
-
+class Smarty_Internal_SmartyTemplateCompiler extends Smarty_Internal_TemplateCompilerBase
+{
     /**
      * Lexer class name
      *
@@ -37,32 +31,32 @@ class Smarty_Internal_SmartyTemplateCompiler extends Smarty_Internal_TemplateCom
     public $parser_class;
 
     /**
-     * Lexer object
+     * array of vars which can be compiled in local scope
      *
-     * @var object
+     * @var array
      */
-    public $lex;
+    public $local_var = array();
 
     /**
-     * Parser object
+     * array of callbacks called when the normal compile process of template is finished
      *
-     * @var object
+     * @var array
      */
-    public $parser;
+    public $postCompileCallbacks = array();
 
     /**
-     * Smarty object
+     * prefix code
      *
-     * @var object
+     * @var string
      */
-    public $smarty;
+    public $prefixCompiledCode = '';
 
     /**
-     * array of vars which can be compiled in local scope
+     * postfix code
      *
-     * @var array
+     * @var string
      */
-    public $local_var = array();
+    public $postfixCompiledCode = '';
 
     /**
      * Initialize compiler
@@ -71,57 +65,105 @@ class Smarty_Internal_SmartyTemplateCompiler extends Smarty_Internal_TemplateCom
      * @param string $parser_class class name
      * @param Smarty $smarty       global instance
      */
-    public function __construct($lexer_class, $parser_class, $smarty)
+    public function __construct($lexer_class, $parser_class, Smarty $smarty)
     {
-        $this->smarty = $smarty;
-        parent::__construct();
+        parent::__construct($smarty);
         // get required plugins
         $this->lexer_class = $lexer_class;
         $this->parser_class = $parser_class;
     }
 
     /**
-     * Methode to compile a Smarty template
+     * method to compile a Smarty template
      *
      * @param  mixed $_content template source
+     * @param bool   $isTemplateSource
+     *
      * @return bool true if compiling succeeded, false if it failed
+     * @throws \SmartyCompilerException
      */
-    protected function doCompile($_content)
+    protected function doCompile($_content, $isTemplateSource = false)
     {
         /* here is where the compiling takes place. Smarty
           tags in the templates are replaces with PHP code,
           then written to compiled files. */
         // init the lexer/parser to compile the template
-        $this->lex = new $this->lexer_class($_content, $this);
-        $this->parser = new $this->parser_class($this->lex, $this);
-        if ($this->smarty->_parserdebug)
+        $this->parser =
+            new $this->parser_class(new $this->lexer_class(str_replace(array("\r\n", "\r"), "\n", $_content), $this),
+                                    $this);
+        if ($isTemplateSource && $this->template->caching) {
+            $this->parser->insertPhpCode("<?php\n\$_smarty_tpl->compiled->nocache_hash = '{$this->nocache_hash}';\n?>\n");
+        }
+        if (function_exists('mb_internal_encoding') && ((int) ini_get('mbstring.func_overload')) & 2) {
+            $mbEncoding = mb_internal_encoding();
+            mb_internal_encoding('ASCII');
+        } else {
+            $mbEncoding = null;
+        }
+
+        if ($this->smarty->_parserdebug) {
             $this->parser->PrintTrace();
+            $this->parser->lex->PrintTrace();
+        }
         // get tokens from lexer and parse them
-        while ($this->lex->yylex() && !$this->abort_and_recompile) {
+        while ($this->parser->lex->yylex()) {
             if ($this->smarty->_parserdebug) {
-                echo "<pre>Line {$this->lex->line} Parsing  {$this->parser->yyTokenName[$this->lex->token]} Token " .
-                    htmlentities($this->lex->value) . "</pre>";
+                echo "<pre>Line {$this->parser->lex->line} Parsing  {$this->parser->yyTokenName[$this->parser->lex->token]} Token " .
+                    htmlentities($this->parser->lex->value) . "</pre>";
             }
-            $this->parser->doParse($this->lex->token, $this->lex->value);
+            $this->parser->doParse($this->parser->lex->token, $this->parser->lex->value);
         }
 
-        if ($this->abort_and_recompile) {
-            // exit here on abort
-            return false;
-        }
         // finish parsing process
         $this->parser->doParse(0, 0);
+        if ($mbEncoding) {
+            mb_internal_encoding($mbEncoding);
+        }
         // check for unclosed tags
         if (count($this->_tag_stack) > 0) {
             // get stacked info
             list($openTag, $_data) = array_pop($this->_tag_stack);
-            $this->trigger_template_error("unclosed {" . $openTag . "} tag");
+            $this->trigger_template_error("unclosed {$this->smarty->left_delimiter}" . $openTag .
+                                          "{$this->smarty->right_delimiter} tag");
+        }
+        // call post compile callbacks
+        foreach ($this->postCompileCallbacks as $cb) {
+            $parameter = $cb;
+            $parameter[0] = $this;
+            call_user_func_array($cb[0], $parameter);
         }
         // return compiled code
-        // return str_replace(array("? >\n<?php","? ><?php"), array('',''), $this->parser->retvalue);
-        return $this->parser->retvalue;
+        return $this->prefixCompiledCode . $this->parser->retvalue . $this->postfixCompiledCode;
     }
 
-}
+    /**
+     * Register a post compile callback
+     * - when the callback is called after template compiling the compiler object will be inserted as first parameter
+     *
+     * @param callback $callback
+     * @param array    $parameter optional parameter array
+     * @param string   $key       optional key for callback
+     * @param bool     $replace   if true replace existing keyed callback
+     */
+    public function registerPostCompileCallback($callback, $parameter = array(), $key = null, $replace = false)
+    {
+        array_unshift($parameter, $callback);
+        if (isset($key)) {
+            if ($replace || !isset($this->postCompileCallbacks[$key])) {
+                $this->postCompileCallbacks[$key] = $parameter;
+            }
+        } else {
+            $this->postCompileCallbacks[] = $parameter;
+        }
+    }
 
-?>
\ No newline at end of file
+    /**
+     * Remove a post compile callback
+     *
+     * @param string $key callback key
+     */
+    public function unregisterPostCompileCallback($key)
+    {
+        unset($this->postCompileCallbacks[$key]);
+    }
+}
diff --git a/include/smarty/libs/sysplugins/smarty_internal_template.php b/include/smarty/libs/sysplugins/smarty_internal_template.php
index 29017edbb..7c16a53db 100644
--- a/include/smarty/libs/sysplugins/smarty_internal_template.php
+++ b/include/smarty/libs/sysplugins/smarty_internal_template.php
@@ -1,623 +1,335 @@
 <?php
 /**
  * Smarty Internal Plugin Template
- *
  * This file contains the Smarty template engine
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage Template
- * @author Uwe Tews
+ * @author     Uwe Tews
  */
 
 /**
  * Main class with template data structures and methods
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage Template
  *
- * @property Smarty_Template_Source   $source
- * @property Smarty_Template_Compiled $compiled
- * @property Smarty_Template_Cached   $cached
+ * @property Smarty_Template_Source|Smarty_Template_Config $source
+ * @property Smarty_Template_Compiled                      $compiled
+ * @property Smarty_Template_Cached                        $cached
+ * @method bool mustCompile()
  */
-class Smarty_Internal_Template extends Smarty_Internal_TemplateBase {
-
-    /**
-     * cache_id
-     * @var string
-     */
-    public $cache_id = null;
+class Smarty_Internal_Template extends Smarty_Internal_TemplateBase
+{
     /**
-     * $compile_id
-     * @var string
+     * This object type (Smarty = 1, template = 2, data = 4)
+     *
+     * @var int
      */
-    public $compile_id = null;
+    public $_objType = 2;
+
     /**
-     * caching enabled
-     * @var boolean
+     * Global smarty instance
+     *
+     * @var Smarty
      */
-    public $caching = null;
+    public $smarty = null;
+
     /**
-     * cache lifetime in seconds
-     * @var integer
+     * Source instance
+     *
+     * @var Smarty_Template_Source|Smarty_Template_Config
      */
-    public $cache_lifetime = null;
+    public $source = null;
+
     /**
      * Template resource
+     *
      * @var string
      */
     public $template_resource = null;
+
     /**
      * flag if compiled template is invalid and must be (re)compiled
+     *
      * @var bool
      */
     public $mustCompile = null;
+
     /**
-     * flag if template does contain nocache code sections
-     * @var bool
-     */
-    public $has_nocache_code = false;
-    /**
-     * special compiled and cached template properties
-     * @var array
-     */
-    public $properties = array('file_dependency' => array(),
-        'nocache_hash' => '',
-        'function' => array());
-    /**
-     * required plugins
-     * @var array
-     */
-    public $required_plugins = array('compiled' => array(), 'nocache' => array());
-    /**
-     * Global smarty instance
-     * @var Smarty
-     */
-    public $smarty = null;
-    /**
-     * blocks for template inheritance
-     * @var array
-     */
-    public $block_data = array();
-    /**
-     * variable filters
-     * @var array
+     * Template Id
+     *
+     * @var null|string
      */
-    public $variable_filters = array();
+    public $templateId = null;
+
     /**
-     * optional log of tag/attributes
+     * Known template functions
+     *
      * @var array
      */
-    public $used_tags = array();
-    /**
-     * internal flag to allow relative path in child template blocks
-     * @var bool
-     */
-    public $allow_relative_path = false;
+    public $tpl_function = array();
+
     /**
-     * internal capture runtime stack
-     * @var array
+     * Scope in which template is rendered
+     *
+     * @var int
      */
-    public $_capture_stack = array(0 => array());
+    public $scope = 0;
 
     /**
      * Create template data object
-     *
      * Some of the global Smarty settings copied to template scope
-     * It load the required template resources and cacher plugins
+     * It load the required template resources and caching plugins
+     *
+     * @param string                                                  $template_resource template resource string
+     * @param Smarty                                                  $smarty            Smarty instance
+     * @param \Smarty_Internal_Template|\Smarty|\Smarty_Internal_Data $_parent           back pointer to parent object
+     *                                                                                   with variables or null
+     * @param mixed                                                   $_cache_id         cache   id or null
+     * @param mixed                                                   $_compile_id       compile id or null
+     * @param bool                                                    $_caching          use caching?
+     * @param int                                                     $_cache_lifetime   cache life-time in seconds
      *
-     * @param string                   $template_resource template resource string
-     * @param Smarty                   $smarty            Smarty instance
-     * @param Smarty_Internal_Template $_parent           back pointer to parent object with variables or null
-     * @param mixed                    $_cache_id cache   id or null
-     * @param mixed                    $_compile_id       compile id or null
-     * @param bool                     $_caching          use caching?
-     * @param int                      $_cache_lifetime   cache life-time in seconds
+     * @throws \SmartyException
      */
-    public function __construct($template_resource, $smarty, $_parent = null, $_cache_id = null, $_compile_id = null, $_caching = null, $_cache_lifetime = null)
+    public function __construct($template_resource, Smarty $smarty, Smarty_Internal_Data $_parent = null,
+                                $_cache_id = null, $_compile_id = null, $_caching = null, $_cache_lifetime = null)
     {
         $this->smarty = &$smarty;
         // Smarty parameter
         $this->cache_id = $_cache_id === null ? $this->smarty->cache_id : $_cache_id;
         $this->compile_id = $_compile_id === null ? $this->smarty->compile_id : $_compile_id;
         $this->caching = $_caching === null ? $this->smarty->caching : $_caching;
-        if ($this->caching === true)
+        if ($this->caching === true) {
             $this->caching = Smarty::CACHING_LIFETIME_CURRENT;
+        }
         $this->cache_lifetime = $_cache_lifetime === null ? $this->smarty->cache_lifetime : $_cache_lifetime;
         $this->parent = $_parent;
         // Template resource
         $this->template_resource = $template_resource;
-        // copy block data of template inheritance
-        if ($this->parent instanceof Smarty_Internal_Template) {
-            $this->block_data = $this->parent->block_data;
-        }
+        $this->source = Smarty_Template_Source::load($this);
+        parent::__construct();
     }
 
     /**
-     * Returns if the current template must be compiled by the Smarty compiler
+     * render template
      *
-     * It does compare the timestamps of template source and the compiled templates and checks the force compile configuration
+     * @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 null: subtemplate
      *
-     * @return boolean true if the template must be compiled
+     * @throws Exception
+     * @throws SmartyException
+     * @return string rendered template output
      */
-    public function mustCompile()
+    public function render($no_output_filter = true, $display = null)
     {
+        $parentIsTpl = isset($this->parent) && $this->parent->_objType == 2;
+        if ($this->smarty->debugging) {
+            $this->smarty->_debug->start_template($this, $display);
+        }
+        // checks if template exists
         if (!$this->source->exists) {
-            if ($this->parent instanceof Smarty_Internal_Template) {
-                $parent_resource = " in '$this->parent->template_resource}'";
+            if ($parentIsTpl) {
+                $parent_resource = " in '{$this->parent->template_resource}'";
             } else {
                 $parent_resource = '';
             }
             throw new SmartyException("Unable to load template {$this->source->type} '{$this->source->name}'{$parent_resource}");
         }
-        if ($this->mustCompile === null) {
-            $this->mustCompile = (!$this->source->uncompiled && ($this->smarty->force_compile || $this->source->recompiled || $this->compiled->timestamp === false ||
-                    ($this->smarty->compile_check && $this->compiled->timestamp < $this->source->timestamp)));
+        // disable caching for evaluated code
+        if ($this->source->handler->recompiled) {
+            $this->caching = false;
+        }
+        // read from cache or render
+        $isCacheTpl =
+            $this->caching == Smarty::CACHING_LIFETIME_CURRENT || $this->caching == Smarty::CACHING_LIFETIME_SAVED;
+        if ($isCacheTpl) {
+            if (!isset($this->cached)) {
+                $this->loadCached();
+            }
+            $this->cached->render($this, $no_output_filter);
+        } elseif ($this->source->handler->uncompiled) {
+            $this->source->render($this);
+        } else {
+            if (!isset($this->compiled)) {
+                $this->loadCompiled();
+            }
+            $this->compiled->render($this);
         }
-        return $this->mustCompile;
-    }
 
-    /**
-     * Compiles the template
-     *
-     * If the template is not evaluated the compiled template is saved on disk
-     */
-    public function compileTemplateSource()
-    {
-        if (!$this->source->recompiled) {
-            $this->properties['file_dependency'] = array();
-            if ($this->source->components) {
-                // uses real resource for file dependency
-                $source = end($this->source->components);
-                $this->properties['file_dependency'][$this->source->uid] = array($this->source->filepath, $this->source->timestamp, $source->type);
+        // display or fetch
+        if ($display) {
+            if ($this->caching && $this->smarty->cache_modified_check) {
+                $this->smarty->ext->_cachemodify->cacheModifiedCheck($this->cached, $this,
+                                                                     isset($content) ? $content : ob_get_clean());
             } else {
-                $this->properties['file_dependency'][$this->source->uid] = array($this->source->filepath, $this->source->timestamp, $this->source->type);
+                if ((!$this->caching || $this->cached->has_nocache_code || $this->source->handler->recompiled) &&
+                    !$no_output_filter && (isset($this->smarty->autoload_filters['output']) ||
+                        isset($this->smarty->registered_filters['output']))
+                ) {
+                    echo $this->smarty->ext->_filterHandler->runFilter('output', ob_get_clean(), $this);
+                } else {
+                    ob_end_flush();
+                    flush();
+                }
             }
-        }
-        if ($this->smarty->debugging) {
-            Smarty_Internal_Debug::start_compile($this);
-        }
-        // compile locking
-        if ($this->smarty->compile_locking && !$this->source->recompiled) {
-            if ($saved_timestamp = $this->compiled->timestamp) {
-                touch($this->compiled->filepath);
+            if ($this->smarty->debugging) {
+                $this->smarty->_debug->end_template($this);
+                // debug output
+                $this->smarty->_debug->display_debug($this, true);
             }
-        }
-        // call compiler
-        try {
-            $code = $this->compiler->compileTemplate($this);
-        } catch (Exception $e) {
-            // restore old timestamp in case of error
-            if ($this->smarty->compile_locking && !$this->source->recompiled && $saved_timestamp) {
-                touch($this->compiled->filepath, $saved_timestamp);
+            return '';
+        } else {
+            if ($this->smarty->debugging) {
+                $this->smarty->_debug->end_template($this);
+                if ($this->smarty->debugging === 2 && $display === false) {
+                    $this->smarty->_debug->display_debug($this, true);
+                }
             }
-            throw $e;
-        }
-        // compiling succeded
-        if (!$this->source->recompiled && $this->compiler->write_compiled_code) {
-            // write compiled template
-            $_filepath = $this->compiled->filepath;
-            if ($_filepath === false)
-                throw new SmartyException('getCompiledFilepath() did not return a destination to save the compiled template to');
-            Smarty_Internal_Write_File::writeFile($_filepath, $code, $this->smarty);
-            $this->compiled->exists = true;
-            $this->compiled->isCompiled = true;
-        }
-        if ($this->smarty->debugging) {
-            Smarty_Internal_Debug::end_compile($this);
+            if ($parentIsTpl) {
+                if (!empty($this->tpl_function)) {
+                    $this->parent->tpl_function = array_merge($this->parent->tpl_function, $this->tpl_function);
+                }
+                foreach ($this->compiled->required_plugins as $code => $tmp1) {
+                    foreach ($tmp1 as $name => $tmp) {
+                        foreach ($tmp as $type => $data) {
+                            $this->parent->compiled->required_plugins[$code][$name][$type] = $data;
+                        }
+                    }
+                }
+            }
+            if (!$no_output_filter &&
+                (!$this->caching || $this->cached->has_nocache_code || $this->source->handler->recompiled) &&
+                (isset($this->smarty->autoload_filters['output']) || isset($this->smarty->registered_filters['output']))
+            ) {
+                return $this->smarty->ext->_filterHandler->runFilter('output', ob_get_clean(), $this);
+            }
+            // return cache content
+            return null;
         }
-        // release compiler object to free memory
-        unset($this->compiler);
     }
 
     /**
-     * Writes the cached template output
-     *
-     * @return bool
+     * Compiles the template
+     * If the template is not evaluated the compiled template is saved on disk
      */
-    public function writeCachedContent($content)
+    public function compileTemplateSource()
     {
-        if ($this->source->recompiled || !($this->caching == Smarty::CACHING_LIFETIME_CURRENT || $this->caching == Smarty::CACHING_LIFETIME_SAVED)) {
-            // don't write cache file
-            return false;
-        }
-        $this->properties['cache_lifetime'] = $this->cache_lifetime;
-        $this->properties['unifunc'] = 'content_' . str_replace('.', '_', uniqid('', true));
-        $content = $this->createTemplateCodeFrame($content, true);
-        $_smarty_tpl = $this;
-        eval("?>" . $content);
-        $this->cached->valid = true;
-        $this->cached->processed = true;
-        return $this->cached->write($this, $content);
+        return $this->compiled->compileTemplateSource($this);
     }
 
     /**
-     * Template code runtime function to get subtemplate content
+     * Writes the content to cache resource
      *
-     * @param string  $template       the resource handle of the template file
-     * @param mixed   $cache_id       cache id to be used with this template
-     * @param mixed   $compile_id     compile id to be used with this template
-     * @param integer $caching        cache mode
-     * @param integer $cache_lifetime life time of cache data
-     * @param array   $vars optional  variables to assign
-     * @param int     $parent_scope   scope in which {include} should execute
-     * @returns string template content
-     */
-    public function getSubTemplate($template, $cache_id, $compile_id, $caching, $cache_lifetime, $data, $parent_scope)
-    {
-        // already in template cache?
-        if ($this->smarty->allow_ambiguous_resources) {
-            $_templateId = Smarty_Resource::getUniqueTemplateName($this->smarty, $template) . $cache_id . $compile_id;
-        } else {
-            $_templateId = $this->smarty->joined_template_dir . '#' . $template . $cache_id . $compile_id;
-        }
-
-        if (isset($_templateId[150])) {
-            $_templateId = sha1($_templateId);
-        }
-        if (isset($this->smarty->template_objects[$_templateId])) {
-            // clone cached template object because of possible recursive call
-            $tpl = clone $this->smarty->template_objects[$_templateId];
-            $tpl->parent = $this;
-            $tpl->caching = $caching;
-            $tpl->cache_lifetime = $cache_lifetime;
-        } else {
-            $tpl = new $this->smarty->template_class($template, $this->smarty, $this, $cache_id, $compile_id, $caching, $cache_lifetime);
-        }
-        // get variables from calling scope
-        if ($parent_scope == Smarty::SCOPE_LOCAL) {
-            $tpl->tpl_vars = $this->tpl_vars;
-            $tpl->tpl_vars['smarty'] = clone $this->tpl_vars['smarty'];
-        } elseif ($parent_scope == Smarty::SCOPE_PARENT) {
-            $tpl->tpl_vars = &$this->tpl_vars;
-        } elseif ($parent_scope == Smarty::SCOPE_GLOBAL) {
-            $tpl->tpl_vars = &Smarty::$global_tpl_vars;
-        } elseif (($scope_ptr = $this->getScopePointer($parent_scope)) == null) {
-            $tpl->tpl_vars = &$this->tpl_vars;
-        } else {
-            $tpl->tpl_vars = &$scope_ptr->tpl_vars;
-        }
-        $tpl->config_vars = $this->config_vars;
-        if (!empty($data)) {
-            // set up variable values
-            foreach ($data as $_key => $_val) {
-                $tpl->tpl_vars[$_key] = new Smarty_variable($_val);
-            }
-        }
-        return $tpl->fetch(null, null, null, null, false, false, true);
-    }
-
-    /**
-     * Template code runtime function to set up an inline subtemplate
+     * @param string $content
      *
-     * @param string  $template       the resource handle of the template file
-     * @param mixed   $cache_id       cache id to be used with this template
-     * @param mixed   $compile_id     compile id to be used with this template
-     * @param integer $caching        cache mode
-     * @param integer $cache_lifetime life time of cache data
-     * @param array   $vars optional  variables to assign
-     * @param int     $parent_scope   scope in which {include} should execute
-     * @param string  $hash           nocache hash code
-     * @returns string template content
+     * @return bool
      */
-    public function setupInlineSubTemplate($template, $cache_id, $compile_id, $caching, $cache_lifetime, $data, $parent_scope, $hash)
+    public function writeCachedContent($content)
     {
-        $tpl = new $this->smarty->template_class($template, $this->smarty, $this, $cache_id, $compile_id, $caching, $cache_lifetime);
-        $tpl->properties['nocache_hash']  = $hash;
-        // get variables from calling scope
-        if ($parent_scope == Smarty::SCOPE_LOCAL ) {
-            $tpl->tpl_vars = $this->tpl_vars;
-            $tpl->tpl_vars['smarty'] = clone $this->tpl_vars['smarty'];
-        } elseif ($parent_scope == Smarty::SCOPE_PARENT) {
-            $tpl->tpl_vars = &$this->tpl_vars;
-        } elseif ($parent_scope == Smarty::SCOPE_GLOBAL) {
-            $tpl->tpl_vars = &Smarty::$global_tpl_vars;
-        } elseif (($scope_ptr = $this->getScopePointer($parent_scope)) == null) {
-            $tpl->tpl_vars = &$this->tpl_vars;
-        } else {
-            $tpl->tpl_vars = &$scope_ptr->tpl_vars;
-        }
-        $tpl->config_vars = $this->config_vars;
-        if (!empty($data)) {
-            // set up variable values
-            foreach ($data as $_key => $_val) {
-                $tpl->tpl_vars[$_key] = new Smarty_variable($_val);
-            }
-        }
-        return $tpl;
+        return $this->smarty->ext->_updateCache->writeCachedContent($this->cached, $this, $content);
     }
 
-
     /**
-     * Create code frame for compiled and cached templates
+     * Get unique template id
      *
-     * @param string $content   optional template content
-     * @param bool   $cache     flag for cache file
      * @return string
      */
-    public function createTemplateCodeFrame($content = '', $cache = false)
+    public function _getTemplateId()
     {
-        $plugins_string = '';
-        // include code for plugins
-        if (!$cache) {
-            if (!empty($this->required_plugins['compiled'])) {
-                $plugins_string = '<?php ';
-                foreach ($this->required_plugins['compiled'] as $tmp) {
-                    foreach ($tmp as $data) {
-                        $file = addslashes($data['file']);
-                        if (is_Array($data['function'])){
-                            $plugins_string .= "if (!is_callable(array('{$data['function'][0]}','{$data['function'][1]}'))) include '{$file}';\n";
-                        } else {
-                            $plugins_string .= "if (!is_callable('{$data['function']}')) include '{$file}';\n";
-                        }
-                    }
-                }
-                $plugins_string .= '?>';
-            }
-            if (!empty($this->required_plugins['nocache'])) {
-                $this->has_nocache_code = true;
-                $plugins_string .= "<?php echo '/*%%SmartyNocache:{$this->properties['nocache_hash']}%%*/<?php \$_smarty = \$_smarty_tpl->smarty; ";
-                foreach ($this->required_plugins['nocache'] as $tmp) {
-                    foreach ($tmp as $data) {
-                        $file = addslashes($data['file']);
-                        if (is_Array($data['function'])){
-                            $plugins_string .= addslashes("if (!is_callable(array('{$data['function'][0]}','{$data['function'][1]}'))) include '{$file}';\n");
-                        } else {
-                            $plugins_string .= addslashes("if (!is_callable('{$data['function']}')) include '{$file}';\n");
-                        }
-                    }
-                }
-                $plugins_string .= "?>/*/%%SmartyNocache:{$this->properties['nocache_hash']}%%*/';?>\n";
-            }
-        }
-        // build property code
-        $this->properties['has_nocache_code'] = $this->has_nocache_code;
-        $output = '';
-        if (!$this->source->recompiled) {
-            $output = "<?php /*%%SmartyHeaderCode:{$this->properties['nocache_hash']}%%*/";
-            if ($this->smarty->direct_access_security) {
-                $output .= "if(!defined('SMARTY_DIR')) exit('no direct access allowed');\n";
-            }
-        }
-        if ($cache) {
-            // remove compiled code of{function} definition
-            unset($this->properties['function']);
-            if (!empty($this->smarty->template_functions)) {
-                // copy code of {function} tags called in nocache mode
-                foreach ($this->smarty->template_functions as $name => $function_data) {
-                    if (isset($function_data['called_nocache'])) {
-                        foreach ($function_data['called_functions'] as $func_name) {
-                            $this->smarty->template_functions[$func_name]['called_nocache'] = true;
-                        }
-                    }
-                }
-                 foreach ($this->smarty->template_functions as $name => $function_data) {
-                    if (isset($function_data['called_nocache'])) {
-                        unset($function_data['called_nocache'], $function_data['called_functions'], $this->smarty->template_functions[$name]['called_nocache']);
-                        $this->properties['function'][$name] = $function_data;
-                    }
-                }
-            }
-        }
-        $this->properties['version'] = Smarty::SMARTY_VERSION;
-        if (!isset($this->properties['unifunc'])) {
-            $this->properties['unifunc'] = 'content_' . str_replace('.', '_', uniqid('', true));
-        }
-        if (!$this->source->recompiled) {
-            $output .= "\$_valid = \$_smarty_tpl->decodeProperties(" . var_export($this->properties, true) . ',' . ($cache ? 'true' : 'false') . "); /*/%%SmartyHeaderCode%%*/?>\n";
-            $output .= '<?php if ($_valid && !is_callable(\'' . $this->properties['unifunc'] . '\')) {function ' . $this->properties['unifunc'] . '($_smarty_tpl) {?>';
-        }
-        $output .= $plugins_string;
-        $output .= $content;
-        if (!$this->source->recompiled) {
-            $output .= '<?php }} ?>';
-        }
-        return $output;
+        return isset($this->templateId) ? $this->templateId : $this->templateId =
+            $this->smarty->_getTemplateId($this->template_resource, $this->cache_id, $this->compile_id);
     }
 
     /**
-     * This function is executed automatically when a compiled or cached template file is included
-     *
-     * - Decode saved properties from compiled template and cache files
-     * - Check if compiled or cache file is valid
-     *
-     * @param array $properties     special template properties
-     * @param bool  $cache          flag if called from cache file
-     * @return bool                 flag if compiled or cache file is valid
+     * runtime error not matching capture tags
      */
-    public function decodeProperties($properties, $cache = false)
+    public function capture_error()
     {
-        $this->has_nocache_code = $properties['has_nocache_code'];
-        $this->properties['nocache_hash'] = $properties['nocache_hash'];
-        if (isset($properties['cache_lifetime'])) {
-            $this->properties['cache_lifetime'] = $properties['cache_lifetime'];
-        }
-        if (isset($properties['file_dependency'])) {
-            $this->properties['file_dependency'] = array_merge($this->properties['file_dependency'], $properties['file_dependency']);
-        }
-        if (!empty($properties['function'])) {
-            $this->properties['function'] = array_merge($this->properties['function'], $properties['function']);
-            $this->smarty->template_functions = array_merge($this->smarty->template_functions, $properties['function']);
-        }
-        $this->properties['version'] = (isset($properties['version'])) ? $properties['version'] : '';
-        $this->properties['unifunc'] = $properties['unifunc'];
-        // check file dependencies at compiled code
-        $is_valid = true;
-        if ($this->properties['version'] != Smarty::SMARTY_VERSION) {
-            $is_valid = false;
-        } else if (((!$cache && $this->smarty->compile_check && empty($this->compiled->_properties) && !$this->compiled->isCompiled) || $cache && ($this->smarty->compile_check === true || $this->smarty->compile_check === Smarty::COMPILECHECK_ON)) && !empty($this->properties['file_dependency'])) {
-            foreach ($this->properties['file_dependency'] as $_file_to_check) {
-                if ($_file_to_check[2] == 'file' || $_file_to_check[2] == 'php') {
-                    if ($this->source->filepath == $_file_to_check[0] && isset($this->source->timestamp)) {
-                        // do not recheck current template
-                        $mtime = $this->source->timestamp;
-                    } else {
-                        // file and php types can be checked without loading the respective resource handlers
-                        $mtime = @filemtime($_file_to_check[0]);
-                    }
-                } elseif ($_file_to_check[2] == 'string') {
-                    continue;
-                } else {
-                    $source = Smarty_Resource::source(null, $this->smarty, $_file_to_check[0]);
-                    $mtime = $source->timestamp;
-                }
-                if (!$mtime || $mtime > $_file_to_check[1]) {
-                    $is_valid = false;
-                    break;
-                }
-            }
-        }
-        if ($cache) {
-            $this->cached->valid = $is_valid;
-        } else {
-            $this->mustCompile = !$is_valid;
-        }
-        // store data in reusable Smarty_Template_Compiled
-        if (!$cache) {
-            $this->compiled->_properties = $properties;
-        }
-        return $is_valid;
+        throw new SmartyException("Not matching {capture} open/close in \"{$this->template_resource}\"");
     }
 
     /**
-     * Template code runtime function to create a local Smarty variable for array assignments
+     * Load compiled object
      *
-     * @param string $tpl_var   tempate variable name
-     * @param bool   $nocache   cache mode of variable
-     * @param int    $scope     scope of variable
      */
-    public function createLocalArrayVariable($tpl_var, $nocache = false, $scope = Smarty::SCOPE_LOCAL)
+    public function loadCompiled()
     {
-        if (!isset($this->tpl_vars[$tpl_var])) {
-            $this->tpl_vars[$tpl_var] = new Smarty_variable(array(), $nocache, $scope);
-        } else {
-            $this->tpl_vars[$tpl_var] = clone $this->tpl_vars[$tpl_var];
-            if ($scope != Smarty::SCOPE_LOCAL) {
-                $this->tpl_vars[$tpl_var]->scope = $scope;
-            }
-            if (!(is_array($this->tpl_vars[$tpl_var]->value) || $this->tpl_vars[$tpl_var]->value instanceof ArrayAccess)) {
-                settype($this->tpl_vars[$tpl_var]->value, 'array');
-            }
+        if (!isset($this->compiled)) {
+            $this->compiled = Smarty_Template_Compiled::load($this);
         }
     }
 
     /**
-     * Template code runtime function to get pointer to template variable array of requested scope
+     * Load cached object
      *
-     * @param int $scope    requested variable scope
-     * @return array        array of template variables
      */
-    public function &getScope($scope)
+    public function loadCached()
     {
-        if ($scope == Smarty::SCOPE_PARENT && !empty($this->parent)) {
-            return $this->parent->tpl_vars;
-        } elseif ($scope == Smarty::SCOPE_ROOT && !empty($this->parent)) {
-            $ptr = $this->parent;
-            while (!empty($ptr->parent)) {
-                $ptr = $ptr->parent;
-            }
-            return $ptr->tpl_vars;
-        } elseif ($scope == Smarty::SCOPE_GLOBAL) {
-            return Smarty::$global_tpl_vars;
+        if (!isset($this->cached)) {
+            $this->cached = Smarty_Template_Cached::load($this);
         }
-        $null = null;
-        return $null;
     }
 
     /**
-     * Get parent or root of template parent chain
+     * Load compiler object
      *
-     * @param int $scope    pqrent or root scope
-     * @return mixed object
+     * @throws \SmartyException
      */
-    public function getScopePointer($scope)
+    public function loadCompiler()
     {
-        if ($scope == Smarty::SCOPE_PARENT && !empty($this->parent)) {
-            return $this->parent;
-        } elseif ($scope == Smarty::SCOPE_ROOT && !empty($this->parent)) {
-            $ptr = $this->parent;
-            while (!empty($ptr->parent)) {
-                $ptr = $ptr->parent;
-            }
-            return $ptr;
+        if (!class_exists($this->source->handler->compiler_class)) {
+            $this->smarty->loadPlugin($this->source->handler->compiler_class);
         }
-        return null;
+        $this->compiler = new $this->source->handler->compiler_class($this->source->handler->template_lexer_class,
+                                                                     $this->source->handler->template_parser_class,
+                                                                     $this->smarty);
     }
 
     /**
-     * [util function] counts an array, arrayaccess/traversable or PDOStatement object
+     * Handle unknown class methods
      *
-     * @param mixed $value
-     * @return int the count for arrays and objects that implement countable, 1 for other objects that don't, and 0 for empty elements
-     */
-    public function _count($value)
-    {
-        if (is_array($value) === true || $value instanceof Countable) {
-            return count($value);
-        } elseif ($value instanceof IteratorAggregate) {
-            // Note: getIterator() returns a Traversable, not an Iterator
-            // thus rewind() and valid() methods may not be present
-            return iterator_count($value->getIterator());
-        } elseif ($value instanceof Iterator) {
-            return iterator_count($value);
-        } elseif ($value instanceof PDOStatement) {
-            return $value->rowCount();
-        } elseif ($value instanceof Traversable) {
-            return iterator_count($value);
-        } elseif ($value instanceof ArrayAccess) {
-            if ($value->offsetExists(0)) {
-                return 1;
-            }
-        } elseif (is_object($value)) {
-            return count($value);
-        }
-        return 0;
-    }
-
-    /**
-     * runtime error not matching capture tags
+     * @param string $name unknown method-name
+     * @param array  $args argument array
      *
+     * @return mixed
+     * @throws SmartyException
      */
-    public function capture_error()
+    public function __call($name, $args)
     {
-        throw new SmartyException("Not matching {capture} open/close in \"{$this->template_resource}\"");
+        // method of Smarty object?
+        if (method_exists($this->smarty, $name)) {
+            return call_user_func_array(array($this->smarty, $name), $args);
+        }
+        // parent
+        return parent::__call($name, $args);
     }
 
     /**
-    * Empty cache for this template
-    *
-    * @param integer $exp_time      expiration time
-    * @return integer number of cache files deleted
-    */
-    public function clearCache($exp_time=null)
-    {
-        Smarty_CacheResource::invalidLoadedCache($this->smarty);
-        return $this->cached->handler->clear($this->smarty, $this->template_name, $this->cache_id, $this->compile_id, $exp_time);
-    }
-
-     /**
      * set Smarty property in template context
      *
      * @param string $property_name property name
      * @param mixed  $value         value
+     *
+     * @throws SmartyException
      */
     public function __set($property_name, $value)
     {
         switch ($property_name) {
-            case 'source':
             case 'compiled':
             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'.");
     }
 
@@ -625,60 +337,35 @@ class Smarty_Internal_Template extends Smarty_Internal_TemplateBase {
      * get Smarty property in template context
      *
      * @param string $property_name property name
+     *
+     * @return mixed|Smarty_Template_Cached
+     * @throws SmartyException
      */
     public function __get($property_name)
     {
         switch ($property_name) {
-            case 'source':
-                if (strlen($this->template_resource) == 0) {
-                    throw new SmartyException('Missing template name');
-                }
-                $this->source = Smarty_Resource::source($this);
-                // cache template object under a unique ID
-                // do not cache eval resources
-                if ($this->source->type != 'eval') {
-                    if ($this->smarty->allow_ambiguous_resources) {
-                        $_templateId = $this->source->unique_resource . $this->cache_id . $this->compile_id;
-                    } else {
-                        $_templateId = $this->smarty->joined_template_dir . '#' . $this->template_resource . $this->cache_id . $this->compile_id;
-                    }
-
-                    if (isset($_templateId[150])) {
-                        $_templateId = sha1($_templateId);
-                    }
-                    $this->smarty->template_objects[$_templateId] = $this;
-                }
-                return $this->source;
-
             case 'compiled':
-                $this->compiled = $this->source->getCompiled($this);
+                $this->loadCompiled();
                 return $this->compiled;
 
             case 'cached':
-                if (!class_exists('Smarty_Template_Cached')) {
-                    include SMARTY_SYSPLUGINS_DIR . 'smarty_cacheresource.php';
-                }
-                $this->cached = new Smarty_Template_Cached($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.");
     }
 
     /**
-     * Template data object destrutor
-     *
+     * Template data object destructor
      */
     public function __destruct()
     {
@@ -686,7 +373,4 @@ class Smarty_Internal_Template extends Smarty_Internal_TemplateBase {
             $this->cached->handler->releaseLock($this->smarty, $this->cached);
         }
     }
-
 }
-
-?>
\ No newline at end of file
diff --git a/include/smarty/libs/sysplugins/smarty_internal_templatebase.php b/include/smarty/libs/sysplugins/smarty_internal_templatebase.php
index 1cb9bb949..9b4953dee 100644
--- a/include/smarty/libs/sysplugins/smarty_internal_templatebase.php
+++ b/include/smarty/libs/sysplugins/smarty_internal_templatebase.php
@@ -1,811 +1,316 @@
 <?php
 /**
  * Smarty Internal Plugin Smarty Template  Base
+ * This file contains the basic shared methods for template handling
  *
- * This file contains the basic shared methodes for template handling
- *
- * @package Smarty
+ * @package    Smarty
  * @subpackage Template
- * @author Uwe Tews
+ * @author     Uwe Tews
  */
 
 /**
- * Class with shared template methodes
+ * Class with shared template methods
  *
- * @package Smarty
- * @subpackage Template
+ * @package      Smarty
+ * @subpackage   Template
+ *
+ * @property Smarty $smarty
+ * @method Smarty_Internal_TemplateBase setAutoloadFilters(mixed $filters, string $type = null)
+ * @method Smarty_Internal_TemplateBase addAutoloadFilters(mixed $filters, string $type = null)
+ * @method array getAutoloadFilters(string $type = null)
+ * @local_method Smarty_Internal_TemplateBase registerFilter(string $type, callback $callback, string $name = null)
+ * @method Smarty_Internal_TemplateBase unregisterFilter(string $type, mixed $callback)
+ * @method Smarty_Internal_TemplateBase unloadFilter(string $type, string $name)
+ * @method string getDebugTemplate()
+ * @method Smarty_Internal_TemplateBase setDebugTemplate(string $tpl_name)
+ * @method Smarty_Internal_TemplateBase setDefaultModifier(mixed $modifiers)
+ * @method Smarty_Internal_TemplateBase addDefaultModifier(mixed $modifiers)
+ * @method array getDefaultModifier()
+ * @method Smarty_Internal_TemplateBase registerDefaultPluginHandler(callback $callback)
+ * @method Smarty_Internal_TemplateBase registerResource(string $name, Smarty_Resource $resource_handler)
+ * @method Smarty_Internal_TemplateBase unregisterResource(string $name)
+ * @method Smarty_Internal_TemplateBase registerCacheResource(string $name, Smarty_CacheResource $resource_handler)
+ * @method Smarty_Internal_TemplateBase unregisterCacheResource(string $name)
+ * @method Smarty_Internal_TemplateBase unregisterPlugin(string $type, string $name)
+ * @method Smarty_Internal_TemplateBase unregisterObject(string $object_name)
+ * @method object getRegisteredObject(string $object_name)
+ * @method Smarty_Internal_TemplateBase registerClass(string $class_name, string $class_impl)
+ * @method Smarty_Internal_TemplateBase createData(Smarty_Internal_Data $parent = null, string $name = null)
+ * @method array getTags(mixed $template = null)
  */
-abstract class Smarty_Internal_TemplateBase extends Smarty_Internal_Data {
-
+abstract class Smarty_Internal_TemplateBase extends Smarty_Internal_Data
+{
     /**
-     * fetches a rendered Smarty template
+     * Set this if you want different sets of cache files for the same
+     * templates.
      *
-     * @param string $template          the resource handle of the template file or template object
-     * @param mixed  $cache_id          cache id to be used with this template
-     * @param mixed  $compile_id        compile id to be used with this template
-     * @param object $parent            next higher level of Smarty variables
-     * @param bool   $display           true: display, false: fetch
-     * @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
-     * @return string rendered template output
+     * @var string
      */
-    public function fetch($template = null, $cache_id = null, $compile_id = null, $parent = null, $display = false, $merge_tpl_vars = true, $no_output_filter = false)
-    {
-        if ($template === null && $this instanceof $this->template_class) {
-            $template = $this;
-        }
-        if (!empty($cache_id) && is_object($cache_id)) {
-            $parent = $cache_id;
-            $cache_id = null;
-        }
-        if ($parent === null && ($this instanceof Smarty || is_string($template))) {
-            $parent = $this;
-        }
-        // create template object if necessary
-        $_template = ($template instanceof $this->template_class)
-        ? $template
-        : $this->smarty->createTemplate($template, $cache_id, $compile_id, $parent, false);
-        // if called by Smarty object make sure we use current caching status
-        if ($this instanceof Smarty) {
-            $_template->caching = $this->caching;
-        }
-        // merge all variable scopes into template
-        if ($merge_tpl_vars) {
-            // save local variables
-            $save_tpl_vars = $_template->tpl_vars;
-            $save_config_vars = $_template->config_vars;
-            $ptr_array = array($_template);
-            $ptr = $_template;
-            while (isset($ptr->parent)) {
-                $ptr_array[] = $ptr = $ptr->parent;
-            }
-            $ptr_array = array_reverse($ptr_array);
-            $parent_ptr = reset($ptr_array);
-            $tpl_vars = $parent_ptr->tpl_vars;
-            $config_vars = $parent_ptr->config_vars;
-            while ($parent_ptr = next($ptr_array)) {
-                if (!empty($parent_ptr->tpl_vars)) {
-                    $tpl_vars = array_merge($tpl_vars, $parent_ptr->tpl_vars);
-                }
-                if (!empty($parent_ptr->config_vars)) {
-                    $config_vars = array_merge($config_vars, $parent_ptr->config_vars);
-                }
-            }
-            if (!empty(Smarty::$global_tpl_vars)) {
-                $tpl_vars = array_merge(Smarty::$global_tpl_vars, $tpl_vars);
-            }
-            $_template->tpl_vars = $tpl_vars;
-            $_template->config_vars = $config_vars;
-        }
-        // dummy local smarty variable
-        if (!isset($_template->tpl_vars['smarty'])) {
-            $_template->tpl_vars['smarty'] = new Smarty_Variable;
-        }
-        if (isset($this->smarty->error_reporting)) {
-            $_smarty_old_error_level = error_reporting($this->smarty->error_reporting);
-        }
-        // check URL debugging control
-        if (!$this->smarty->debugging && $this->smarty->debugging_ctrl == 'URL') {
-            if (isset($_SERVER['QUERY_STRING'])) {
-                $_query_string = $_SERVER['QUERY_STRING'];
-            } else {
-                $_query_string = '';
-            }
-            if (false !== strpos($_query_string, $this->smarty->smarty_debug_id)) {
-                if (false !== strpos($_query_string, $this->smarty->smarty_debug_id . '=on')) {
-                    // enable debugging for this browser session
-                    setcookie('SMARTY_DEBUG', true);
-                    $this->smarty->debugging = true;
-                } elseif (false !== strpos($_query_string, $this->smarty->smarty_debug_id . '=off')) {
-                    // disable debugging for this browser session
-                    setcookie('SMARTY_DEBUG', false);
-                    $this->smarty->debugging = false;
-                } else {
-                    // enable debugging for this page
-                    $this->smarty->debugging = true;
-                }
-            } else {
-                if (isset($_COOKIE['SMARTY_DEBUG'])) {
-                    $this->smarty->debugging = true;
-                }
-            }
-        }
-        // must reset merge template date
-        $_template->smarty->merged_templates_func = array();
-        // get rendered template
-        // disable caching for evaluated code
-        if ($_template->source->recompiled) {
-            $_template->caching = false;
-        }
-        // checks if template exists
-        if (!$_template->source->exists) {
-            if ($_template->parent instanceof Smarty_Internal_Template) {
-                $parent_resource = " in '{$_template->parent->template_resource}'";
-            } else {
-                $parent_resource = '';
-            }
-            throw new SmartyException("Unable to load template {$_template->source->type} '{$_template->source->name}'{$parent_resource}");
-        }
-        // read from cache or render
-        if (!($_template->caching == Smarty::CACHING_LIFETIME_CURRENT || $_template->caching == Smarty::CACHING_LIFETIME_SAVED) || !$_template->cached->valid) {
-            // render template (not loaded and not in cache)
-            if (!$_template->source->uncompiled) {
-                $_smarty_tpl = $_template;
-                if ($_template->source->recompiled) {
-                    if ($this->smarty->debugging) {
-                        Smarty_Internal_Debug::start_compile($_template);
-                    }
-                    $code = $_template->compiler->compileTemplate($_template);
-                    if ($this->smarty->debugging) {
-                        Smarty_Internal_Debug::end_compile($_template);
-                    }
-                    if ($this->smarty->debugging) {
-                        Smarty_Internal_Debug::start_render($_template);
-                    }
-                    try {
-                        ob_start();
-                        eval("?>" . $code);
-                        unset($code);
-                    } catch (Exception $e) {
-                        ob_get_clean();
-                        throw $e;
-                    }
-                } else {
-                    if (!$_template->compiled->exists || ($_template->smarty->force_compile && !$_template->compiled->isCompiled)) {
-                        $_template->compileTemplateSource();
-                    }
-                    if ($this->smarty->debugging) {
-                        Smarty_Internal_Debug::start_render($_template);
-                    }
-                    if (!$_template->compiled->loaded) {
-                        include($_template->compiled->filepath);
-                        if ($_template->mustCompile) {
-                            // recompile and load again
-                            $_template->compileTemplateSource();
-                            include($_template->compiled->filepath);
-                        }
-                        $_template->compiled->loaded = true;
-                    } else {
-                        $_template->decodeProperties($_template->compiled->_properties, false);
-                    }
-                    try {
-                        ob_start();
-                        if (empty($_template->properties['unifunc']) || !is_callable($_template->properties['unifunc'])) {
-                            throw new SmartyException("Invalid compiled template for '{$_template->template_resource}'");
-                        }
-                        array_unshift($_template->_capture_stack,array());
-                        //
-                        // render compiled template
-                        //
-                        $_template->properties['unifunc']($_template);
-                        // any unclosed {capture} tags ?
-                        if (isset($_template->_capture_stack[0][0])) {
-                            $_template->capture_error();
-                        }
-                        array_shift($_template->_capture_stack);
-                    } catch (Exception $e) {
-                        ob_get_clean();
-                        throw $e;
-                    }
-                }
-            } else {
-                if ($_template->source->uncompiled) {
-                    if ($this->smarty->debugging) {
-                        Smarty_Internal_Debug::start_render($_template);
-                    }
-                    try {
-                        ob_start();
-                        $_template->source->renderUncompiled($_template);
-                    } catch (Exception $e) {
-                        ob_get_clean();
-                        throw $e;
-                    }
-                } else {
-                    throw new SmartyException("Resource '$_template->source->type' must have 'renderUncompiled' method");
-                }
-            }
-            $_output = ob_get_clean();
-            if (!$_template->source->recompiled && empty($_template->properties['file_dependency'][$_template->source->uid])) {
-                $_template->properties['file_dependency'][$_template->source->uid] = array($_template->source->filepath, $_template->source->timestamp, $_template->source->type);
-            }
-            if ($_template->parent instanceof Smarty_Internal_Template) {
-                $_template->parent->properties['file_dependency'] = array_merge($_template->parent->properties['file_dependency'], $_template->properties['file_dependency']);
-                foreach ($_template->required_plugins as $code => $tmp1) {
-                    foreach ($tmp1 as $name => $tmp) {
-                        foreach ($tmp as $type => $data) {
-                            $_template->parent->required_plugins[$code][$name][$type] = $data;
-                        }
-                    }
-                }
-            }
-            if ($this->smarty->debugging) {
-                Smarty_Internal_Debug::end_render($_template);
-            }
-            // write to cache when nessecary
-            if (!$_template->source->recompiled && ($_template->caching == Smarty::CACHING_LIFETIME_SAVED || $_template->caching == Smarty::CACHING_LIFETIME_CURRENT)) {
-                if ($this->smarty->debugging) {
-                    Smarty_Internal_Debug::start_cache($_template);
-                }
-                $_template->properties['has_nocache_code'] = false;
-                // get text between non-cached items
-                $cache_split = preg_split("!/\*%%SmartyNocache:{$_template->properties['nocache_hash']}%%\*\/(.+?)/\*/%%SmartyNocache:{$_template->properties['nocache_hash']}%%\*/!s", $_output);
-                // get non-cached items
-                preg_match_all("!/\*%%SmartyNocache:{$_template->properties['nocache_hash']}%%\*\/(.+?)/\*/%%SmartyNocache:{$_template->properties['nocache_hash']}%%\*/!s", $_output, $cache_parts);
-                $output = '';
-                // loop over items, stitch back together
-                foreach ($cache_split as $curr_idx => $curr_split) {
-                    // escape PHP tags in template content
-                    $output .= preg_replace('/(<%|%>|<\?php|<\?|\?>)/', '<?php echo \'$1\'; ?>', $curr_split);
-                    if (isset($cache_parts[0][$curr_idx])) {
-                        $_template->properties['has_nocache_code'] = true;
-                        // remove nocache tags from cache output
-                        $output .= preg_replace("!/\*/?%%SmartyNocache:{$_template->properties['nocache_hash']}%%\*/!", '', $cache_parts[0][$curr_idx]);
-                    }
-                }
-                if (!$no_output_filter && !$_template->has_nocache_code && (isset($this->smarty->autoload_filters['output']) || isset($this->smarty->registered_filters['output']))) {
-                    $output = Smarty_Internal_Filter_Handler::runFilter('output', $output, $_template);
-                }
-                // rendering (must be done before writing cache file because of {function} nocache handling)
-                $_smarty_tpl = $_template;
-                try {
-                    ob_start();
-                    eval("?>" . $output);
-                    $_output = ob_get_clean();
-                } catch (Exception $e) {
-                    ob_get_clean();
-                    throw $e;
-                }
-                // write cache file content
-                $_template->writeCachedContent($output);
-                if ($this->smarty->debugging) {
-                    Smarty_Internal_Debug::end_cache($_template);
-                }
-            } else {
-                // var_dump('renderTemplate', $_template->has_nocache_code, $_template->template_resource, $_template->properties['nocache_hash'], $_template->parent->properties['nocache_hash'], $_output);
-                if (!empty($_template->properties['nocache_hash']) && !empty($_template->parent->properties['nocache_hash'])) {
-                    // replace nocache_hash
-                    $_output = str_replace("{$_template->properties['nocache_hash']}", $_template->parent->properties['nocache_hash'], $_output);
-                    $_template->parent->has_nocache_code = $_template->parent->has_nocache_code || $_template->has_nocache_code;
-                }
-            }
-        } else {
-            if ($this->smarty->debugging) {
-                Smarty_Internal_Debug::start_cache($_template);
-            }
-            try {
-                ob_start();
-                array_unshift($_template->_capture_stack,array());
-                //
-                // render cached template
-                //
-                $_template->properties['unifunc']($_template);
-                // any unclosed {capture} tags ?
-                if (isset($_template->_capture_stack[0][0])) {
-                    $_template->capture_error();
-                }
-                array_shift($_template->_capture_stack);
-                $_output = ob_get_clean();
-            } catch (Exception $e) {
-                ob_get_clean();
-                throw $e;
-            }
-            if ($this->smarty->debugging) {
-                Smarty_Internal_Debug::end_cache($_template);
-            }
-        }
-        if ((!$this->caching || $_template->has_nocache_code || $_template->source->recompiled) && !$no_output_filter && (isset($this->smarty->autoload_filters['output']) || isset($this->smarty->registered_filters['output']))) {
-            $_output = Smarty_Internal_Filter_Handler::runFilter('output', $_output, $_template);
-        }
-        if (isset($this->error_reporting)) {
-            error_reporting($_smarty_old_error_level);
-        }
-        // display or fetch
-        if ($display) {
-            if ($this->caching && $this->cache_modified_check) {
-                $_isCached = $_template->isCached() && !$_template->has_nocache_code;
-                $_last_modified_date = @substr($_SERVER['HTTP_IF_MODIFIED_SINCE'], 0, strpos($_SERVER['HTTP_IF_MODIFIED_SINCE'], 'GMT') + 3);
-                if ($_isCached && $_template->cached->timestamp <= strtotime($_last_modified_date)) {
-                    switch (PHP_SAPI) {
-                        case 'cgi':         // php-cgi < 5.3
-                        case 'cgi-fcgi':    // php-cgi >= 5.3
-                        case 'fpm-fcgi':    // php-fpm >= 5.3.3
-                        header('Status: 304 Not Modified');
-                        break;
-
-                        case 'cli':
-                        if (/* ^phpunit */!empty($_SERVER['SMARTY_PHPUNIT_DISABLE_HEADERS'])/* phpunit$ */) {
-                            $_SERVER['SMARTY_PHPUNIT_HEADERS'][] = '304 Not Modified';
-                        }
-                        break;
-
-                        default:
-                        header($_SERVER['SERVER_PROTOCOL'].' 304 Not Modified');
-                        break;
-                    }
-                } else {
-                    switch (PHP_SAPI) {
-                        case 'cli':
-                        if (/* ^phpunit */!empty($_SERVER['SMARTY_PHPUNIT_DISABLE_HEADERS'])/* phpunit$ */) {
-                            $_SERVER['SMARTY_PHPUNIT_HEADERS'][] = 'Last-Modified: ' . gmdate('D, d M Y H:i:s', $_template->cached->timestamp) . ' GMT';
-                        }
-                        break;
-
-                        default:
-                        header('Last-Modified: ' . gmdate('D, d M Y H:i:s', $_template->cached->timestamp) . ' GMT');
-                        break;
-                    }
-                    echo $_output;
-                }
-            } else {
-                echo $_output;
-            }
-            // debug output
-            if ($this->smarty->debugging) {
-                Smarty_Internal_Debug::display_debug($this);
-            }
-            if ($merge_tpl_vars) {
-                // restore local variables
-                $_template->tpl_vars = $save_tpl_vars;
-                $_template->config_vars =  $save_config_vars;
-            }
-            return;
-        } else {
-            if ($merge_tpl_vars) {
-                // restore local variables
-                $_template->tpl_vars = $save_tpl_vars;
-                $_template->config_vars =  $save_config_vars;
-            }
-            // return fetched content
-            return $_output;
-        }
-    }
+    public $cache_id = null;
 
     /**
-     * displays a Smarty template
+     * Set this if you want different sets of compiled files for the same
+     * templates.
      *
-     * @param string $template   the resource handle of the template file or template object
-     * @param mixed  $cache_id   cache id to be used with this template
-     * @param mixed  $compile_id compile id to be used with this template
-     * @param object $parent     next higher level of Smarty variables
+     * @var string
      */
-    public function display($template = null, $cache_id = null, $compile_id = null, $parent = null)
-    {
-        // display template
-        $this->fetch($template, $cache_id, $compile_id, $parent, true);
-    }
+    public $compile_id = null;
 
     /**
-     * test if cache is valid
+     * caching enabled
      *
-     * @param string|object $template   the resource handle of the template file or template object
-     * @param mixed         $cache_id   cache id to be used with this template
-     * @param mixed         $compile_id compile id to be used with this template
-     * @param object        $parent     next higher level of Smarty variables
-     * @return boolean cache status
+     * @var boolean
      */
-    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->smarty->createTemplate($template, $cache_id, $compile_id, $parent, false);
-        }
-        // return cache status of template
-        return $template->cached->valid;
-    }
+    public $caching = false;
 
     /**
-     * creates a data object
+     * cache lifetime in seconds
      *
-     * @param object $parent next higher level of Smarty variables
-     * @returns Smarty_Data data object
+     * @var integer
      */
-    public function createData($parent = null)
-    {
-        return new Smarty_Data($parent, $this);
-    }
+    public $cache_lifetime = 3600;
 
     /**
-     * Registers plugin to be used in templates
+     * universal cache
      *
-     * @param string   $type       plugin type
-     * @param string   $tag        name of template tag
-     * @param callback $callback   PHP callback to register
-     * @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
-     * @throws SmartyException when the plugin tag is invalid
+     * @var array()
      */
-    public function registerPlugin($type, $tag, $callback, $cacheable = true, $cache_attr = null)
-    {
-        if (isset($this->smarty->registered_plugins[$type][$tag])) {
-            throw new SmartyException("Plugin tag \"{$tag}\" already registered");
-        } elseif (!is_callable($callback)) {
-            throw new SmartyException("Plugin \"{$tag}\" not callable");
-        } else {
-            $this->smarty->registered_plugins[$type][$tag] = array($callback, (bool) $cacheable, (array) $cache_attr);
-        }
-
-        return $this;
-    }
+    public $_cache = array();
 
     /**
-     * Unregister Plugin
+     * fetches a rendered Smarty template
      *
-     * @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
-     */
-    public function unregisterPlugin($type, $tag)
-    {
-        if (isset($this->smarty->registered_plugins[$type][$tag])) {
-            unset($this->smarty->registered_plugins[$type][$tag]);
-        }
-
-        return $this;
-    }
-
-    /**
-     * Registers a resource to fetch a template
+     * @param  string $template         the resource handle of the template file or template object
+     * @param  mixed  $cache_id         cache id to be used with this template
+     * @param  mixed  $compile_id       compile id to be used with this template
+     * @param  object $parent           next higher level of Smarty variables
      *
-     * @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)
-     * @return Smarty_Internal_Templatebase current Smarty_Internal_Templatebase (or Smarty or Smarty_Internal_Template) instance for chaining
+     * @throws Exception
+     * @throws SmartyException
+     * @return string rendered template output
      */
-    public function registerResource($type, $callback)
+    public function fetch($template = null, $cache_id = null, $compile_id = null, $parent = null)
     {
-        $this->smarty->registered_resources[$type] = $callback instanceof Smarty_Resource ? $callback : array($callback, false);
-        return $this;
+        $result = $this->_execute($template, $cache_id, $compile_id, $parent, 0);
+        return $result === null ? ob_get_clean() : $result;
     }
 
     /**
-     * Unregisters a resource
+     * displays a Smarty template
      *
-     * @param string $type name of resource type
-     * @return Smarty_Internal_Templatebase current Smarty_Internal_Templatebase (or Smarty or Smarty_Internal_Template) instance for chaining
+     * @param string $template   the resource handle of the template file or template object
+     * @param mixed  $cache_id   cache id to be used with this template
+     * @param mixed  $compile_id compile id to be used with this template
+     * @param object $parent     next higher level of Smarty variables
      */
-    public function unregisterResource($type)
+    public function display($template = null, $cache_id = null, $compile_id = null, $parent = null)
     {
-        if (isset($this->smarty->registered_resources[$type])) {
-            unset($this->smarty->registered_resources[$type]);
-        }
-
-        return $this;
+        // display template
+        $this->_execute($template, $cache_id, $compile_id, $parent, 1);
     }
 
     /**
-     * Registers a cache resource to cache a template's output
+     * test if cache is valid
      *
-     * @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
-     */
-    public function registerCacheResource($type, Smarty_CacheResource $callback)
-    {
-        $this->smarty->registered_cache_resources[$type] = $callback;
-        return $this;
-    }
-
-    /**
-     * Unregisters a cache resource
+     * @api  Smarty::isCached()
+     * @link http://www.smarty.net/docs/en/api.is.cached.tpl
+     *
+     * @param  null|string|\Smarty_Internal_Template $template   the resource handle of the template file or template object
+     * @param  mixed                                 $cache_id   cache id to be used with this template
+     * @param  mixed                                 $compile_id compile id to be used with this template
+     * @param  object                                $parent     next higher level of Smarty variables
      *
-     * @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 boolean       cache status
      */
-    public function unregisterCacheResource($type)
+    public function isCached($template = null, $cache_id = null, $compile_id = null, $parent = null)
     {
-        if (isset($this->smarty->registered_cache_resources[$type])) {
-            unset($this->smarty->registered_cache_resources[$type]);
-        }
-
-        return $this;
+        return $this->_execute($template, $cache_id, $compile_id, $parent, 2);
     }
 
     /**
-     * Registers object to be used in templates
+     * fetches a rendered Smarty template
      *
-     * @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 block-methods
-     * @param array $block_functs list of methods that are block format
-     * @return Smarty_Internal_Templatebase current Smarty_Internal_Templatebase (or Smarty or Smarty_Internal_Template) instance for chaining
-     * @throws SmartyException if any of the methods in $allowed or $block_methods are invalid
+     * @param  string $template   the resource handle of the template file or template object
+     * @param  mixed  $cache_id   cache id to be used with this template
+     * @param  mixed  $compile_id compile id to be used with this template
+     * @param  object $parent     next higher level of Smarty variables
+     * @param  string $function  function type 0 = fetch,  1 = display, 2 = isCache
+     *
+     * @return mixed
+     * @throws \Exception
+     * @throws \SmartyException
      */
-    public function registerObject($object_name, $object_impl, $allowed = array(), $smarty_args = true, $block_methods = array())
+    private function _execute($template, $cache_id, $compile_id, $parent, $function)
     {
-        // test if allowed methodes callable
-        if (!empty($allowed)) {
-            foreach ((array) $allowed as $method) {
-                if (!is_callable(array($object_impl, $method))) {
-                    throw new SmartyException("Undefined method '$method' in registered object");
-                }
+        $smarty = $this->_objType == 1 ? $this : $this->smarty;
+        if ($template === null) {
+            if ($this->_objType != 2) {
+                throw new SmartyException($function . '():Missing \'$template\' parameter');
+            } else {
+                $template = clone $this;
+            }
+        } elseif (is_object($template)) {
+            if (!isset($template->_objType) || $template->_objType != 2) {
+                throw new SmartyException($function . '():Template object expected');
+            } else {
+                /* @var Smarty_Internal_Template $template */
+                $template = clone $template;
+            }
+        } else {
+            // get template object
+            /* @var Smarty_Internal_Template $template */
+            $template = $smarty->createTemplate($template, $cache_id, $compile_id, $parent, false);
+            if ($this->_objType == 1) {
+                // set caching in template object
+                $template->caching = $this->caching;
             }
         }
-        // test if block methodes callable
-        if (!empty($block_methods)) {
-            foreach ((array) $block_methods as $method) {
-                if (!is_callable(array($object_impl, $method))) {
-                    throw new SmartyException("Undefined method '$method' in registered object");
+        // fetch template content
+        $level = ob_get_level();
+        try {
+            $_smarty_old_error_level =
+                ($this->_objType == 1 && isset($smarty->error_reporting)) ? error_reporting($smarty->error_reporting) :
+                    null;
+            if ($function == 2) {
+                if ($template->caching) {
+                    // return cache status of template
+                    if (!isset($template->cached)) {
+                        $template->loadCached();
+                    }
+                    $result = $template->cached->isCached($template);
+                    $template->smarty->_cache['isCached'][$template->_getTemplateId()] = $template;
+                } else {
+                    return false;
+                }
+            } else {
+                ob_start();
+                $template->_mergeVars();
+                if (!empty(Smarty::$global_tpl_vars)) {
+                    $template->tpl_vars = array_merge(Smarty::$global_tpl_vars, $template->tpl_vars);
                 }
+                $result = $template->render(false, $function);
             }
+            if (isset($_smarty_old_error_level)) {
+                error_reporting($_smarty_old_error_level);
+            }
+            return $result;
         }
-        // register the object
-        $this->smarty->registered_objects[$object_name] =
-        array($object_impl, (array) $allowed, (boolean) $smarty_args, (array) $block_methods);
-        return $this;
-    }
-
-    /**
-     * return a reference to a registered object
-     *
-     * @param string $name object name
-     * @return object
-     * @throws SmartyException if no such object is found
-     */
-    public function getRegisteredObject($name)
-    {
-        if (!isset($this->smarty->registered_objects[$name])) {
-            throw new SmartyException("'$name' is not a registered object");
-        }
-        if (!is_object($this->smarty->registered_objects[$name][0])) {
-            throw new SmartyException("registered '$name' is not an object");
+        catch (Exception $e) {
+            while (ob_get_level() > $level) {
+                ob_end_clean();
+            }
+            throw $e;
         }
-        return $this->smarty->registered_objects[$name][0];
     }
 
     /**
-     * unregister an object
+     * Registers plugin to be used in templates
      *
-     * @param string $name object name
-     * @return Smarty_Internal_Templatebase current Smarty_Internal_Templatebase (or Smarty or Smarty_Internal_Template) instance for chaining
-     */
-    public function unregisterObject($name)
-    {
-        if (isset($this->smarty->registered_objects[$name])) {
-            unset($this->smarty->registered_objects[$name]);
-        }
-
-        return $this;
-    }
-
-    /**
-     * Registers static classes to be used in templates
+     * @api  Smarty::registerPlugin()
+     * @link http://www.smarty.net/docs/en/api.register.plugin.tpl
      *
-     * @param string $class name of template class
-     * @param string $class_impl the referenced PHP class to register
-     * @return Smarty_Internal_Templatebase current Smarty_Internal_Templatebase (or Smarty or Smarty_Internal_Template) instance for chaining
-     * @throws SmartyException if $class_impl does not refer to an existing class
-     */
-    public function registerClass($class_name, $class_impl)
-    {
-        // test if exists
-        if (!class_exists($class_impl)) {
-            throw new SmartyException("Undefined class '$class_impl' in register template class");
-        }
-        // register the class
-        $this->smarty->registered_classes[$class_name] = $class_impl;
-        return $this;
-    }
-
-    /**
-     * Registers a default plugin handler
+     * @param  string   $type       plugin type
+     * @param  string   $name       name of template tag
+     * @param  callback $callback   PHP callback to register
+     * @param  bool     $cacheable  if true (default) this function is cache able
+     * @param  mixed    $cache_attr caching attributes if any
      *
-     * @param callable $callback class/method name
-     * @return Smarty_Internal_Templatebase current Smarty_Internal_Templatebase (or Smarty or Smarty_Internal_Template) instance for chaining
-     * @throws SmartyException if $callback is not callable
+     * @return \Smarty|\Smarty_Internal_Template
+     * @throws SmartyException              when the plugin tag is invalid
      */
-    public function registerDefaultPluginHandler($callback)
+    public function registerPlugin($type, $name, $callback, $cacheable = true, $cache_attr = null)
     {
-        if (is_callable($callback)) {
-            $this->smarty->default_plugin_handler_func = $callback;
-        } else {
-            throw new SmartyException("Default plugin handler '$callback' not callable");
-        }
-
-        return $this;
+        return $this->ext->registerPlugin->registerPlugin($this, $type, $name, $callback, $cacheable, $cache_attr);
     }
 
     /**
-     * Registers a default template handler
+     * load a filter of specified type and name
      *
-     * @param callable $callback class/method name
-     * @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)
-    {
-        if (is_callable($callback)) {
-            $this->smarty->default_template_handler_func = $callback;
-        } else {
-            throw new SmartyException("Default template handler '$callback' not callable");
-        }
-
-        return $this;
-    }
-
-    /**
-     * Registers a default template handler
+     * @api  Smarty::loadFilter()
+     * @link http://www.smarty.net/docs/en/api.load.filter.tpl
+     *
+     * @param  string $type filter type
+     * @param  string $name filter name
      *
-     * @param callable $callback class/method name
-     * @return Smarty_Internal_Templatebase current Smarty_Internal_Templatebase (or Smarty or Smarty_Internal_Template) instance for chaining
-     * @throws SmartyException if $callback is not callable
+     * @return bool
+     * @throws SmartyException if filter could not be loaded
      */
-    public function registerDefaultConfigHandler($callback)
+    public function loadFilter($type, $name)
     {
-        if (is_callable($callback)) {
-            $this->smarty->default_config_handler_func = $callback;
-        } else {
-            throw new SmartyException("Default config handler '$callback' not callable");
-        }
-
-        return $this;
+        return $this->ext->loadFilter->loadFilter($this, $type, $name);
     }
 
     /**
      * Registers a filter function
      *
-     * @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
-     */
-    public function registerFilter($type, $callback)
-    {
-        $this->smarty->registered_filters[$type][$this->_get_filter_name($callback)] = $callback;
-        return $this;
-    }
-
-    /**
-     * Unregisters a filter function
+     * @api  Smarty::registerFilter()
+     * @link http://www.smarty.net/docs/en/api.register.filter.tpl
+     *
+     * @param  string      $type filter type
+     * @param  callback    $callback
+     * @param  string|null $name optional filter name
      *
-     * @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|\Smarty_Internal_Template
+     * @throws \SmartyException
      */
-    public function unregisterFilter($type, $callback)
+    public function registerFilter($type, $callback, $name = null)
     {
-        $name = $this->_get_filter_name($callback);
-        if (isset($this->smarty->registered_filters[$type][$name])) {
-            unset($this->smarty->registered_filters[$type][$name]);
-        }
-
-        return $this;
+        return $this->ext->registerFilter->registerFilter($this, $type, $callback, $name);
     }
 
     /**
-     * Return internal filter name
+     * Registers object to be used in templates
      *
-     * @param callback $function_name
-     * @return string internal filter name
+     * @api  Smarty::registerObject()
+     * @link http://www.smarty.net/docs/en/api.register.object.tpl
+     *
+     * @param  string $object_name
+     * @param  object $object                     the referenced PHP object to register
+     * @param  array  $allowed_methods_properties list of allowed methods (empty = all)
+     * @param  bool   $format                     smarty argument format, else traditional
+     * @param  array  $block_methods              list of block-methods
+     *
+     * @return \Smarty|\Smarty_Internal_Template
+     * @throws \SmartyException
      */
-    public function _get_filter_name($function_name)
+    public function registerObject($object_name, $object, $allowed_methods_properties = array(), $format = true,
+                                   $block_methods = array())
     {
-        if (is_array($function_name)) {
-            $_class_name = (is_object($function_name[0]) ?
-            get_class($function_name[0]) : $function_name[0]);
-            return $_class_name . '_' . $function_name[1];
-        } else {
-            return $function_name;
-        }
+        return $this->ext->registerObject->registerObject($this, $object_name, $object, $allowed_methods_properties,
+                                                          $format, $block_methods);
     }
 
     /**
-     * load a filter of specified type and name
-     *
-     * @param string $type filter type
-     * @param string $name filter name
-     * @throws SmartyException if filter could not be loaded
+     * @param boolean $caching
      */
-    public function loadFilter($type, $name)
+    public function setCaching($caching)
     {
-        $_plugin = "smarty_{$type}filter_{$name}";
-        $_filter_name = $_plugin;
-        if ($this->smarty->loadPlugin($_plugin)) {
-            if (class_exists($_plugin, false)) {
-                $_plugin = array($_plugin, 'execute');
-            }
-            if (is_callable($_plugin)) {
-                $this->smarty->registered_filters[$type][$_filter_name] = $_plugin;
-                return true;
-            }
-        }
-        throw new SmartyException("{$type}filter \"{$name}\" not callable");
+        $this->caching = $caching;
     }
 
     /**
-     * unload a filter of specified type and name
-     *
-     * @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
+     * @param int $cache_lifetime
      */
-    public function unloadFilter($type, $name)
+    public function setCacheLifetime($cache_lifetime)
     {
-        $_filter_name = "smarty_{$type}filter_{$name}";
-        if (isset($this->smarty->registered_filters[$type][$_filter_name])) {
-            unset ($this->smarty->registered_filters[$type][$_filter_name]);
-        }
-
-        return $this;
+        $this->cache_lifetime = $cache_lifetime;
     }
 
     /**
-     * preg_replace callback to convert camelcase getter/setter to underscore property names
-     *
-     * @param string $match match string
-     * @return string replacemant
+     * @param string $compile_id
      */
-    private function replaceCamelcase($match) {
-        return "_" . strtolower($match[1]);
+    public function setCompileId($compile_id)
+    {
+        $this->compile_id = $compile_id;
     }
 
     /**
-     * Handle unknown class methods
-     *
-     * @param string $name unknown method-name
-     * @param array  $args argument array
+     * @param string $cache_id
      */
-    public function __call($name, $args)
+    public function setCacheId($cache_id)
     {
-        static $_prefixes = array('set' => true, 'get' => true);
-        static $_resolved_property_name = array();
-        static $_resolved_property_source = array();
-
-        // method of Smarty object?
-        if (method_exists($this->smarty, $name)) {
-            return call_user_func_array(array($this->smarty, $name), $args);
-        }
-        // see if this is a set/get for a property
-        $first3 = strtolower(substr($name, 0, 3));
-        if (isset($_prefixes[$first3]) && isset($name[3]) && $name[3] !== '_') {
-            if (isset($_resolved_property_name[$name])) {
-                $property_name = $_resolved_property_name[$name];
-            } else {
-                // try to keep case correct for future PHP 6.0 case-sensitive class methods
-                // lcfirst() not available < PHP 5.3.0, so improvise
-                $property_name = strtolower(substr($name, 3, 1)) . substr($name, 4);
-                // convert camel case to underscored name
-                $property_name = preg_replace_callback('/([A-Z])/', array($this,'replaceCamelcase'), $property_name);
-                $_resolved_property_name[$name] = $property_name;
-            }
-            if (isset($_resolved_property_source[$property_name])) {
-                $_is_this = $_resolved_property_source[$property_name];
-            } else {
-                $_is_this = null;
-                if (property_exists($this, $property_name)) {
-                    $_is_this = true;
-                } else if (property_exists($this->smarty, $property_name)) {
-                    $_is_this = false;
-                }
-                $_resolved_property_source[$property_name] = $_is_this;
-            }
-            if ($_is_this) {
-                if ($first3 == 'get')
-                return $this->$property_name;
-                else
-                return $this->$property_name = $args[0];
-            } else if ($_is_this === false) {
-                if ($first3 == 'get')
-                return $this->smarty->$property_name;
-                else
-                return $this->smarty->$property_name = $args[0];
-            } else {
-                throw new SmartyException("property '$property_name' does not exist.");
-                return false;
-            }
-        }
-        if ($name == 'Smarty') {
-            throw new SmartyException("PHP5 requires you to call __construct() instead of Smarty()");
-        }
-        // must be unknown
-        throw new SmartyException("Call of unknown method '$name'.");
+        $this->cache_id = $cache_id;
     }
 
 }
 
-?>
\ No newline at end of file
diff --git a/include/smarty/libs/sysplugins/smarty_internal_templatecompilerbase.php b/include/smarty/libs/sysplugins/smarty_internal_templatecompilerbase.php
index c745d294d..04584a40f 100644
--- a/include/smarty/libs/sysplugins/smarty_internal_templatecompilerbase.php
+++ b/include/smarty/libs/sysplugins/smarty_internal_templatecompilerbase.php
@@ -2,49 +2,61 @@
 
 /**
  * Smarty Internal Plugin Smarty Template Compiler Base
+ * This file contains the basic classes and methods for compiling Smarty templates with lexer/parser
  *
- * This file contains the basic classes and methodes for compiling Smarty templates with lexer/parser
- *
- * @package Smarty
+ * @package    Smarty
  * @subpackage Compiler
- * @author Uwe Tews
+ * @author     Uwe Tews
  */
 
 /**
  * Main abstract compiler class
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage Compiler
+ *
+ * @property Smarty_Internal_SmartyTemplateCompiler $prefixCompiledCode  = ''
+ * @property Smarty_Internal_SmartyTemplateCompiler $postfixCompiledCode = ''
+ * @method Smarty_Internal_SmartyTemplateCompiler registerPostCompileCallback($callback, $parameter = array(), $key = null, $replace = false)
+ * @method Smarty_Internal_SmartyTemplateCompiler unregisterPostCompileCallback($key)
  */
-abstract class Smarty_Internal_TemplateCompilerBase {
+abstract class Smarty_Internal_TemplateCompilerBase
+{
 
     /**
-     * hash for nocache sections
+     * Smarty object
      *
-     * @var mixed
+     * @var Smarty
      */
-    private $nocache_hash = null;
+    public $smarty = null;
 
     /**
-     * suppress generation of nocache code
+     * Parser object
      *
-     * @var bool
+     * @var Smarty_Internal_Templateparser
      */
-    public $suppressNocacheProcessing = false;
+    public $parser = null;
 
     /**
-     * suppress generation of merged template code
+     * hash for nocache sections
+     *
+     * @var mixed
+     */
+    public $nocache_hash = null;
+
+    /**
+     * suppress generation of nocache code
      *
      * @var bool
      */
-    public $suppressMergedTemplates = false;
+    public $suppressNocacheProcessing = false;
 
     /**
-     * compile tag objects
+     * compile tag objects cache
      *
      * @var array
      */
-    public static $_tag_objects = array();
+    public $_tag_objects = array();
 
     /**
      * tag stack
@@ -61,18 +73,53 @@ abstract class Smarty_Internal_TemplateCompilerBase {
     public $template = null;
 
     /**
-     * merged templates
+     * merged included sub template data
      *
      * @var array
      */
-    public $merged_templates = array();
+    public $mergedSubTemplatesData = array();
 
     /**
-     * flag when compiling {block}
+     * merged sub template code
      *
-     * @var bool
+     * @var array
      */
-    public $inheritance = false;
+    public $mergedSubTemplatesCode = array();
+
+    /**
+     * collected template properties during compilation
+     *
+     * @var array
+     */
+    public $templateProperties = array();
+
+    /**
+     * source line offset for error messages
+     *
+     * @var int
+     */
+    public $trace_line_offset = 0;
+
+    /**
+     * trace uid
+     *
+     * @var string
+     */
+    public $trace_uid = '';
+
+    /**
+     * trace file path
+     *
+     * @var string
+     */
+    public $trace_filepath = '';
+
+    /**
+     * stack for tracing file and line of nested {block} tags
+     *
+     * @var array
+     */
+    public $trace_stack = array();
 
     /**
      * plugins loaded by default plugin handler
@@ -90,172 +137,377 @@ abstract class Smarty_Internal_TemplateCompilerBase {
 
     /**
      * force compilation of complete template as nocache
+     *
      * @var boolean
      */
     public $forceNocache = false;
 
     /**
-     * suppress Smarty header code in compiled template
+     * flag if compiled template file shall we written
+     *
      * @var bool
      */
-    public $suppressHeader = false;
+    public $write_compiled_code = true;
 
     /**
-     * suppress template property header code in compiled template
-     * @var bool
+     * Template functions
+     *
+     * @var array
      */
-    public $suppressTemplatePropertyHeader = false;
+    public $tpl_function = array();
 
     /**
-     * flag if compiled template file shall we written
-     * @var bool
+     * called sub functions from template function
+     *
+     * @var array
      */
-    public $write_compiled_code = true;
+    public $called_functions = array();
 
     /**
-     * flag if currently a template function is compiled
-     * @var bool
+     * compiled template or block function code
+     *
+     * @var string
      */
-    public $compiles_template_function = false;
+    public $blockOrFunctionCode = '';
 
     /**
-     * called subfuntions from template function
-     * @var array
+     * php_handling setting either from Smarty or security
+     *
+     * @var int
      */
-    public $called_functions = array();
+    public $php_handling = 0;
 
     /**
      * flags for used modifier plugins
+     *
      * @var array
      */
     public $modifier_plugins = array();
 
     /**
      * type of already compiled modifier
+     *
      * @var array
      */
     public $known_modifier_type = array();
 
     /**
-     * Methode to compile a Smarty template
+     * parent compiler object for merged subtemplates and template functions
+     *
+     * @var 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;
+
+    /**
+     * 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;
+
+    /**
+     * Stack for {setfilter} {/setfilter}
+     *
+     * @var array
+     */
+    public $variable_filter_stack = array();
+
+    /**
+     * variable filters for {setfilter} {/setfilter}
+     *
+     * @var array
+     */
+    public $variable_filters = array();
+
+    /**
+     * Nesting count of looping tags like {foreach}, {for}, {section}, {while}
+     *
+     * @var int
+     */
+    public $loopNesting = 0;
+
+    /**
+     * Strip preg pattern
+     *
+     * @var string
+     */
+    public $stripRegEx = '![\t ]*[\r\n]+[\t ]*!';
+
+    /**
+     * plugin search order
+     *
+     * @var array
+     */
+    public $plugin_search_order = array('function', 'block', 'compiler', 'class');
+
+    /**
+     * General storage area for tag compiler plugins
+     *
+     * @var array
+     */
+    public $_cache = array();
+
+    /**
+     * method to compile a Smarty template
+     *
+     * @param mixed $_content template source
+     * @param bool  $isTemplateSource
      *
-     * @param  mixed $_content template source
      * @return bool true if compiling succeeded, false if it failed
      */
-    abstract protected function doCompile($_content);
+    abstract protected function doCompile($_content, $isTemplateSource = false);
 
     /**
      * Initialize compiler
+     *
+     * @param Smarty $smarty global instance
      */
-    public function __construct() {
-        $this->nocache_hash = str_replace('.', '-', uniqid(rand(), true));
+    public function __construct(Smarty $smarty)
+    {
+        $this->smarty = $smarty;
+        $this->nocache_hash = str_replace(array('.', ','), '_', uniqid(rand(), true));
     }
 
     /**
      * Method to compile a Smarty template
      *
-     * @param  Smarty_Internal_Template $template template object to compile
+     * @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
+     * @throws \Exception
      */
-    public function compileTemplate(Smarty_Internal_Template $template) {
-        if (empty($template->properties['nocache_hash'])) {
-            $template->properties['nocache_hash'] = $this->nocache_hash;
-        } else {
-            $this->nocache_hash = $template->properties['nocache_hash'];
-        }
-        // flag for nochache sections
-        $this->nocache = false;
-        $this->tag_nocache = false;
-        // save template object in compiler class
-        $this->template = $template;
-        // reset has noche code flag
-        $this->template->has_nocache_code = false;
-        $this->smarty->_current_file = $saved_filepath = $this->template->source->filepath;
-        // template header code
-        $template_header = '';
-        if (!$this->suppressHeader) {
-            $template_header .= "<?php /* Smarty version " . Smarty::SMARTY_VERSION . ", created on " . strftime("%Y-%m-%d %H:%M:%S") . "\n";
-            $template_header .= "         compiled from \"" . $this->template->source->filepath . "\" */ ?>\n";
-        }
+    public function compileTemplate(Smarty_Internal_Template $template, $nocache = null,
+                                    Smarty_Internal_TemplateCompilerBase $parent_compiler = null)
+    {
+        // get code frame of compiled template
+        $_compiled_code = $template->smarty->ext->_codeFrame->create($template,
+                                                                     $this->compileTemplateSource($template, $nocache,
+                                                                                                  $parent_compiler),
+                                                                     $this->postFilter($this->blockOrFunctionCode) .
+                                                                     join('', $this->mergedSubTemplatesCode), false, $this);
+        return $_compiled_code;
+    }
 
-        do {
-            // flag for aborting current and start recompile
-            $this->abort_and_recompile = false;
-            // get template source
-            $_content = $template->source->content;
-            // run prefilter if required
-            if (isset($this->smarty->autoload_filters['pre']) || isset($this->smarty->registered_filters['pre'])) {
-                $_content = Smarty_Internal_Filter_Handler::runFilter('pre', $_content, $template);
+    /**
+     * Compile template source and run optional post filter
+     *
+     * @param \Smarty_Internal_Template             $template
+     * @param null|bool                             $nocache flag if template must be compiled in nocache mode
+     * @param \Smarty_Internal_TemplateCompilerBase $parent_compiler
+     *
+     * @return string
+     * @throws \Exception
+     */
+    public function compileTemplateSource(Smarty_Internal_Template $template, $nocache = null,
+                                          Smarty_Internal_TemplateCompilerBase $parent_compiler = null)
+    {
+        try {
+            // save template object in compiler class
+            $this->template = $template;
+            if (property_exists($this->template->smarty, 'plugin_search_order')) {
+                $this->plugin_search_order = $this->template->smarty->plugin_search_order;
             }
-            // on empty template just return header
-            if ($_content == '') {
-                if ($this->suppressTemplatePropertyHeader) {
-                    $code = '';
-                } else {
-                    $code = $template_header . $template->createTemplateCodeFrame();
-                }
-                return $code;
+            if ($this->smarty->debugging) {
+                $this->smarty->_debug->start_compile($this->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;
             }
-            // call compiler
-            $_compiled_code = $this->doCompile($_content);
-        } while ($this->abort_and_recompile);
-        $this->template->source->filepath = $saved_filepath;
-        // free memory
-        unset($this->parser->root_buffer, $this->parser->current_buffer, $this->parser, $this->lex, $this->template);
-        self::$_tag_objects = array();
-        // return compiled code to template object
-        $merged_code = '';
-        if (!$this->suppressMergedTemplates && !empty($this->merged_templates)) {
-            foreach ($this->merged_templates as $code) {
-                $merged_code .= $code;
+            $this->parent_compiler = $parent_compiler ? $parent_compiler : $this;
+            $nocache = isset($nocache) ? $nocache : false;
+            if (empty($template->compiled->nocache_hash)) {
+                $template->compiled->nocache_hash = $this->nocache_hash;
+            } else {
+                $this->nocache_hash = $template->compiled->nocache_hash;
             }
-            // run postfilter if required on merged code
-            if (isset($this->smarty->autoload_filters['post']) || isset($this->smarty->registered_filters['post'])) {
-                $merged_code = Smarty_Internal_Filter_Handler::runFilter('post', $merged_code, $template);
+            // flag for nocache sections
+            $this->nocache = $nocache;
+            $this->tag_nocache = false;
+            // reset has nocache code flag
+            $this->template->compiled->has_nocache_code = false;
+            $this->has_variable_string = false;
+            $this->prefix_code = array();
+            // add file dependency
+            $this->parent_compiler->template->compiled->file_dependency[$this->template->source->uid] =
+                array($this->template->source->filepath, $this->template->source->getTimeStamp(),
+                      $this->template->source->type);
+            $this->smarty->_current_file = $this->template->source->filepath;
+            // get template source
+            if (!empty($this->template->source->components)) {
+                // we have array of inheritance templates by extends: resource
+                // generate corresponding source code sequence
+                $_content =
+                    Smarty_Internal_Compile_Extends::extendsSourceArrayCode($this->template->source->components);
+            } else {
+                // get template source
+                $_content = $this->template->source->getContent();
             }
+            $_compiled_code = $this->postFilter($this->doCompile($this->preFilter($_content), true));
         }
-        // run postfilter if required on compiled template code
-        if (isset($this->smarty->autoload_filters['post']) || isset($this->smarty->registered_filters['post'])) {
-            $_compiled_code = Smarty_Internal_Filter_Handler::runFilter('post', $_compiled_code, $template);
+        catch (Exception $e) {
+            if ($this->smarty->debugging) {
+                $this->smarty->_debug->end_compile($this->template);
+            }
+            $this->_tag_stack = array();
+            $this->_tag_objects = array();
+            // free memory
+            $this->parent_compiler = null;
+            $this->template = null;
+            $this->parser = null;
+            throw $e;
         }
-        if ($this->suppressTemplatePropertyHeader) {
-            $code = $_compiled_code . $merged_code;
+        if ($this->smarty->debugging) {
+            $this->smarty->_debug->end_compile($this->template);
+        }
+        $this->parent_compiler = null;
+        $this->template = null;
+        $this->parser = null;
+        return $_compiled_code;
+    }
+
+    /**
+     * Optionally process compiled code by post filter
+     *
+     * @param string $code compiled code
+     *
+     * @return string
+     * @throws \SmartyException
+     */
+    public function postFilter($code)
+    {
+        // run post filter if on code
+        if (!empty($code) &&
+            (isset($this->smarty->autoload_filters['post']) || isset($this->smarty->registered_filters['post']))
+        ) {
+            return $this->smarty->ext->_filterHandler->runFilter('post', $code, $this->template);
         } else {
-            $code = $template_header . $template->createTemplateCodeFrame($_compiled_code) . $merged_code;
+            return $code;
         }
-        // unset content because template inheritance could have replace source with parent code
-        unset ($template->source->content);
-        return $code;
     }
 
     /**
-     * Compile Tag
+     * Run optional prefilter
      *
+     * @param string $_content template source
+     *
+     * @return string
+     * @throws \SmartyException
+     */
+    public function preFilter($_content)
+    {
+        // run pre filter if required
+        if ($_content != '' &&
+            ((isset($this->smarty->autoload_filters['pre']) || isset($this->smarty->registered_filters['pre'])))
+        ) {
+            return $this->smarty->ext->_filterHandler->runFilter('pre', $_content, $this->template);
+        } else {
+            return $_content;
+        }
+    }
+
+    /**
+     * Compile Tag
      * This is a call back from the lexer/parser
-     * It executes the required compile plugin for the Smarty tag
      *
-     * @param string $tag       tag name
-     * @param array  $args      array with tag attributes
-     * @param array  $parameter array with compilation parameter
+     * 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
+     * @param  array  $parameter array with compilation parameter
+     *
+     * @throws SmartyCompilerException
+     * @throws SmartyException
+     * @return string compiled code
+     */
+    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
      */
-    public function compileTag($tag, $args, $parameter = array()) {
+    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;
         $this->has_output = false;
         // log tag/attributes
-        if (isset($this->smarty->get_used_tags) && $this->smarty->get_used_tags) {
-            $this->template->used_tags[] = array($tag, $args);
+        if (isset($this->smarty->_cache['get_used_tags'])) {
+            $this->template->_cache['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;
         }
-        // compile the smarty tag (required compile classes to compile the tag are autoloaded)
+        // compile the smarty tag (required compile classes to compile the tag are auto loaded)
         if (($_output = $this->callTagCompiler($tag, $args, $parameter)) === false) {
-            if (isset($this->smarty->template_functions[$tag])) {
+            if (isset($this->parent_compiler->template->tpl_function[$tag])) {
                 // template defined by {template} tag
                 $args['_attr']['name'] = "'" . $tag . "'";
                 $_output = $this->callTagCompiler('call', $args, $parameter);
@@ -274,7 +526,7 @@ abstract class Smarty_Internal_TemplateCompilerBase {
                 }
             }
             // tag did not produce compiled code
-            return '';
+            return null;
         } else {
             // map_named attributes
             if (isset($args['_attr'])) {
@@ -285,21 +537,27 @@ abstract class Smarty_Internal_TemplateCompilerBase {
                 }
             }
             // not an internal compiler tag
-            if (strlen($tag) < 6 || substr($tag, -5) != 'close') {
+            if (strlen($tag) < 6 || substr($tag, - 5) != 'close') {
                 // check if tag is a registered object
-                if (isset($this->smarty->registered_objects[$tag]) && isset($parameter['object_methode'])) {
-                    $methode = $parameter['object_methode'];
-                    if (!in_array($methode, $this->smarty->registered_objects[$tag][3]) &&
-                            (empty($this->smarty->registered_objects[$tag][1]) || in_array($methode, $this->smarty->registered_objects[$tag][1]))) {
-                        return $this->callTagCompiler('private_object_function', $args, $parameter, $tag, $methode);
-                    } elseif (in_array($methode, $this->smarty->registered_objects[$tag][3])) {
-                        return $this->callTagCompiler('private_object_block_function', $args, $parameter, $tag, $methode);
+                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]))
+                    ) {
+                        return $this->callTagCompiler('private_object_function', $args, $parameter, $tag, $method);
+                    } elseif (in_array($method, $this->smarty->registered_objects[$tag][3])) {
+                        return $this->callTagCompiler('private_object_block_function', $args, $parameter, $tag,
+                                                      $method);
                     } else {
-                        return $this->trigger_template_error('unallowed methode "' . $methode . '" in registered object "' . $tag . '"', $this->lex->taglineno);
+                        // throw exception
+                        $this->trigger_template_error('not allowed method "' . $method . '" in registered object "' .
+                                                      $tag . '"', null, true);
                     }
                 }
                 // check if tag is registered
-                foreach (array(Smarty::PLUGIN_COMPILER, Smarty::PLUGIN_FUNCTION, Smarty::PLUGIN_BLOCK) as $plugin_type) {
+                foreach (array(Smarty::PLUGIN_COMPILER, Smarty::PLUGIN_FUNCTION, Smarty::PLUGIN_BLOCK) as $plugin_type)
+                {
                     if (isset($this->smarty->registered_plugins[$plugin_type][$tag])) {
                         // if compiler function plugin call it now
                         if ($plugin_type == Smarty::PLUGIN_COMPILER) {
@@ -317,21 +575,27 @@ abstract class Smarty_Internal_TemplateCompilerBase {
                             $function = $this->smarty->registered_plugins[$plugin_type][$tag][0];
                             if (!is_array($function)) {
                                 return $function($new_args, $this);
-                            } else if (is_object($function[0])) {
-                                return $this->smarty->registered_plugins[$plugin_type][$tag][0][0]->$function[1]($new_args, $this);
+                            } elseif (is_object($function[0])) {
+                                return $this->smarty->registered_plugins[$plugin_type][$tag][0][0]->{$function[1]}($new_args,
+                                                                                                                   $this);
                             } else {
                                 return call_user_func_array($function, array($new_args, $this));
                             }
                         }
                         // compile registered function or block function
                         if ($plugin_type == Smarty::PLUGIN_FUNCTION || $plugin_type == Smarty::PLUGIN_BLOCK) {
-                            return $this->callTagCompiler('private_registered_' . $plugin_type, $args, $parameter, $tag);
+                            return $this->callTagCompiler('private_registered_' . $plugin_type, $args, $parameter,
+                                                          $tag);
                         }
                     }
                 }
                 // check plugins from plugins folder
-                foreach ($this->smarty->plugin_search_order as $plugin_type) {
-                    if ($plugin_type == Smarty::PLUGIN_BLOCK && $this->smarty->loadPlugin('smarty_compiler_' . $tag) && (!isset($this->smarty->security_policy) || $this->smarty->security_policy->isTrustedTag($tag, $this))) {
+                foreach ($this->plugin_search_order as $plugin_type) {
+                    if ($plugin_type == Smarty::PLUGIN_COMPILER &&
+                        $this->smarty->loadPlugin('smarty_compiler_' . $tag) &&
+                        (!isset($this->smarty->security_policy) ||
+                            $this->smarty->security_policy->isTrustedTag($tag, $this))
+                    ) {
                         $plugin = 'smarty_compiler_' . $tag;
                         if (is_callable($plugin)) {
                             // convert arguments format for old compiler plugins
@@ -343,6 +607,7 @@ abstract class Smarty_Internal_TemplateCompilerBase {
                                     $new_args[$key] = $mixed;
                                 }
                             }
+
                             return $plugin($new_args, $this->smarty);
                         }
                         if (class_exists($plugin, false)) {
@@ -354,8 +619,11 @@ abstract class Smarty_Internal_TemplateCompilerBase {
                         throw new SmartyException("Plugin \"{$tag}\" not callable");
                     } else {
                         if ($function = $this->getPlugin($tag, $plugin_type)) {
-                            if (!isset($this->smarty->security_policy) || $this->smarty->security_policy->isTrustedTag($tag, $this)) {
-                                return $this->callTagCompiler('private_' . $plugin_type . '_plugin', $args, $parameter, $tag, $function);
+                            if (!isset($this->smarty->security_policy) ||
+                                $this->smarty->security_policy->isTrustedTag($tag, $this)
+                            ) {
+                                return $this->callTagCompiler('private_' . $plugin_type . '_plugin', $args, $parameter,
+                                                              $tag, $function);
                             }
                         }
                     }
@@ -363,7 +631,7 @@ abstract class Smarty_Internal_TemplateCompilerBase {
                 if (is_callable($this->smarty->default_plugin_handler_func)) {
                     $found = false;
                     // look for already resolved tags
-                    foreach ($this->smarty->plugin_search_order as $plugin_type) {
+                    foreach ($this->plugin_search_order as $plugin_type) {
                         if (isset($this->default_handler_plugins[$plugin_type][$tag])) {
                             $found = true;
                             break;
@@ -371,7 +639,7 @@ abstract class Smarty_Internal_TemplateCompilerBase {
                     }
                     if (!$found) {
                         // call default handler
-                        foreach ($this->smarty->plugin_search_order as $plugin_type) {
+                        foreach ($this->plugin_search_order as $plugin_type) {
                             if ($this->getPluginFromDefaultHandler($tag, $plugin_type)) {
                                 $found = true;
                                 break;
@@ -388,36 +656,55 @@ abstract class Smarty_Internal_TemplateCompilerBase {
                             $function = $this->default_handler_plugins[$plugin_type][$tag][0];
                             if (!is_array($function)) {
                                 return $function($new_args, $this);
-                            } else if (is_object($function[0])) {
-                                return $this->default_handler_plugins[$plugin_type][$tag][0][0]->$function[1]($new_args, $this);
+                            } elseif (is_object($function[0])) {
+                                return $this->default_handler_plugins[$plugin_type][$tag][0][0]->$function[1]($new_args,
+                                                                                                              $this);
                             } else {
                                 return call_user_func_array($function, array($new_args, $this));
                             }
                         } else {
-                            return $this->callTagCompiler('private_registered_' . $plugin_type, $args, $parameter, $tag);
+                            return $this->callTagCompiler('private_registered_' . $plugin_type, $args, $parameter,
+                                                          $tag);
                         }
                     }
                 }
             } else {
                 // compile closing tag of block function
-                $base_tag = substr($tag, 0, -5);
+                $base_tag = substr($tag, 0, - 5);
                 // check if closing tag is a registered object
-                if (isset($this->smarty->registered_objects[$base_tag]) && isset($parameter['object_methode'])) {
-                    $methode = $parameter['object_methode'];
-                    if (in_array($methode, $this->smarty->registered_objects[$base_tag][3])) {
-                        return $this->callTagCompiler('private_object_block_function', $args, $parameter, $tag, $methode);
+                if (isset($this->smarty->registered_objects[$base_tag]) && isset($parameter['object_method'])) {
+                    $method = $parameter['object_method'];
+                    if (in_array($method, $this->smarty->registered_objects[$base_tag][3])) {
+                        return $this->callTagCompiler('private_object_block_function', $args, $parameter, $tag,
+                                                      $method);
                     } else {
-                        return $this->trigger_template_error('unallowed closing tag methode "' . $methode . '" in registered object "' . $base_tag . '"', $this->lex->taglineno);
+                        // throw exception
+                        $this->trigger_template_error('not allowed closing tag method "' . $method .
+                                                      '" in registered object "' . $base_tag . '"', null, true);
                     }
                 }
                 // registered block tag ?
-                if (isset($this->smarty->registered_plugins[Smarty::PLUGIN_BLOCK][$base_tag]) || isset($this->default_handler_plugins[Smarty::PLUGIN_BLOCK][$base_tag])) {
+                if (isset($this->smarty->registered_plugins[Smarty::PLUGIN_BLOCK][$base_tag]) ||
+                    isset($this->default_handler_plugins[Smarty::PLUGIN_BLOCK][$base_tag])
+                ) {
                     return $this->callTagCompiler('private_registered_block', $args, $parameter, $tag);
                 }
+                // registered function tag ?
+                if (isset($this->smarty->registered_plugins[Smarty::PLUGIN_FUNCTION][$tag])) {
+                    return $this->callTagCompiler('private_registered_function', $args, $parameter, $tag);
+                }
                 // block plugin?
                 if ($function = $this->getPlugin($base_tag, Smarty::PLUGIN_BLOCK)) {
                     return $this->callTagCompiler('private_block_plugin', $args, $parameter, $tag, $function);
                 }
+                // function plugin?
+                if ($function = $this->getPlugin($tag, Smarty::PLUGIN_FUNCTION)) {
+                    if (!isset($this->smarty->security_policy) ||
+                        $this->smarty->security_policy->isTrustedTag($tag, $this)
+                    ) {
+                        return $this->callTagCompiler('private_function_plugin', $args, $parameter, $tag, $function);
+                    }
+                }
                 // registered compiler plugin ?
                 if (isset($this->smarty->registered_plugins[Smarty::PLUGIN_COMPILER][$tag])) {
                     // if compiler function plugin call it now
@@ -428,8 +715,9 @@ abstract class Smarty_Internal_TemplateCompilerBase {
                     $function = $this->smarty->registered_plugins[Smarty::PLUGIN_COMPILER][$tag][0];
                     if (!is_array($function)) {
                         return $function($args, $this);
-                    } else if (is_object($function[0])) {
-                        return $this->smarty->registered_plugins[Smarty::PLUGIN_COMPILER][$tag][0][0]->$function[1]($args, $this);
+                    } elseif (is_object($function[0])) {
+                        return $this->smarty->registered_plugins[Smarty::PLUGIN_COMPILER][$tag][0][0]->$function[1]($args,
+                                                                                                                    $this);
                     } else {
                         return call_user_func_array($function, array($args, $this));
                     }
@@ -448,73 +736,179 @@ abstract class Smarty_Internal_TemplateCompilerBase {
                     throw new SmartyException("Plugin \"{$tag}\" not callable");
                 }
             }
-            $this->trigger_template_error("unknown tag \"" . $tag . "\"", $this->lex->taglineno);
+            $this->trigger_template_error("unknown tag \"" . $tag . "\"", null, true);
+        }
+    }
+
+    /**
+     * compile variable
+     *
+     * @param string $variable
+     *
+     * @return string
+     */
+    public function compileVariable($variable)
+    {
+        if (strpos($variable, '(') == 0) {
+            // not a variable variable
+            $var = trim($variable, '\'');
+            $this->tag_nocache = $this->tag_nocache |
+                $this->template->ext->getTemplateVars->_getVariable($this->template, $var, null, true, false)->nocache;
+            // todo $this->template->compiled->properties['variables'][$var] = $this->tag_nocache | $this->nocache;
         }
+        return '$_smarty_tpl->tpl_vars[' . $variable . ']->value';
+    }
+
+    /**
+     * compile config variable
+     *
+     * @param string $variable
+     *
+     * @return string
+     */
+    public function compileConfigVariable($variable)
+    {
+        // return '$_smarty_tpl->config_vars[' . $variable . ']';
+        return '$_smarty_tpl->smarty->ext->configLoad->_getConfigVariable($_smarty_tpl, ' . $variable . ')';
     }
 
     /**
-     * lazy loads internal compile plugin for tag and calls the compile methode
+     * This method is called from parser to process a text content section
+     * - remove text from inheritance child templates as they may generate output
+     * - strip text if strip is enabled
+     *
+     * @param string $text
      *
+     * @return null|\Smarty_Internal_ParseTree_Text
+     */
+    public function processText($text)
+    {
+        $store = array();
+        $_store = 0;
+        $_offset = 0;
+        if ($this->parser->strip) {
+            if (strpos($text, '<') !== false) {
+                // capture html elements not to be messed with
+                $_offset = 0;
+                if (preg_match_all('#(<script[^>]*>.*?</script[^>]*>)|(<textarea[^>]*>.*?</textarea[^>]*>)|(<pre[^>]*>.*?</pre[^>]*>)#is',
+                                   $text, $matches, PREG_OFFSET_CAPTURE | PREG_SET_ORDER)) {
+                    foreach ($matches as $match) {
+                        $store[] = $match[ 0 ][ 0 ];
+                        $_length = strlen($match[ 0 ][ 0 ]);
+                        $replace = '@!@SMARTY:' . $_store . ':SMARTY@!@';
+                        $text = substr_replace($text, $replace, $match[ 0 ][ 1 ] - $_offset, $_length);
+
+                        $_offset += $_length - strlen($replace);
+                        $_store ++;
+                    }
+                }
+
+                $expressions = array(// replace multiple spaces between tags by a single space
+                                     // 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*("[^"]*?")|(\'[^\']*?\'))|<[a-z0-9_]+)\s+([a-z/>])#is' => '\1 \5',
+                                     '#^\s+<#Ss'                                                               => '<',
+                                     '#>\s+$#Ss'                                                               => '>',
+                                     $this->stripRegEx                                                         => ''
+                );
+
+                $text = preg_replace(array_keys($expressions), array_values($expressions), $text);
+                $_offset = 0;
+                if (preg_match_all('#@!@SMARTY:([0-9]+):SMARTY@!@#is', $text, $matches,
+                                   PREG_OFFSET_CAPTURE | PREG_SET_ORDER)) {
+                    foreach ($matches as $match) {
+                        $_length = strlen($match[ 0 ][ 0 ]);
+                        $replace = $store[ $match[ 1 ][ 0 ] ];
+                        $text = substr_replace($text, $replace, $match[ 0 ][ 1 ] + $_offset, $_length);
+
+                        $_offset += strlen($replace) - $_length;
+                        $_store ++;
+                    }
+                }
+            } else {
+                $text = preg_replace($this->stripRegEx, '', $text);
+            }
+        }
+        if ($text) {
+            return new Smarty_Internal_ParseTree_Text($text);
+        }
+        return null;
+     }
+
+    /**
+     * lazy loads internal compile plugin for tag and calls the compile method
      * compile objects cached for reuse.
      * class name format:  Smarty_Internal_Compile_TagName
-     * plugin filename format: Smarty_Internal_Tagname.php
+     * plugin filename format: Smarty_Internal_TagName.php
+     *
+     * @param  string $tag    tag name
+     * @param  array  $args   list of tag attributes
+     * @param  mixed  $param1 optional parameter
+     * @param  mixed  $param2 optional parameter
+     * @param  mixed  $param3 optional parameter
      *
-     * @param string $tag   tag name
-     * @param array $args   list of tag attributes
-     * @param mixed $param1 optional parameter
-     * @param mixed $param2 optional parameter
-     * @param mixed $param3 optional parameter
      * @return string compiled code
      */
-    public function callTagCompiler($tag, $args, $param1 = null, $param2 = null, $param3 = null) {
+    public function callTagCompiler($tag, $args, $param1 = null, $param2 = null, $param3 = null)
+    {
         // re-use object if already exists
-        if (isset(self::$_tag_objects[$tag])) {
-            // compile this tag
-            return self::$_tag_objects[$tag]->compile($args, $this, $param1, $param2, $param3);
-        }
-        // lazy load internal compiler plugin
-        $class_name = 'Smarty_Internal_Compile_' . $tag;
-        if ($this->smarty->loadPlugin($class_name)) {
-            // check if tag allowed by security
-            if (!isset($this->smarty->security_policy) || $this->smarty->security_policy->isTrustedTag($tag, $this)) {
-                // use plugin if found
-                self::$_tag_objects[$tag] = new $class_name;
-                // compile this tag
-                return self::$_tag_objects[$tag]->compile($args, $this, $param1, $param2, $param3);
+        if (!isset($this->_tag_objects[$tag])) {
+            // lazy load internal compiler plugin
+            $_tag = explode('_', $tag);
+            $_tag = array_map('ucfirst', $_tag);
+            $class_name = 'Smarty_Internal_Compile_' . implode('_', $_tag);
+            if (class_exists($class_name) &&
+                (!isset($this->smarty->security_policy) || $this->smarty->security_policy->isTrustedTag($tag, $this))
+            ) {
+                $this->_tag_objects[$tag] = new $class_name;
+            } else {
+                $this->_tag_objects[$tag] = false;
+                return false;
             }
         }
-        // no internal compile plugin for this tag
-        return false;
+        // compile this tag
+        return $this->_tag_objects[$tag] === false ? false :
+            $this->_tag_objects[$tag]->compile($args, $this, $param1, $param2, $param3);
     }
 
     /**
      * Check for plugins and return function name
      *
-     * @param string $pugin_name  name of plugin or function
-     * @param string $plugin_type type of plugin
+     * @param         $plugin_name
+     * @param  string $plugin_type type of plugin
+     *
      * @return string call name of function
      */
-    public function getPlugin($plugin_name, $plugin_type) {
+    public function getPlugin($plugin_name, $plugin_type)
+    {
         $function = null;
         if ($this->template->caching && ($this->nocache || $this->tag_nocache)) {
-            if (isset($this->template->required_plugins['nocache'][$plugin_name][$plugin_type])) {
-                $function = $this->template->required_plugins['nocache'][$plugin_name][$plugin_type]['function'];
-            } else if (isset($this->template->required_plugins['compiled'][$plugin_name][$plugin_type])) {
-                $this->template->required_plugins['nocache'][$plugin_name][$plugin_type] = $this->template->required_plugins['compiled'][$plugin_name][$plugin_type];
-                $function = $this->template->required_plugins['nocache'][$plugin_name][$plugin_type]['function'];
+            if (isset($this->parent_compiler->template->compiled->required_plugins['nocache'][$plugin_name][$plugin_type])) {
+                $function =
+                    $this->parent_compiler->template->compiled->required_plugins['nocache'][$plugin_name][$plugin_type]['function'];
+            } elseif (isset($this->parent_compiler->template->compiled->required_plugins['compiled'][$plugin_name][$plugin_type])) {
+                $this->parent_compiler->template->compiled->required_plugins['nocache'][$plugin_name][$plugin_type] =
+                    $this->parent_compiler->template->compiled->required_plugins['compiled'][$plugin_name][$plugin_type];
+                $function =
+                    $this->parent_compiler->template->compiled->required_plugins['nocache'][$plugin_name][$plugin_type]['function'];
             }
         } else {
-            if (isset($this->template->required_plugins['compiled'][$plugin_name][$plugin_type])) {
-                $function = $this->template->required_plugins['compiled'][$plugin_name][$plugin_type]['function'];
-            } else if (isset($this->template->required_plugins['nocache'][$plugin_name][$plugin_type])) {
-                $this->template->required_plugins['compiled'][$plugin_name][$plugin_type] = $this->template->required_plugins['nocache'][$plugin_name][$plugin_type];
-                $function = $this->template->required_plugins['compiled'][$plugin_name][$plugin_type]['function'];
+            if (isset($this->parent_compiler->template->compiled->required_plugins['compiled'][$plugin_name][$plugin_type])) {
+                $function =
+                    $this->parent_compiler->template->compiled->required_plugins['compiled'][$plugin_name][$plugin_type]['function'];
+            } elseif (isset($this->parent_compiler->template->compiled->required_plugins['nocache'][$plugin_name][$plugin_type])) {
+                $this->parent_compiler->template->compiled->required_plugins['compiled'][$plugin_name][$plugin_type] =
+                    $this->parent_compiler->template->compiled->required_plugins['nocache'][$plugin_name][$plugin_type];
+                $function =
+                    $this->parent_compiler->template->compiled->required_plugins['compiled'][$plugin_name][$plugin_type]['function'];
             }
         }
         if (isset($function)) {
             if ($plugin_type == 'modifier') {
                 $this->modifier_plugins[$plugin_name] = true;
             }
+
             return $function;
         }
         // loop through plugin dirs and find the plugin
@@ -523,50 +917,61 @@ abstract class Smarty_Internal_TemplateCompilerBase {
 
         if (is_string($file)) {
             if ($this->template->caching && ($this->nocache || $this->tag_nocache)) {
-                $this->template->required_plugins['nocache'][$plugin_name][$plugin_type]['file'] = $file;
-                $this->template->required_plugins['nocache'][$plugin_name][$plugin_type]['function'] = $function;
+                $this->parent_compiler->template->compiled->required_plugins['nocache'][$plugin_name][$plugin_type]['file'] =
+                    $file;
+                $this->parent_compiler->template->compiled->required_plugins['nocache'][$plugin_name][$plugin_type]['function'] =
+                    $function;
             } else {
-                $this->template->required_plugins['compiled'][$plugin_name][$plugin_type]['file'] = $file;
-                $this->template->required_plugins['compiled'][$plugin_name][$plugin_type]['function'] = $function;
+                $this->parent_compiler->template->compiled->required_plugins['compiled'][$plugin_name][$plugin_type]['file'] =
+                    $file;
+                $this->parent_compiler->template->compiled->required_plugins['compiled'][$plugin_name][$plugin_type]['function'] =
+                    $function;
             }
             if ($plugin_type == 'modifier') {
                 $this->modifier_plugins[$plugin_name] = true;
             }
+
             return $function;
         }
         if (is_callable($function)) {
             // plugin function is defined in the script
             return $function;
         }
+
         return false;
     }
 
     /**
      * Check for plugins by default plugin handler
      *
-     * @param string $tag         name of tag
-     * @param string $plugin_type type of plugin
+     * @param  string $tag         name of tag
+     * @param  string $plugin_type type of plugin
+     *
      * @return boolean true if found
      */
-    public function getPluginFromDefaultHandler($tag, $plugin_type) {
+    public function getPluginFromDefaultHandler($tag, $plugin_type)
+    {
         $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) {
                 if (is_file($script)) {
                     if ($this->template->caching && ($this->nocache || $this->tag_nocache)) {
-                        $this->template->required_plugins['nocache'][$tag][$plugin_type]['file'] = $script;
-                        $this->template->required_plugins['nocache'][$tag][$plugin_type]['function'] = $callback;
+                        $this->parent_compiler->template->compiled->required_plugins['nocache'][$tag][$plugin_type]['file'] =
+                            $script;
+                        $this->parent_compiler->template->compiled->required_plugins['nocache'][$tag][$plugin_type]['function'] =
+                            $callback;
                     } else {
-                        $this->template->required_plugins['compiled'][$tag][$plugin_type]['file'] = $script;
-                        $this->template->required_plugins['compiled'][$tag][$plugin_type]['function'] = $callback;
+                        $this->parent_compiler->template->compiled->required_plugins['compiled'][$tag][$plugin_type]['file'] =
+                            $script;
+                        $this->parent_compiler->template->compiled->required_plugins['compiled'][$tag][$plugin_type]['function'] =
+                            $callback;
                     }
-                    include_once $script;
+                    require_once $script;
                 } else {
                     $this->trigger_template_error("Default plugin handler: Returned script file \"{$script}\" for \"{$tag}\" not found");
                 }
@@ -576,39 +981,64 @@ abstract class Smarty_Internal_TemplateCompilerBase {
             }
             if (is_callable($callback)) {
                 $this->default_handler_plugins[$plugin_type][$tag] = array($callback, true, array());
+
                 return true;
             } else {
                 $this->trigger_template_error("Default plugin handler: Returned callback for \"{$tag}\" not callable");
             }
         }
+
         return false;
     }
 
     /**
-     * Inject inline code for nocache template sections
+     * 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.
      * If the content is compiled code and it should be not cached the code is injected
      * into the rendered output.
      *
-     * @param string  $content content of template element
-     * @param boolean $is_code true if content is compiled code
-     * @return string content
+     * @param  string  $content content of template element
+     * @param  boolean $is_code true if content is compiled code
+     *
+     * @return string  content
      */
-    public function processNocacheCode($content, $is_code) {
+    public function processNocacheCode($content, $is_code)
+    {
         // 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 || $this->forceNocache == 2)) {
-                $this->template->has_nocache_code = true;
-                $_output = addcslashes($content,'\'\\');
+            if ((!($this->template->source->handler->recompiled) || $this->forceNocache) && $this->template->caching &&
+                !$this->suppressNocacheProcessing && ($this->nocache || $this->tag_nocache)
+            ) {
+                $this->template->compiled->has_nocache_code = true;
+                $_output = addcslashes($content, '\'\\');
                 $_output = str_replace("^#^", "'", $_output);
-                $_output = "<?php echo '/*%%SmartyNocache:{$this->nocache_hash}%%*/" . $_output . "/*/%%SmartyNocache:{$this->nocache_hash}%%*/';?>\n";
-                // make sure we include modifer plugins for nocache code
+                $_output = "<?php echo '/*%%SmartyNocache:{$this->nocache_hash}%%*/" . $_output .
+                    "/*/%%SmartyNocache:{$this->nocache_hash}%%*/';?>\n";
+                // make sure we include modifier plugins for nocache code
                 foreach ($this->modifier_plugins as $plugin_name => $dummy) {
-                    if (isset($this->template->required_plugins['compiled'][$plugin_name]['modifier'])) {
-                        $this->template->required_plugins['nocache'][$plugin_name]['modifier'] = $this->template->required_plugins['compiled'][$plugin_name]['modifier'];
+                    if (isset($this->parent_compiler->template->compiled->required_plugins['compiled'][$plugin_name]['modifier'])) {
+                        $this->parent_compiler->template->compiled->required_plugins['nocache'][$plugin_name]['modifier'] =
+                            $this->parent_compiler->template->compiled->required_plugins['compiled'][$plugin_name]['modifier'];
                     }
                 }
             } else {
@@ -620,40 +1050,106 @@ abstract class Smarty_Internal_TemplateCompilerBase {
         $this->modifier_plugins = array();
         $this->suppressNocacheProcessing = false;
         $this->tag_nocache = false;
+
         return $_output;
     }
 
     /**
-     * display compiler error messages without dying
+     * Get Id
+     *
+     * @param string $input
+     *
+     * @return bool|string
+     */
+    public function getId($input)
+    {
+        if (preg_match('~^[\'"]*([0-9]*[a-zA-Z_]\w*)[\'"]*$~', $input, $match)) {
+            return $match[1];
+        }
+        return false;
+    }
+
+    /**
+     * Get variable name from string
+     *
+     * @param string $input
+     *
+     * @return bool|string
+     */
+    public function getVariableName($input)
+    {
+        if (preg_match('~^[$]_smarty_tpl->tpl_vars\[[\'"]*([0-9]*[a-zA-Z_]\w*)[\'"]*\]->value$~', $input, $match)) {
+            return $match[1];
+        }
+        return false;
+    }
+
+    /**
+     * Generate nocache code string
+     *
+     * @param string $code PHP code
      *
+     * @return string
+     */
+    public function makeNocacheCode($code)
+    {
+        return "echo '/*%%SmartyNocache:{$this->nocache_hash}%%*/<?php " .
+        str_replace("^#^", "'", addcslashes($code, '\'\\')) . "?>/*/%%SmartyNocache:{$this->nocache_hash}%%*/';\n";
+    }
+
+    /**
+     * display compiler error messages without dying
      * If parameter $args is empty it is a parser detected syntax error.
      * In this case the parser is called to obtain information about expected tokens.
-     *
      * If parameter $args contains a string this is used as error message
      *
-     * @param string $args individual error message or null
-     * @param string $line line-number
-     * @throws SmartyCompilerException when an unexpected token is found
+     * @param  string   $args    individual error message or null
+     * @param  string   $line    line-number
+     * @param null|bool $tagline if true the line number of last tag
+     *
+     * @throws \SmartyCompilerException when an unexpected token is found
      */
-    public function trigger_template_error($args = null, $line = null) {
-        // get template source line which has error
-        if (!isset($line)) {
-            $line = $this->lex->line;
+    public function trigger_template_error($args = null, $line = null, $tagline = null)
+    {
+        $lex = $this->parser->lex;
+        if ($tagline === true) {
+            // get line number of Tag
+            $line = $lex->taglineno;
+        } elseif (!isset($line)) {
+            // get template source line which has error
+            $line = $lex->line;
+        } else {
+            $line = (int) $line;
+        }
+
+        if (in_array($this->template->source->type, array('eval', 'string'))) {
+            $templateName = $this->template->source->type . ':' . trim(preg_replace('![\t\r\n]+!', ' ',
+                                                                                    strlen($lex->data) > 40 ?
+                                                                                        substr($lex->data, 0, 40) .
+                                                                                        '...' : $lex->data));
+        } else {
+            $templateName = $this->template->source->type . ':' . $this->template->source->filepath;
         }
-        $match = preg_split("/\n/", $this->lex->data);
-        $error_text = 'Syntax Error in template "' . $this->template->source->filepath . '"  on line ' . $line . ' "' . htmlspecialchars(trim(preg_replace('![\t\r\n]+!', ' ', $match[$line - 1]))) . '" ';
+
+        //        $line += $this->trace_line_offset;
+        $match = preg_split("/\n/", $lex->data);
+        $error_text =
+            'Syntax error in template "' . (empty($this->trace_filepath) ? $templateName : $this->trace_filepath) .
+            '"  on line ' . ($line + $this->trace_line_offset) . ' "' .
+            trim(preg_replace('![\t\r\n]+!', ' ', $match[$line - 1])) . '" ';
         if (isset($args)) {
             // individual error message
             $error_text .= $args;
         } else {
+            $expect = array();
             // expected token from parser
-            $error_text .= ' - Unexpected "' . $this->lex->value . '"';
+            $error_text .= ' - Unexpected "' . $lex->value . '"';
             if (count($this->parser->yy_get_expected_tokens($this->parser->yymajor)) <= 4) {
                 foreach ($this->parser->yy_get_expected_tokens($this->parser->yymajor) as $token) {
                     $exp_token = $this->parser->yyTokenName[$token];
-                    if (isset($this->lex->smarty_token_names[$exp_token])) {
+                    if (isset($lex->smarty_token_names[$exp_token])) {
                         // token type from lexer
-                        $expect[] = '"' . $this->lex->smarty_token_names[$exp_token] . '"';
+                        $expect[] = '"' . $lex->smarty_token_names[$exp_token] . '"';
                     } else {
                         // otherwise internal token name
                         $expect[] = $this->parser->yyTokenName[$token];
@@ -662,9 +1158,11 @@ abstract class Smarty_Internal_TemplateCompilerBase {
                 $error_text .= ', expected one of: ' . implode(' , ', $expect);
             }
         }
-        throw new SmartyCompilerException($error_text);
+        $e = new SmartyCompilerException($error_text);
+        $e->line = $line;
+        $e->source = trim(preg_replace('![\t\r\n]+!', ' ', $match[$line - 1]));
+        $e->desc = $args;
+        $e->template = $this->template->source->filepath;
+        throw $e;
     }
-
 }
-
-?>
\ No newline at end of file
diff --git a/include/smarty/libs/sysplugins/smarty_internal_templatelexer.php b/include/smarty/libs/sysplugins/smarty_internal_templatelexer.php
index a7d5fa9a5..993b7be62 100644
--- a/include/smarty/libs/sysplugins/smarty_internal_templatelexer.php
+++ b/include/smarty/libs/sysplugins/smarty_internal_templatelexer.php
@@ -1,176 +1,319 @@
 <?php
+/*
+ * This file is part of Smarty.
+ *
+ * (c) 2015 Uwe Tews
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 /**
-* Smarty Internal Plugin Templatelexer
-*
-* This is the lexer to break the template source into tokens
-* @package Smarty
-* @subpackage Compiler
-* @author Uwe Tews
-*/
-/**
-* Smarty Internal Plugin Templatelexer
-*/
+ * Smarty_Internal_Templatelexer
+ * This is the template file lexer.
+ * It is generated from the smarty_internal_templatelexer.plex file
+ *
+ *
+ * @author Uwe Tews <uwe.tews@googlemail.com>
+ */
 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;
-    public $node;
+
+    /**
+     * current line
+     *
+     * @var int
+     */
     public $line;
+
+    /**
+     * tag start line
+     *
+     * @var
+     */
     public $taglineno;
+
+    /**
+     * php code type
+     *
+     * @var string
+     */
+    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;
-    private $heredoc_id_stack = 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',
-    				);
-
-
-    function __construct($data,$compiler)
-    {
-//        $this->data = preg_replace("/(\r\n|\r|\n)/", "\n", $data);
+
+    /**
+     * Smarty object
+     *
+     * @var Smarty
+     */
+    public $smarty = null;
+
+    /**
+     * compiler object
+     *
+     * @var Smarty_Internal_TemplateCompilerBase
+     */
+    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;
+
+    /**
+     * XML flag true while processing xml
+     *
+     * @var bool
+     */
+    public $is_xml = false;
+
+    /**
+     * state names
+     *
+     * @var array
+     */
+    public $state_name = array(1 => 'TEXT', 2 => 'TAG', 3 => 'TAGBODY', 4 => 'LITERAL', 5 => 'DOUBLEQUOTEDSTRING',);
+
+    /**
+     * 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;
+
+    /**
+     * token names
+     *
+     * @var array
+     */
+    public $smarty_token_names = array(        // Text for parser error messages
+                                               '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
+     *
+     * @param   string                             $data template source
+     * @param Smarty_Internal_TemplateCompilerBase $compiler
+     */
+    function __construct($data, Smarty_Internal_TemplateCompilerBase $compiler)
+    {
         $this->data = $data;
         $this->counter = 0;
+        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;
-        $this->mbstring_overload = ini_get('mbstring.func_overload') & 2;
-     }
+        $this->smarty_token_names[ 'LDEL' ] = $this->smarty->left_delimiter;
+        $this->smarty_token_names[ 'RDEL' ] = $this->smarty->right_delimiter;
+    }
 
+    public function PrintTrace()
+    {
+        $this->yyTraceFILE = fopen('php://output', 'w');
+        $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();
 
-    function yylex()
+    public function yylex()
     {
         return $this->{'yylex' . $this->_yy_state}();
     }
 
-    function yypushstate($state)
+    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);
+        }
         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);
+        }
     }
 
-    function yypopstate()
+    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);
+        }
     }
 
-    function yybegin($state)
+    public function yybegin($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);
+        }
     }
 
-
-
-    function yylex1()
-    {
-        $tokenMap = array (
-              1 => 0,
-              2 => 0,
-              3 => 1,
-              5 => 0,
-              6 => 0,
-              7 => 0,
-              8 => 0,
-              9 => 0,
-              10 => 0,
-              11 => 1,
-              13 => 0,
-              14 => 0,
-              15 => 0,
-              16 => 0,
-              17 => 0,
-              18 => 0,
-              19 => 0,
-              20 => 0,
-              21 => 0,
-              22 => 0,
-              23 => 0,
-              24 => 0,
-            );
-        if ($this->counter >= ($this->mbstring_overload ? mb_strlen($this->data,'latin1'): strlen($this->data))) {
+    public function yylex1()
+    {
+        if (!isset($this->yy_global_pattern1)) {
+            $this->yy_global_pattern1 =
+                "/\G([{][}])|\G(" . $this->ldel . "[*])|\G((" . $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((<[?]((php\\s+|=)|\\s+))|(<[%])|(<[?]xml\\s+)|(<script\\s+language\\s*=\\s*[\"']?\\s*php\\s*[\"']?\\s*>)|([?][>])|([%][>]))|\G([\S\s])/isS";
+        }
+        if ($this->counter >= strlen($this->data)) {
             return false; // end of input
         }
-        $yy_global_pattern = "/\G(".$this->ldel."[$]smarty\\.block\\.child".$this->rdel.")|\G(\\{\\})|\G(".$this->ldel."\\*([\S\s]*?)\\*".$this->rdel.")|\G(".$this->ldel."strip".$this->rdel.")|\G(".$this->ldel."\\s{1,}strip\\s{1,}".$this->rdel.")|\G(".$this->ldel."\/strip".$this->rdel.")|\G(".$this->ldel."\\s{1,}\/strip\\s{1,}".$this->rdel.")|\G(".$this->ldel."\\s*literal\\s*".$this->rdel.")|\G(".$this->ldel."\\s{1,}\/)|\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{1,})|\G(".$this->ldel."\/)|\G(".$this->ldel.")|\G(<\\?(?:php\\w+|=|[a-zA-Z]+)?)|\G(\\?>)|\G(".$this->rdel.")|\G(<%)|\G(%>)|\G([\S\s])/iS";
 
         do {
-            if ($this->mbstring_overload ? preg_match($yy_global_pattern, mb_substr($this->data, $this->counter,2000000000,'latin1'), $yymatches) : 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 = array_filter($yymatches, 'strlen'); // remove empty sub-patterns
-                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 (strlen($yysubmatches[ 0 ]) < 200) {
+                    $yymatches = preg_grep("/(.|\s)+/", $yysubmatches);
+                } else {
+                    $yymatches = array_filter($yymatches, 'strlen');
+                }
+                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 += ($this->mbstring_overload ? mb_strlen($this->value,'latin1'): strlen($this->value));
+                    $this->counter += strlen($this->value);
                     $this->line += substr_count($this->value, "\n");
                     // accept this token
                     return true;
@@ -179,305 +322,134 @@ class Smarty_Internal_Templatelexer
                     // process this token in the new state
                     return $this->yylex();
                 } elseif ($r === false) {
-                    $this->counter += ($this->mbstring_overload ? mb_strlen($this->value,'latin1'): strlen($this->value));
+                    $this->counter += strlen($this->value);
                     $this->line += substr_count($this->value, "\n");
-                    if ($this->counter >= ($this->mbstring_overload ? mb_strlen($this->data,'latin1'): 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 TEXT = 1;
-    function yy_r1_1($yy_subpatterns)
-    {
 
-  $this->token = Smarty_Internal_Templateparser::TP_SMARTYBLOCKCHILD;
-    }
-    function yy_r1_2($yy_subpatterns)
+    function yy_r1_1()
     {
 
-  $this->token = Smarty_Internal_Templateparser::TP_TEXT;
+        $this->token = Smarty_Internal_Templateparser::TP_TEXT;
     }
-    function yy_r1_3($yy_subpatterns)
-    {
 
-  $this->token = Smarty_Internal_Templateparser::TP_COMMENT;
-    }
-    function yy_r1_5($yy_subpatterns)
+    function yy_r1_2()
     {
 
-    $this->token = Smarty_Internal_Templateparser::TP_STRIPON;
+        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->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_6($yy_subpatterns)
-    {
 
-  if ($this->smarty->auto_literal) {
-    $this->token = Smarty_Internal_Templateparser::TP_TEXT;
-  } else {
-    $this->token = Smarty_Internal_Templateparser::TP_STRIPON;
-  }
-    }
-    function yy_r1_7($yy_subpatterns)
+    function yy_r1_3()
     {
 
-    $this->token = Smarty_Internal_Templateparser::TP_STRIPOFF;
+        $obj = new Smarty_Internal_Compile_Private_Php();
+        $obj->parsePhp($this);
     }
-    function yy_r1_8($yy_subpatterns)
-    {
 
-  if ($this->smarty->auto_literal) {
-     $this->token = Smarty_Internal_Templateparser::TP_TEXT;
-  } else {
-    $this->token = Smarty_Internal_Templateparser::TP_STRIPOFF;
-  }
-    }
-    function yy_r1_9($yy_subpatterns)
+    function yy_r1_7()
     {
 
-   $this->token = Smarty_Internal_Templateparser::TP_LITERALSTART;
-   $this->yypushstate(self::LITERAL);
+        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_LITERALSTART;
+            $this->yypushstate(self::LITERAL);
+        }
     }
-    function yy_r1_10($yy_subpatterns)
-    {
 
-  if ($this->smarty->auto_literal) {
-     $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_11($yy_subpatterns)
+    function yy_r1_8()
     {
 
-  if ($this->smarty->auto_literal && trim(substr($this->value,$this->ldel_length,1)) == '') {
-     $this->token = Smarty_Internal_Templateparser::TP_TEXT;
-  } else {
-     $this->token = Smarty_Internal_Templateparser::TP_LDELIF;
-     $this->yypushstate(self::SMARTY);
-     $this->taglineno = $this->line;
-  }
+        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_r1_13($yy_subpatterns)
-    {
 
-  if ($this->smarty->auto_literal && trim(substr($this->value,$this->ldel_length,1)) == '') {
-     $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_14($yy_subpatterns)
+    function yy_r1_9()
     {
 
-  if ($this->smarty->auto_literal && trim(substr($this->value,$this->ldel_length,1)) == '') {
-     $this->token = Smarty_Internal_Templateparser::TP_TEXT;
-  } else {
-     $this->token = Smarty_Internal_Templateparser::TP_LDELFOREACH;
-     $this->yypushstate(self::SMARTY);
-     $this->taglineno = $this->line;
-  }
+        $this->token = Smarty_Internal_Templateparser::TP_TEXT;
     }
-    function yy_r1_15($yy_subpatterns)
-    {
 
-  if ($this->smarty->auto_literal && trim(substr($this->value,$this->ldel_length,1)) == '') {
-     $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_16($yy_subpatterns)
+    function yy_r1_10()
     {
 
-  if ($this->smarty->auto_literal) {
-     $this->token = Smarty_Internal_Templateparser::TP_TEXT;
-  } else {
-     $this->token = Smarty_Internal_Templateparser::TP_LDEL;
-     $this->yypushstate(self::SMARTY);
-     $this->taglineno = $this->line;
-  }
+        $obj = new Smarty_Internal_Compile_Private_Php();
+        $obj->parsePhp($this);
     }
-    function yy_r1_17($yy_subpatterns)
-    {
 
-  $this->token = Smarty_Internal_Templateparser::TP_LDELSLASH;
-     $this->yypushstate(self::SMARTY);
-     $this->taglineno = $this->line;
-    }
-    function yy_r1_18($yy_subpatterns)
+    function yy_r1_19()
     {
 
-  $this->token = Smarty_Internal_Templateparser::TP_LDEL;
-     $this->yypushstate(self::SMARTY);
-     $this->taglineno = $this->line;
+        $to = strlen($this->data);
+        preg_match("~($this->ldel)|(<[?]((php\s+|=)|\s+))|(<[%])|(<[?]xml\s+)|(<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 ];
+        }
+        $this->value = substr($this->data, $this->counter, $to - $this->counter);
+        $this->token = Smarty_Internal_Templateparser::TP_TEXT;
     }
-    function yy_r1_19($yy_subpatterns)
-    {
 
-  if (in_array($this->value, Array('<?', '<?=', '<?php'))) {
-    $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_FAKEPHPSTARTTAG;
-    $this->value = substr($this->value, 0, 2);
-  }
-     }
-    function yy_r1_20($yy_subpatterns)
-    {
-
-  $this->token = Smarty_Internal_Templateparser::TP_PHPENDTAG;
-    }
-    function yy_r1_21($yy_subpatterns)
-    {
-
-  $this->token = Smarty_Internal_Templateparser::TP_TEXT;
-    }
-    function yy_r1_22($yy_subpatterns)
-    {
-
-  $this->token = Smarty_Internal_Templateparser::TP_ASPSTARTTAG;
-    }
-    function yy_r1_23($yy_subpatterns)
-    {
-
-  $this->token = Smarty_Internal_Templateparser::TP_ASPENDTAG;
-    }
-    function yy_r1_24($yy_subpatterns)
-    {
-
-  if ($this->mbstring_overload) {
-    $to = mb_strlen($this->data,'latin1');
-  } else {
-    $to = strlen($this->data);
-  }
-  preg_match("/{$this->ldel}|<\?|\?>|<%|%>/",$this->data,$match,PREG_OFFSET_CAPTURE,$this->counter);
-  if (isset($match[0][1])) {
-    $to = $match[0][1];
-  }
-  if ($this->mbstring_overload) {
-    $this->value = mb_substr($this->data,$this->counter,$to-$this->counter,'latin1');
-  } else {
-    $this->value = substr($this->data,$this->counter,$to-$this->counter);
-  }
-  $this->token = Smarty_Internal_Templateparser::TP_TEXT;
-    }
-
-
-    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 => 0,
-              16 => 0,
-              17 => 0,
-              18 => 0,
-              19 => 0,
-              20 => 1,
-              22 => 1,
-              24 => 1,
-              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 => 0,
-              39 => 0,
-              40 => 0,
-              41 => 0,
-              42 => 0,
-              43 => 3,
-              47 => 0,
-              48 => 0,
-              49 => 0,
-              50 => 0,
-              51 => 0,
-              52 => 0,
-              53 => 0,
-              54 => 0,
-              55 => 1,
-              57 => 1,
-              59 => 0,
-              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 => 0,
-              74 => 0,
-              75 => 0,
-              76 => 0,
-              77 => 0,
-            );
-        if ($this->counter >= ($this->mbstring_overload ? mb_strlen($this->data,'latin1'): strlen($this->data))) {
+    public function yylex2()
+    {
+        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(".$this->ldel."\\s{1,}\/)|\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{1,})|\G(\\s{1,}".$this->rdel.")|\G(".$this->ldel."\/)|\G(".$this->ldel.")|\G(".$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(\\s*;)|\G(::)|\G(\\s*:\\s*)|\G(@)|\G(#)|\G(\")|\G(`)|\G(\\|)|\G(\\.)|\G(\\s*,\\s*)|\G(\\s*&\\s*)|\G(\\s*\\?\\s*)|\G(0[xX][0-9a-fA-F]+)|\G(\\s+[0-9]*[a-zA-Z_][a-zA-Z0-9_\-:]*\\s*=\\s*)|\G([0-9]*[a-zA-Z_]\\w*)|\G(\\d+)|\G(\\s+)|\G([\S\s])/iS";
 
         do {
-            if ($this->mbstring_overload ? preg_match($yy_global_pattern, mb_substr($this->data, $this->counter,2000000000,'latin1'), $yymatches) : 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 = array_filter($yymatches, 'strlen'); // remove empty sub-patterns
-                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 (strlen($yysubmatches[ 0 ]) < 200) {
+                    $yymatches = preg_grep("/(.|\s)+/", $yysubmatches);
+                } else {
+                    $yymatches = array_filter($yymatches, 'strlen');
+                }
+                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 += ($this->mbstring_overload ? mb_strlen($this->value,'latin1'): strlen($this->value));
+                    $this->counter += strlen($this->value);
                     $this->line += substr_count($this->value, "\n");
                     // accept this token
                     return true;
@@ -486,450 +458,468 @@ class Smarty_Internal_Templatelexer
                     // process this token in the new state
                     return $this->yylex();
                 } elseif ($r === false) {
-                    $this->counter += ($this->mbstring_overload ? mb_strlen($this->value,'latin1'): strlen($this->value));
+                    $this->counter += strlen($this->value);
                     $this->line += substr_count($this->value, "\n");
-                    if ($this->counter >= ($this->mbstring_overload ? mb_strlen($this->data,'latin1'): 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 TAG = 2;
 
-    const SMARTY = 2;
-    function yy_r2_1($yy_subpatterns)
+    function yy_r2_1()
     {
 
-  $this->token = Smarty_Internal_Templateparser::TP_SINGLEQUOTESTRING;
+        $this->token = Smarty_Internal_Templateparser::TP_LDELIF;
+        $this->yybegin(self::TAGBODY);
+        $this->taglineno = $this->line;
     }
-    function yy_r2_2($yy_subpatterns)
-    {
 
-  if ($this->smarty->auto_literal) {
-     $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_3($yy_subpatterns)
+    function yy_r2_3()
     {
 
-  if ($this->smarty->auto_literal && trim(substr($this->value,$this->ldel_length,1)) == '') {
-     $this->token = Smarty_Internal_Templateparser::TP_TEXT;
-  } else {
-     $this->token = Smarty_Internal_Templateparser::TP_LDELIF;
-     $this->yypushstate(self::SMARTY);
-     $this->taglineno = $this->line;
-  }
+        $this->token = Smarty_Internal_Templateparser::TP_LDELFOR;
+        $this->yybegin(self::TAGBODY);
+        $this->taglineno = $this->line;
     }
-    function yy_r2_5($yy_subpatterns)
-    {
 
-  if ($this->smarty->auto_literal && trim(substr($this->value,$this->ldel_length,1)) == '') {
-     $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_6($yy_subpatterns)
+    function yy_r2_4()
     {
 
-  if ($this->smarty->auto_literal && trim(substr($this->value,$this->ldel_length,1)) == '') {
-     $this->token = Smarty_Internal_Templateparser::TP_TEXT;
-  } else {
-     $this->token = Smarty_Internal_Templateparser::TP_LDELFOREACH;
-     $this->yypushstate(self::SMARTY);
-     $this->taglineno = $this->line;
-  }
+        $this->token = Smarty_Internal_Templateparser::TP_LDELFOREACH;
+        $this->yybegin(self::TAGBODY);
+        $this->taglineno = $this->line;
     }
-    function yy_r2_7($yy_subpatterns)
-    {
 
-  if ($this->smarty->auto_literal) {
-     $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_8($yy_subpatterns)
+    function yy_r2_5()
     {
 
-  $this->token = Smarty_Internal_Templateparser::TP_RDEL;
-  $this->yypopstate();
+        $this->token = Smarty_Internal_Templateparser::TP_LDELSETFILTER;
+        $this->yybegin(self::TAGBODY);
+        $this->taglineno = $this->line;
     }
-    function yy_r2_9($yy_subpatterns)
-    {
 
-  $this->token = Smarty_Internal_Templateparser::TP_LDELSLASH;
-     $this->yypushstate(self::SMARTY);
-     $this->taglineno = $this->line;
-    }
-    function yy_r2_10($yy_subpatterns)
+    function yy_r2_6()
     {
 
-  $this->token = Smarty_Internal_Templateparser::TP_LDEL;
-     $this->yypushstate(self::SMARTY);
-     $this->taglineno = $this->line;
+        $this->yypopstate();
+        $this->token = Smarty_Internal_Templateparser::TP_SIMPLETAG;
+        $this->taglineno = $this->line;
     }
-    function yy_r2_11($yy_subpatterns)
-    {
 
-  $this->token = Smarty_Internal_Templateparser::TP_RDEL;
-     $this->yypopstate();
-    }
-    function yy_r2_12($yy_subpatterns)
+    function yy_r2_8()
     {
 
-  $this->token = Smarty_Internal_Templateparser::TP_ISIN;
+        $this->yypopstate();
+        $this->token = Smarty_Internal_Templateparser::TP_CLOSETAG;
+        $this->taglineno = $this->line;
     }
-    function yy_r2_13($yy_subpatterns)
-    {
 
-  $this->token = Smarty_Internal_Templateparser::TP_AS;
-    }
-    function yy_r2_14($yy_subpatterns)
+    function yy_r2_9()
     {
 
-  $this->token = Smarty_Internal_Templateparser::TP_TO;
+        if ($this->_yy_stack[ count($this->_yy_stack) - 1 ] == self::TEXT) {
+            $this->yypopstate();
+            $this->token = Smarty_Internal_Templateparser::TP_SIMPELOUTPUT;
+            $this->taglineno = $this->line;
+        } else {
+            $this->value = $this->smarty->left_delimiter;
+            $this->token = Smarty_Internal_Templateparser::TP_LDEL;
+            $this->yybegin(self::TAGBODY);
+            $this->taglineno = $this->line;
+        }
     }
-    function yy_r2_15($yy_subpatterns)
-    {
 
-  $this->token = Smarty_Internal_Templateparser::TP_STEP;
-    }
-    function yy_r2_16($yy_subpatterns)
+    function yy_r2_11()
     {
 
-  $this->token = Smarty_Internal_Templateparser::TP_INSTANCEOF;
+        $this->token = Smarty_Internal_Templateparser::TP_LDELSLASH;
+        $this->yybegin(self::TAGBODY);
+        $this->taglineno = $this->line;
     }
-    function yy_r2_17($yy_subpatterns)
-    {
 
-  $this->token = Smarty_Internal_Templateparser::TP_IDENTITY;
-    }
-    function yy_r2_18($yy_subpatterns)
+    function yy_r2_12()
     {
 
-  $this->token = Smarty_Internal_Templateparser::TP_NONEIDENTITY;
+        $this->token = Smarty_Internal_Templateparser::TP_LDEL;
+        $this->yybegin(self::TAGBODY);
+        $this->taglineno = $this->line;
     }
-    function yy_r2_19($yy_subpatterns)
-    {
 
-  $this->token = Smarty_Internal_Templateparser::TP_EQUALS;
-    }
-    function yy_r2_20($yy_subpatterns)
+    public function yylex3()
     {
+        if (!isset($this->yy_global_pattern3)) {
+            $this->yy_global_pattern3 = "/\G(\\s*" . $this->rdel . ")|\G(" . $this->ldel .
+                "\\s*)|\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|neq|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([\S\s])/isS";
+        }
+        if ($this->counter >= strlen($this->data)) {
+            return false; // end of input
+        }
 
-  $this->token = Smarty_Internal_Templateparser::TP_NOTEQUALS;
-    }
-    function yy_r2_22($yy_subpatterns)
-    {
+        do {
+            if (preg_match($this->yy_global_pattern3, $this->data, $yymatches, null, $this->counter)) {
+                $yysubmatches = $yymatches;
+                if (strlen($yysubmatches[ 0 ]) < 200) {
+                    $yymatches = preg_grep("/(.|\s)+/", $yysubmatches);
+                } else {
+                    $yymatches = array_filter($yymatches, 'strlen');
+                }
+                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
 
-  $this->token = Smarty_Internal_Templateparser::TP_GREATEREQUAL;
-    }
-    function yy_r2_24($yy_subpatterns)
-    {
+    const TAGBODY = 3;
 
-  $this->token = Smarty_Internal_Templateparser::TP_LESSEQUAL;
-    }
-    function yy_r2_26($yy_subpatterns)
+    function yy_r3_1()
     {
 
-  $this->token = Smarty_Internal_Templateparser::TP_GREATERTHAN;
+        $this->token = Smarty_Internal_Templateparser::TP_RDEL;
+        $this->yypopstate();
     }
-    function yy_r2_27($yy_subpatterns)
-    {
 
-  $this->token = Smarty_Internal_Templateparser::TP_LESSTHAN;
-    }
-    function yy_r2_28($yy_subpatterns)
+    function yy_r3_2()
     {
 
-  $this->token = Smarty_Internal_Templateparser::TP_MOD;
+        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_r2_29($yy_subpatterns)
-    {
 
-  $this->token = Smarty_Internal_Templateparser::TP_NOT;
-    }
-    function yy_r2_30($yy_subpatterns)
+    function yy_r3_3()
     {
 
-  $this->token = Smarty_Internal_Templateparser::TP_LAND;
+        $this->token = Smarty_Internal_Templateparser::TP_QUOTE;
+        $this->yypushstate(self::DOUBLEQUOTEDSTRING);
     }
-    function yy_r2_31($yy_subpatterns)
-    {
 
-  $this->token = Smarty_Internal_Templateparser::TP_LOR;
-    }
-    function yy_r2_32($yy_subpatterns)
+    function yy_r3_4()
     {
 
-  $this->token = Smarty_Internal_Templateparser::TP_LXOR;
+        $this->token = Smarty_Internal_Templateparser::TP_SINGLEQUOTESTRING;
     }
-    function yy_r2_33($yy_subpatterns)
-    {
 
-  $this->token = Smarty_Internal_Templateparser::TP_ISODDBY;
-    }
-    function yy_r2_34($yy_subpatterns)
+    function yy_r3_5()
     {
 
-  $this->token = Smarty_Internal_Templateparser::TP_ISNOTODDBY;
+        $this->token = Smarty_Internal_Templateparser::TP_SMARTYBLOCKCHILDPARENT;
+        $this->taglineno = $this->line;
     }
-    function yy_r2_35($yy_subpatterns)
+
+    function yy_r3_7()
     {
 
-  $this->token = Smarty_Internal_Templateparser::TP_ISODD;
+        $this->token = Smarty_Internal_Templateparser::TP_DOLLARID;
     }
-    function yy_r2_36($yy_subpatterns)
+
+    function yy_r3_8()
     {
 
-  $this->token = Smarty_Internal_Templateparser::TP_ISNOTODD;
+        $this->token = Smarty_Internal_Templateparser::TP_DOLLAR;
     }
-    function yy_r2_37($yy_subpatterns)
+
+    function yy_r3_9()
     {
 
-  $this->token = Smarty_Internal_Templateparser::TP_ISEVENBY;
+        $this->token = Smarty_Internal_Templateparser::TP_ISIN;
     }
-    function yy_r2_38($yy_subpatterns)
+
+    function yy_r3_10()
     {
 
-  $this->token = Smarty_Internal_Templateparser::TP_ISNOTEVENBY;
+        $this->token = Smarty_Internal_Templateparser::TP_AS;
     }
-    function yy_r2_39($yy_subpatterns)
+
+    function yy_r3_11()
     {
 
-  $this->token = Smarty_Internal_Templateparser::TP_ISEVEN;
+        $this->token = Smarty_Internal_Templateparser::TP_TO;
     }
-    function yy_r2_40($yy_subpatterns)
+
+    function yy_r3_12()
     {
 
-  $this->token = Smarty_Internal_Templateparser::TP_ISNOTEVEN;
+        $this->token = Smarty_Internal_Templateparser::TP_STEP;
     }
-    function yy_r2_41($yy_subpatterns)
+
+    function yy_r3_13()
     {
 
-  $this->token = Smarty_Internal_Templateparser::TP_ISDIVBY;
+        $this->token = Smarty_Internal_Templateparser::TP_INSTANCEOF;
     }
-    function yy_r2_42($yy_subpatterns)
+
+    function yy_r3_14()
     {
 
-  $this->token = Smarty_Internal_Templateparser::TP_ISNOTDIVBY;
+        $this->token = Smarty_Internal_Templateparser::TP_LOGOP;
     }
-    function yy_r2_43($yy_subpatterns)
+
+    function yy_r3_19()
     {
 
-  $this->token = Smarty_Internal_Templateparser::TP_TYPECAST;
+        $this->token = Smarty_Internal_Templateparser::TP_TLOGOP;
     }
-    function yy_r2_47($yy_subpatterns)
+
+    function yy_r3_24()
     {
 
-  $this->token = Smarty_Internal_Templateparser::TP_OPENP;
+        $this->token = Smarty_Internal_Templateparser::TP_SINGLECOND;
     }
-    function yy_r2_48($yy_subpatterns)
+
+    function yy_r3_27()
     {
 
-  $this->token = Smarty_Internal_Templateparser::TP_CLOSEP;
+        $this->token = Smarty_Internal_Templateparser::TP_NOT;
     }
-    function yy_r2_49($yy_subpatterns)
+
+    function yy_r3_30()
     {
 
-  $this->token = Smarty_Internal_Templateparser::TP_OPENB;
+        $this->token = Smarty_Internal_Templateparser::TP_TYPECAST;
     }
-    function yy_r2_50($yy_subpatterns)
+
+    function yy_r3_34()
     {
 
-  $this->token = Smarty_Internal_Templateparser::TP_CLOSEB;
+        $this->token = Smarty_Internal_Templateparser::TP_OPENP;
     }
-    function yy_r2_51($yy_subpatterns)
+
+    function yy_r3_35()
     {
 
-  $this->token = Smarty_Internal_Templateparser::TP_PTR;
+        $this->token = Smarty_Internal_Templateparser::TP_CLOSEP;
     }
-    function yy_r2_52($yy_subpatterns)
+
+    function yy_r3_36()
     {
 
-  $this->token = Smarty_Internal_Templateparser::TP_APTR;
+        $this->token = Smarty_Internal_Templateparser::TP_OPENB;
     }
-    function yy_r2_53($yy_subpatterns)
+
+    function yy_r3_37()
     {
 
-  $this->token = Smarty_Internal_Templateparser::TP_EQUAL;
+        $this->token = Smarty_Internal_Templateparser::TP_CLOSEB;
     }
-    function yy_r2_54($yy_subpatterns)
+
+    function yy_r3_38()
     {
 
-  $this->token = Smarty_Internal_Templateparser::TP_INCDEC;
+        $this->token = Smarty_Internal_Templateparser::TP_PTR;
     }
-    function yy_r2_55($yy_subpatterns)
+
+    function yy_r3_39()
     {
 
-  $this->token = Smarty_Internal_Templateparser::TP_UNIMATH;
+        $this->token = Smarty_Internal_Templateparser::TP_APTR;
     }
-    function yy_r2_57($yy_subpatterns)
+
+    function yy_r3_40()
     {
 
-  $this->token = Smarty_Internal_Templateparser::TP_MATH;
+        $this->token = Smarty_Internal_Templateparser::TP_EQUAL;
     }
-    function yy_r2_59($yy_subpatterns)
+
+    function yy_r3_41()
     {
 
-  $this->token = Smarty_Internal_Templateparser::TP_DOLLAR;
+        $this->token = Smarty_Internal_Templateparser::TP_INCDEC;
     }
-    function yy_r2_60($yy_subpatterns)
+
+    function yy_r3_43()
     {
 
-  $this->token = Smarty_Internal_Templateparser::TP_SEMICOLON;
+        $this->token = Smarty_Internal_Templateparser::TP_UNIMATH;
     }
-    function yy_r2_61($yy_subpatterns)
+
+    function yy_r3_45()
     {
 
-  $this->token = Smarty_Internal_Templateparser::TP_DOUBLECOLON;
+        $this->token = Smarty_Internal_Templateparser::TP_MATH;
     }
-    function yy_r2_62($yy_subpatterns)
+
+    function yy_r3_47()
     {
 
-  $this->token = Smarty_Internal_Templateparser::TP_COLON;
+        $this->token = Smarty_Internal_Templateparser::TP_AT;
     }
-    function yy_r2_63($yy_subpatterns)
+
+    function yy_r3_48()
     {
 
-  $this->token = Smarty_Internal_Templateparser::TP_AT;
+        $this->token = Smarty_Internal_Templateparser::TP_HATCH;
     }
-    function yy_r2_64($yy_subpatterns)
+
+    function yy_r3_49()
     {
 
-  $this->token = Smarty_Internal_Templateparser::TP_HATCH;
+        // 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);
+            $this->value = $match[ 0 ];
+            $this->token = Smarty_Internal_Templateparser::TP_SPACE;
+        } else {
+            $this->token = Smarty_Internal_Templateparser::TP_ATTR;
+        }
     }
-    function yy_r2_65($yy_subpatterns)
+
+    function yy_r3_50()
     {
 
-  $this->token = Smarty_Internal_Templateparser::TP_QUOTE;
-  $this->yypushstate(self::DOUBLEQUOTEDSTRING);
+        $this->token = Smarty_Internal_Templateparser::TP_NAMESPACE;
     }
-    function yy_r2_66($yy_subpatterns)
+
+    function yy_r3_53()
     {
 
-  $this->token = Smarty_Internal_Templateparser::TP_BACKTICK;
-  $this->yypopstate();
+        $this->token = Smarty_Internal_Templateparser::TP_ID;
     }
-    function yy_r2_67($yy_subpatterns)
+
+    function yy_r3_54()
     {
 
-  $this->token = Smarty_Internal_Templateparser::TP_VERT;
+        $this->token = Smarty_Internal_Templateparser::TP_INTEGER;
     }
-    function yy_r2_68($yy_subpatterns)
+
+    function yy_r3_55()
     {
 
-  $this->token = Smarty_Internal_Templateparser::TP_DOT;
+        $this->token = Smarty_Internal_Templateparser::TP_BACKTICK;
+        $this->yypopstate();
     }
-    function yy_r2_69($yy_subpatterns)
+
+    function yy_r3_56()
     {
 
-  $this->token = Smarty_Internal_Templateparser::TP_COMMA;
+        $this->token = Smarty_Internal_Templateparser::TP_VERT;
     }
-    function yy_r2_70($yy_subpatterns)
+
+    function yy_r3_57()
     {
 
-  $this->token = Smarty_Internal_Templateparser::TP_ANDSYM;
+        $this->token = Smarty_Internal_Templateparser::TP_DOT;
     }
-    function yy_r2_71($yy_subpatterns)
+
+    function yy_r3_58()
     {
 
-  $this->token = Smarty_Internal_Templateparser::TP_QMARK;
+        $this->token = Smarty_Internal_Templateparser::TP_COMMA;
     }
-    function yy_r2_72($yy_subpatterns)
+
+    function yy_r3_59()
     {
 
-  $this->token = Smarty_Internal_Templateparser::TP_HEX;
+        $this->token = Smarty_Internal_Templateparser::TP_SEMICOLON;
     }
-    function yy_r2_73($yy_subpatterns)
+
+    function yy_r3_60()
     {
 
-  // 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);
-     $this->value = $match[0];
-     $this->token = Smarty_Internal_Templateparser::TP_SPACE;
-  } else {
-     $this->token = Smarty_Internal_Templateparser::TP_ATTR;
-  }
+        $this->token = Smarty_Internal_Templateparser::TP_DOUBLECOLON;
     }
-    function yy_r2_74($yy_subpatterns)
+
+    function yy_r3_61()
     {
 
-  $this->token = Smarty_Internal_Templateparser::TP_ID;
+        $this->token = Smarty_Internal_Templateparser::TP_COLON;
     }
-    function yy_r2_75($yy_subpatterns)
+
+    function yy_r3_62()
     {
 
-  $this->token = Smarty_Internal_Templateparser::TP_INTEGER;
+        $this->token = Smarty_Internal_Templateparser::TP_QMARK;
     }
-    function yy_r2_76($yy_subpatterns)
+
+    function yy_r3_63()
     {
 
-  $this->token = Smarty_Internal_Templateparser::TP_SPACE;
+        $this->token = Smarty_Internal_Templateparser::TP_HEX;
     }
-    function yy_r2_77($yy_subpatterns)
+
+    function yy_r3_64()
     {
 
-  $this->token = Smarty_Internal_Templateparser::TP_TEXT;
+        $this->token = Smarty_Internal_Templateparser::TP_SPACE;
     }
 
+    function yy_r3_65()
+    {
 
+        $this->token = Smarty_Internal_Templateparser::TP_TEXT;
+    }
 
-    function yylex3()
+    public function yylex4()
     {
-        $tokenMap = array (
-              1 => 0,
-              2 => 0,
-              3 => 0,
-              4 => 0,
-              5 => 0,
-              6 => 0,
-              7 => 0,
-            );
-        if ($this->counter >= ($this->mbstring_overload ? mb_strlen($this->data,'latin1'): strlen($this->data))) {
+        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(<\\?(?:php\\w+|=|[a-zA-Z]+)?)|\G(\\?>)|\G(<%)|\G(%>)|\G([\S\s])/iS";
 
         do {
-            if ($this->mbstring_overload ? preg_match($yy_global_pattern, mb_substr($this->data, $this->counter,2000000000,'latin1'), $yymatches) : 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 = array_filter($yymatches, 'strlen'); // remove empty sub-patterns
-                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 (strlen($yysubmatches[ 0 ]) < 200) {
+                    $yymatches = preg_grep("/(.|\s)+/", $yysubmatches);
+                } else {
+                    $yymatches = array_filter($yymatches, 'strlen');
+                }
+                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 += ($this->mbstring_overload ? mb_strlen($this->value,'latin1'): strlen($this->value));
+                    $this->counter += strlen($this->value);
                     $this->line += substr_count($this->value, "\n");
                     // accept this token
                     return true;
@@ -938,128 +928,89 @@ class Smarty_Internal_Templatelexer
                     // process this token in the new state
                     return $this->yylex();
                 } elseif ($r === false) {
-                    $this->counter += ($this->mbstring_overload ? mb_strlen($this->value,'latin1'): strlen($this->value));
+                    $this->counter += strlen($this->value);
                     $this->line += substr_count($this->value, "\n");
-                    if ($this->counter >= ($this->mbstring_overload ? mb_strlen($this->data,'latin1'): 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 LITERAL = 4;
 
-    const LITERAL = 3;
-    function yy_r3_1($yy_subpatterns)
+    function yy_r4_1()
     {
 
-  $this->token = Smarty_Internal_Templateparser::TP_LITERALSTART;
-  $this->yypushstate(self::LITERAL);
+        $this->literal_cnt ++;
+        $this->token = Smarty_Internal_Templateparser::TP_LITERAL;
     }
-    function yy_r3_2($yy_subpatterns)
-    {
 
-  $this->token = Smarty_Internal_Templateparser::TP_LITERALEND;
-  $this->yypopstate();
-    }
-    function yy_r3_3($yy_subpatterns)
+    function yy_r4_2()
     {
 
-  if (in_array($this->value, Array('<?', '<?=', '<?php'))) {
-    $this->token = Smarty_Internal_Templateparser::TP_PHPSTARTTAG;
-   } else {
-    $this->token = Smarty_Internal_Templateparser::TP_FAKEPHPSTARTTAG;
-    $this->value = substr($this->value, 0, 2);
-   }
-    }
-    function yy_r3_4($yy_subpatterns)
-    {
-
-  $this->token = Smarty_Internal_Templateparser::TP_PHPENDTAG;
-    }
-    function yy_r3_5($yy_subpatterns)
-    {
-
-  $this->token = Smarty_Internal_Templateparser::TP_ASPSTARTTAG;
+        if ($this->literal_cnt) {
+            $this->literal_cnt --;
+            $this->token = Smarty_Internal_Templateparser::TP_LITERAL;
+        } else {
+            $this->token = Smarty_Internal_Templateparser::TP_LITERALEND;
+            $this->yypopstate();
+        }
     }
-    function yy_r3_6($yy_subpatterns)
-    {
 
-  $this->token = Smarty_Internal_Templateparser::TP_ASPENDTAG;
-    }
-    function yy_r3_7($yy_subpatterns)
+    function yy_r4_3()
     {
 
-  if ($this->mbstring_overload) {
-    $to = mb_strlen($this->data,'latin1');
-  } else {
-    $to = strlen($this->data);
-  }
-  preg_match("/{$this->ldel}\/?literal{$this->rdel}|<\?|<%|\?>|%>/",$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");
-  }
-  if ($this->mbstring_overload) {
-    $this->value = mb_substr($this->data,$this->counter,$to-$this->counter,'latin1');
-  } else {
-    $this->value = substr($this->data,$this->counter,$to-$this->counter);
-  }
-  $this->token = Smarty_Internal_Templateparser::TP_LITERAL;
+        $to = strlen($this->data);
+        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 {
+            $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_Templateparser::TP_LITERAL;
     }
 
-
-    function yylex4()
+    public function yylex5()
     {
-        $tokenMap = array (
-              1 => 0,
-              2 => 1,
-              4 => 0,
-              5 => 0,
-              6 => 0,
-              7 => 0,
-              8 => 0,
-              9 => 0,
-              10 => 0,
-              11 => 0,
-              12 => 0,
-              13 => 3,
-              17 => 0,
-            );
-        if ($this->counter >= ($this->mbstring_overload ? mb_strlen($this->data,'latin1'): strlen($this->data))) {
+        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{1,}\/)|\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{1,})|\G(".$this->ldel."\/)|\G(".$this->ldel.")|\G(\")|\G(`\\$)|\G(\\$[0-9]*[a-zA-Z_]\\w*)|\G(\\$)|\G(([^\"\\\\]*?)((?:\\\\.[^\"\\\\]*?)*?)(?=(".$this->ldel."|\\$|`\\$|\")))|\G([\S\s])/iS";
 
         do {
-            if ($this->mbstring_overload ? preg_match($yy_global_pattern, mb_substr($this->data, $this->counter,2000000000,'latin1'), $yymatches) : 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 = array_filter($yymatches, 'strlen'); // remove empty sub-patterns
-                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 (strlen($yysubmatches[ 0 ]) < 200) {
+                    $yymatches = preg_grep("/(.|\s)+/", $yysubmatches);
+                } else {
+                    $yymatches = array_filter($yymatches, 'strlen');
+                }
+                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 += ($this->mbstring_overload ? mb_strlen($this->value,'latin1'): strlen($this->value));
+                    $this->counter += strlen($this->value);
                     $this->line += substr_count($this->value, "\n");
                     // accept this token
                     return true;
@@ -1068,136 +1019,117 @@ class Smarty_Internal_Templatelexer
                     // process this token in the new state
                     return $this->yylex();
                 } elseif ($r === false) {
-                    $this->counter += ($this->mbstring_overload ? mb_strlen($this->value,'latin1'): strlen($this->value));
+                    $this->counter += strlen($this->value);
                     $this->line += substr_count($this->value, "\n");
-                    if ($this->counter >= ($this->mbstring_overload ? mb_strlen($this->data,'latin1'): 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 DOUBLEQUOTEDSTRING = 5;
 
-    const DOUBLEQUOTEDSTRING = 4;
-    function yy_r4_1($yy_subpatterns)
+    function yy_r5_1()
     {
 
-  if ($this->smarty->auto_literal) {
-     $this->token = Smarty_Internal_Templateparser::TP_TEXT;
-  } else {
-     $this->token = Smarty_Internal_Templateparser::TP_LDELSLASH;
-     $this->yypushstate(self::SMARTY);
-     $this->taglineno = $this->line;
-  }
+        $this->token = Smarty_Internal_Templateparser::TP_TEXT;
     }
-    function yy_r4_2($yy_subpatterns)
-    {
 
-  if ($this->smarty->auto_literal && trim(substr($this->value,$this->ldel_length,1)) == '') {
-     $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_4($yy_subpatterns)
+    function yy_r5_2()
     {
 
-  if ($this->smarty->auto_literal && trim(substr($this->value,$this->ldel_length,1)) == '') {
-     $this->token = Smarty_Internal_Templateparser::TP_TEXT;
-  } else {
-     $this->token = Smarty_Internal_Templateparser::TP_LDELFOR;
-     $this->yypushstate(self::SMARTY);
-     $this->taglineno = $this->line;
-  }
+        $this->token = Smarty_Internal_Templateparser::TP_TEXT;
     }
-    function yy_r4_5($yy_subpatterns)
-    {
 
-  if ($this->smarty->auto_literal && trim(substr($this->value,$this->ldel_length,1)) == '') {
-     $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_6($yy_subpatterns)
+    function yy_r5_3()
     {
 
-  if ($this->smarty->auto_literal) {
-     $this->token = Smarty_Internal_Templateparser::TP_TEXT;
-  } else {
-     $this->token = Smarty_Internal_Templateparser::TP_LDEL;
-     $this->yypushstate(self::SMARTY);
-     $this->taglineno = $this->line;
-  }
+        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_r4_7($yy_subpatterns)
+
+    function yy_r5_4()
     {
 
-  $this->token = Smarty_Internal_Templateparser::TP_LDELSLASH;
-     $this->yypushstate(self::SMARTY);
-     $this->taglineno = $this->line;
+        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_r4_8($yy_subpatterns)
+
+    function yy_r5_5()
     {
 
-  $this->token = Smarty_Internal_Templateparser::TP_LDEL;
-     $this->yypushstate(self::SMARTY);
-     $this->taglineno = $this->line;
+        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->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();
+        $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->taglineno = $this->line;
+        $this->token = Smarty_Internal_Templateparser::TP_BACKTICK;
+        $this->value = substr($this->value, 0, - 1);
+        $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;
+        $this->token = Smarty_Internal_Templateparser::TP_DOLLARID;
     }
-    function yy_r4_12($yy_subpatterns)
+
+    function yy_r5_9()
     {
 
-  $this->token = Smarty_Internal_Templateparser::TP_TEXT;
+        $this->token = Smarty_Internal_Templateparser::TP_TEXT;
     }
-    function yy_r4_13($yy_subpatterns)
+
+    function yy_r5_10()
     {
 
-  $this->token = Smarty_Internal_Templateparser::TP_TEXT;
+        $this->token = Smarty_Internal_Templateparser::TP_TEXT;
     }
-    function yy_r4_17($yy_subpatterns)
+
+    function yy_r5_14()
     {
 
-  if ($this->mbstring_overload) {
-    $to = mb_strlen($this->data,'latin1');
-  } else {
-    $to = strlen($this->data);
-  }
-  if ($this->mbstring_overload) {
-    $this->value = mb_substr($this->data,$this->counter,$to-$this->counter,'latin1');
-  } else {
-    $this->value = substr($this->data,$this->counter,$to-$this->counter);
-  }
-  $this->token = Smarty_Internal_Templateparser::TP_TEXT;
+        $to = strlen($this->data);
+        $this->value = substr($this->data, $this->counter, $to - $this->counter);
+        $this->token = Smarty_Internal_Templateparser::TP_TEXT;
     }
 
 }
+
+     
\ No newline at end of file
diff --git a/include/smarty/libs/sysplugins/smarty_internal_templateparser.php b/include/smarty/libs/sysplugins/smarty_internal_templateparser.php
index b0393c694..57dbf61a3 100644
--- a/include/smarty/libs/sysplugins/smarty_internal_templateparser.php
+++ b/include/smarty/libs/sysplugins/smarty_internal_templateparser.php
@@ -1,20 +1,12 @@
 <?php
-/**
-* Smarty Internal Plugin Templateparser
-*
-* This is the template parser.
-* It is generated from the internal.templateparser.y file
-* @package Smarty
-* @subpackage Compiler
-* @author Uwe Tews
-*/
 
 class TP_yyToken implements ArrayAccess
 {
     public $string = '';
+
     public $metadata = array();
 
-    function __construct($s, $m = array())
+    public function __construct($s, $m = array())
     {
         if ($s instanceof TP_yyToken) {
             $this->string = $s->string;
@@ -29,28 +21,28 @@ class TP_yyToken implements ArrayAccess
         }
     }
 
-    function __toString()
+    public function __toString()
     {
-        return $this->_string;
+        return $this->string;
     }
 
-    function offsetExists($offset)
+    public function offsetExists($offset)
     {
         return isset($this->metadata[$offset]);
     }
 
-    function offsetGet($offset)
+    public function offsetGet($offset)
     {
         return $this->metadata[$offset];
     }
 
-    function offsetSet($offset, $value)
+    public function offsetSet($offset, $value)
     {
         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;
             }
             $offset = count($this->metadata);
@@ -67,7 +59,7 @@ class TP_yyToken implements ArrayAccess
         }
     }
 
-    function offsetUnset($offset)
+    public function offsetUnset($offset)
     {
         unset($this->metadata[$offset]);
     }
@@ -80,1395 +72,963 @@ class TP_yyStackEntry
                      ** number for the token at this stack level */
     public $minor; /* The user-supplied minor token value.  This
                      ** is the value of the token  */
-};
+}
+
+;
 
+#line 11 "../smarty/lexer/smarty_internal_templateparser.y"
 
-#line 12 "smarty_internal_templateparser.y"
-class Smarty_Internal_Templateparser#line 79 "smarty_internal_templateparser.php"
+/**
+ * Smarty Template Parser Class
+ *
+ * This is the template parser.
+ * It is generated from the smarty_internal_templateparser.y file
+ *
+ * @author Uwe Tews <uwe.tews@googlemail.com>
+ */
+class Smarty_Internal_Templateparser
 {
-#line 14 "smarty_internal_templateparser.y"
+    #line 23 "../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";
-    // states whether the parse was successful or not
+
+    /**
+     * result status
+     *
+     * @var bool
+     */
     public $successful = true;
+
+    /**
+     * return value
+     *
+     * @var mixed
+     */
     public $retvalue = 0;
-    private $lex;
+
+    /**
+     * 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
+     */
+    public $lex;
+
+    /**
+     * internal error flag
+     *
+     * @var bool
+     */
     private $internalError = false;
-    private $strip = false;
 
-    function __construct($lex, $compiler) {
+    /**
+     * {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;
+
+    /**
+     * security object
+     *
+     * @var Smarty_Security
+     */
+    public $security = null;
+
+    /**
+     * template prefix array
+     *
+     * @var \Smarty_Internal_ParseTree[]
+     */
+    public $template_prefix = array();
+
+    /**
+     * security object
+     *
+     * @var \Smarty_Internal_ParseTree[]
+     */
+    public $template_postfix = array();
+
+    /**
+     * constructor
+     *
+     * @param Smarty_Internal_Templatelexer        $lex
+     * @param Smarty_Internal_TemplateCompilerBase $compiler
+     */
+    function __construct(Smarty_Internal_Templatelexer $lex, Smarty_Internal_TemplateCompilerBase $compiler)
+    {
         $this->lex = $lex;
         $this->compiler = $compiler;
-        $this->smarty = $this->compiler->smarty;
         $this->template = $this->compiler->template;
-        $this->compiler->has_variable_string = false;
-        $this->compiler->prefix_code = array();
-        $this->prefix_number = 0;
-        $this->block_nesting_level = 0;
-        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->is_xml = false;
-        $this->asp_tags = (ini_get('asp_tags') != '0');
-        $this->current_buffer = $this->root_buffer = new _smarty_template_buffer($this);
+        $this->smarty = $this->template->smarty;
+        $this->security = isset($this->smarty->security_policy) ? $this->smarty->security_policy : false;
+        $this->current_buffer = $this->root_buffer = new Smarty_Internal_ParseTree_Template();
     }
 
-    public static function escape_start_tag($tag_text) {
-        $tag = preg_replace('/\A<\?(.*)\z/', '<<?php ?>?\1', $tag_text, -1 , $count); //Escape tag
-        return $tag;
+    /**
+     * insert PHP code in current buffer
+     *
+     * @param string $code
+     */
+    public function insertPhpCode($code)
+    {
+        $this->current_buffer->append_subtree($this, new Smarty_Internal_ParseTree_Tag($this, $code));
     }
 
-    public static function escape_end_tag($tag_text) {
-        return '?<?php ?>>';
+    /**
+     *  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 .= $preCode;
+        }
+        $this->compiler->prefix_code = array();
+        $tmp .= $code;
+        return new Smarty_Internal_ParseTree_Tag($this, $this->compiler->processNocacheCode($tmp, true));
     }
 
-    public function compileVariable($variable) {
-        if (strpos($variable,'(') == 0) {
-            // not a variable variable
-            $var = trim($variable,'\'');
-            $this->compiler->tag_nocache=$this->compiler->tag_nocache|$this->template->getVariable($var, null, true, false)->nocache;
-            $this->template->properties['variables'][$var] = $this->compiler->tag_nocache|$this->compiler->nocache;
-        }
-//       return '(isset($_smarty_tpl->tpl_vars['. $variable .'])?$_smarty_tpl->tpl_vars['. $variable .']->value:$_smarty_tpl->getVariable('. $variable .')->value)';
-        return '$_smarty_tpl->tpl_vars['. $variable .']->value';
-    }
-#line 132 "smarty_internal_templateparser.php"
-
-    const TP_VERT                           =  1;
-    const TP_COLON                          =  2;
-    const TP_COMMENT                        =  3;
-    const TP_PHPSTARTTAG                    =  4;
-    const TP_PHPENDTAG                      =  5;
-    const TP_ASPSTARTTAG                    =  6;
-    const TP_ASPENDTAG                      =  7;
-    const TP_FAKEPHPSTARTTAG                =  8;
-    const TP_XMLTAG                         =  9;
-    const TP_TEXT                           = 10;
-    const TP_STRIPON                        = 11;
-    const TP_STRIPOFF                       = 12;
-    const TP_LITERALSTART                   = 13;
-    const TP_LITERALEND                     = 14;
-    const TP_LITERAL                        = 15;
-    const TP_LDEL                           = 16;
-    const TP_RDEL                           = 17;
-    const TP_DOLLAR                         = 18;
-    const TP_ID                             = 19;
-    const TP_EQUAL                          = 20;
-    const TP_PTR                            = 21;
-    const TP_LDELIF                         = 22;
-    const TP_LDELFOR                        = 23;
-    const TP_SEMICOLON                      = 24;
-    const TP_INCDEC                         = 25;
-    const TP_TO                             = 26;
-    const TP_STEP                           = 27;
-    const TP_LDELFOREACH                    = 28;
-    const TP_SPACE                          = 29;
-    const TP_AS                             = 30;
-    const TP_APTR                           = 31;
-    const TP_LDELSETFILTER                  = 32;
-    const TP_SMARTYBLOCKCHILD               = 33;
-    const TP_LDELSLASH                      = 34;
-    const TP_ATTR                           = 35;
-    const TP_INTEGER                        = 36;
-    const TP_COMMA                          = 37;
-    const TP_OPENP                          = 38;
-    const TP_CLOSEP                         = 39;
-    const TP_MATH                           = 40;
-    const TP_UNIMATH                        = 41;
-    const TP_ANDSYM                         = 42;
-    const TP_ISIN                           = 43;
-    const TP_ISDIVBY                        = 44;
-    const TP_ISNOTDIVBY                     = 45;
-    const TP_ISEVEN                         = 46;
-    const TP_ISNOTEVEN                      = 47;
-    const TP_ISEVENBY                       = 48;
-    const TP_ISNOTEVENBY                    = 49;
-    const TP_ISODD                          = 50;
-    const TP_ISNOTODD                       = 51;
-    const TP_ISODDBY                        = 52;
-    const TP_ISNOTODDBY                     = 53;
-    const TP_INSTANCEOF                     = 54;
-    const TP_QMARK                          = 55;
-    const TP_NOT                            = 56;
-    const TP_TYPECAST                       = 57;
-    const TP_HEX                            = 58;
-    const TP_DOT                            = 59;
-    const TP_SINGLEQUOTESTRING              = 60;
-    const TP_DOUBLECOLON                    = 61;
-    const TP_AT                             = 62;
-    const TP_HATCH                          = 63;
-    const TP_OPENB                          = 64;
-    const TP_CLOSEB                         = 65;
-    const TP_EQUALS                         = 66;
-    const TP_NOTEQUALS                      = 67;
-    const TP_GREATERTHAN                    = 68;
-    const TP_LESSTHAN                       = 69;
-    const TP_GREATEREQUAL                   = 70;
-    const TP_LESSEQUAL                      = 71;
-    const TP_IDENTITY                       = 72;
-    const TP_NONEIDENTITY                   = 73;
-    const TP_MOD                            = 74;
-    const TP_LAND                           = 75;
-    const TP_LOR                            = 76;
-    const TP_LXOR                           = 77;
-    const TP_QUOTE                          = 78;
-    const TP_BACKTICK                       = 79;
-    const TP_DOLLARID                       = 80;
-    const YY_NO_ACTION = 597;
-    const YY_ACCEPT_ACTION = 596;
-    const YY_ERROR_ACTION = 595;
-
-    const YY_SZ_ACTTAB = 2383;
-static public $yy_action = array(
- /*     0 */   225,  275,  263,  276,  259,  257,  260,  390,  356,  359,
- /*    10 */   353,  193,   18,  127,   42,  317,  381,  351,  196,  350,
- /*    20 */     6,  108,   24,   98,  128,  190,  134,  318,   41,   41,
- /*    30 */   249,  329,  231,   18,   43,   43,  317,   26,  298,   50,
- /*    40 */    47,   48,   44,   10,   13,  305,  306,   12,   11,  340,
- /*    50 */   341,   40,   20,  387,  308,  307,  309,  374,  254,  248,
- /*    60 */   252,  217,  193,  385,  291,  375,  376,  377,  373,  372,
- /*    70 */   368,  367,  369,  370,  371,  378,  379,  225,  312,  255,
- /*    80 */   225,  225,  118,    2,  207,   76,  135,  596,   95,  281,
- /*    90 */   271,  264,    2,  366,  315,  386,  461,  383,  232,  294,
- /*   100 */   303,  388,  313,  389,  227,   41,  144,  225,  461,  245,
- /*   110 */   282,   43,  218,  358,  461,  144,   50,   47,   48,   44,
- /*   120 */    10,   13,  305,  306,   12,   11,  340,  341,   40,   20,
- /*   130 */   105,  177,  522,   46,   46,   41,   19,  522,  143,  297,
- /*   140 */   325,   43,  375,  376,  377,  373,  372,  368,  367,  369,
- /*   150 */   370,  371,  378,  379,  225,  312,  293,  206,  225,  141,
- /*   160 */   124,  225,   54,  119,  123,  225,  459,   38,  173,  246,
- /*   170 */   319,  315,  386,  347,  455,  232,  294,  303,  459,  313,
- /*   180 */   139,  321,   41,   31,  459,   41,   41,    2,   43,  188,
- /*   190 */     2,   43,   43,   50,   47,   48,   44,   10,   13,  305,
- /*   200 */   306,   12,   11,  340,  341,   40,   20,  225,  136,  301,
- /*   210 */   144,  194,  350,  144,   46,  202,  206,  328,  198,  375,
- /*   220 */   376,  377,  373,  372,  368,  367,  369,  370,  371,  378,
- /*   230 */   379,   21,    9,   28,  185,   41,  318,  225,  265,  271,
- /*   240 */   264,   43,  206,   27,  173,  206,   50,   47,   48,   44,
- /*   250 */    10,   13,  305,  306,   12,   11,  340,  341,   40,   20,
- /*   260 */   225,  178,   18,  212,  330,  317,   17,   32,    8,   14,
- /*   270 */   325,  267,  375,  376,  377,  373,  372,  368,  367,  369,
- /*   280 */   370,  371,  378,  379,  136,  363,  363,  207,   41,    4,
- /*   290 */    46,    5,  131,  233,   43,   25,  186,  289,  318,   50,
- /*   300 */    47,   48,   44,   10,   13,  305,  306,   12,   11,  340,
- /*   310 */   341,   40,   20,  225,  100,  161,   18,  355,  361,  317,
- /*   320 */    26,  109,  360,  346,  325,  375,  376,  377,  373,  372,
- /*   330 */   368,  367,  369,  370,  371,  378,  379,  106,  201,  172,
- /*   340 */    25,  206,  288,   25,   18,  261,  181,  317,  325,   45,
- /*   350 */   339,  129,   50,   47,   48,   44,   10,   13,  305,  306,
- /*   360 */    12,   11,  340,  341,   40,   20,  225,  104,  162,   18,
- /*   370 */    16,  205,  317,  206,  248,  238,   43,  325,  375,  376,
- /*   380 */   377,  373,  372,  368,  367,  369,  370,  371,  378,  379,
- /*   390 */   255,  354,  243,  229,  206,  342,   18,  239,  242,  241,
- /*   400 */   248,  266,  300,  330,  240,   50,   47,   48,   44,   10,
- /*   410 */    13,  305,  306,   12,   11,  340,  341,   40,   20,  225,
- /*   420 */   165,  176,  184,   18,   18,   18,  253,  215,  251,  325,
- /*   430 */   325,  375,  376,  377,  373,  372,  368,  367,  369,  370,
- /*   440 */   371,  378,  379,  304,  268,  159,  207,  207,  247,  206,
- /*   450 */   148,   41,  195,  350,  325,   27,   33,   43,   50,   47,
- /*   460 */    48,   44,   10,   13,  305,  306,   12,   11,  340,  341,
- /*   470 */    40,   20,  163,  225,  328,  199,  133,   29,  187,   23,
- /*   480 */   250,  325,  101,  225,  375,  376,  377,  373,  372,  368,
- /*   490 */   367,  369,  370,  371,  378,  379,  225,  298,  207,  334,
- /*   500 */   225,   45,  312,  103,  299,  192,  154,  364,   18,  302,
- /*   510 */   135,  317,  285,   35,  173,  203,  320,    3,  236,    6,
- /*   520 */   108,   41,  232,  294,  303,  134,  313,   43,  130,  249,
- /*   530 */   329,  231,  250,  225,  280,   50,   47,   48,   44,   10,
- /*   540 */    13,  305,  306,   12,   11,  340,  341,   40,   20,  336,
- /*   550 */    36,  166,  212,  230,  332,  228,  338,    8,  132,  330,
- /*   560 */   325,  375,  376,  377,  373,  372,  368,  367,  369,  370,
- /*   570 */   371,  378,  379,  225,  312,  345,   37,  362,  141,  312,
- /*   580 */    94,   77,  135,  156,  236,  182,  173,  135,  122,  204,
- /*   590 */   315,  386,  365,  225,  232,  294,  303,  137,  313,  232,
- /*   600 */   294,  303,  125,  313,   41,  222,  333,  180,  277,  337,
- /*   610 */    43,  225,   50,   47,   48,   44,   10,   13,  305,  306,
- /*   620 */    12,   11,  340,  341,   40,   20,  136,  335,  316,    5,
- /*   630 */    22,  197,  269,   34,  173,  148,  126,  116,  375,  376,
- /*   640 */   377,  373,  372,  368,  367,  369,  370,  371,  378,  379,
- /*   650 */   225,  312,  298,  225,  292,  141,  312,  258,   77,  135,
- /*   660 */   153,  183,  318,  301,  135,  175,  284,  315,  386,  461,
- /*   670 */   117,  232,  294,  303,  325,  313,  232,  294,  303,  382,
- /*   680 */   313,  461,  220,  110,  329,  298,  318,  461,  329,   50,
- /*   690 */    47,   48,   44,   10,   13,  305,  306,   12,   11,  340,
- /*   700 */   341,   40,   20,  225,   30,  191,   46,  189,  314,  107,
- /*   710 */   329,  329,  146,   97,  102,  375,  376,  377,  373,  372,
- /*   720 */   368,  367,  369,  370,  371,  378,  379,  298,  298,  298,
- /*   730 */   329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
- /*   740 */   329,  329,   50,   47,   48,   44,   10,   13,  305,  306,
- /*   750 */    12,   11,  340,  341,   40,   20,  225,  329,  329,  329,
- /*   760 */   329,  329,  329,  329,  329,  114,  160,  115,  375,  376,
- /*   770 */   377,  373,  372,  368,  367,  369,  370,  371,  378,  379,
- /*   780 */   298,  298,  298,  329,  329,  329,  329,  329,  329,  329,
- /*   790 */   329,  329,  329,  329,  283,   50,   47,   48,   44,   10,
- /*   800 */    13,  305,  306,   12,   11,  340,  341,   40,   20,  329,
- /*   810 */   225,  329,  329,  329,  329,  329,  329,  329,  329,  329,
- /*   820 */   329,  375,  376,  377,  373,  372,  368,  367,  369,  370,
- /*   830 */   371,  378,  379,  200,  329,  329,  329,  329,  329,  329,
- /*   840 */   329,  329,  329,  329,  329,  329,  329,  329,  329,   50,
- /*   850 */    47,   48,   44,   10,   13,  305,  306,   12,   11,  340,
- /*   860 */   341,   40,   20,  225,  329,  329,  329,  329,  329,  329,
- /*   870 */   329,  329,  329,  329,  329,  375,  376,  377,  373,  372,
- /*   880 */   368,  367,  369,  370,  371,  378,  379,  329,  329,  329,
- /*   890 */   329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
- /*   900 */   329,  329,   50,   47,   48,   44,   10,   13,  305,  306,
- /*   910 */    12,   11,  340,  341,   40,   20,  329,  329,  329,  329,
- /*   920 */   329,  329,  329,  329,  329,  329,  329,  290,  375,  376,
- /*   930 */   377,  373,  372,  368,  367,  369,  370,  371,  378,  379,
- /*   940 */   225,  312,  329,  225,  329,  141,  312,  329,   77,  135,
- /*   950 */   152,  329,  329,  329,  135,  158,  208,  315,  386,  458,
- /*   960 */   329,  232,  294,  303,  325,  313,  232,  294,  303,  329,
- /*   970 */   313,  458,  223,  329,  329,  329,  318,  458,  329,   50,
- /*   980 */    47,   48,   44,   10,   13,  305,  306,   12,   11,  340,
- /*   990 */   341,   40,   20,  225,  329,  329,   46,  329,  329,  329,
- /*  1000 */   329,  329,  329,  329,  329,  375,  376,  377,  373,  372,
- /*  1010 */   368,  367,  369,  370,  371,  378,  379,  329,  329,  329,
- /*  1020 */   329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
- /*  1030 */   329,  329,   50,   47,   48,   44,   10,   13,  305,  306,
- /*  1040 */    12,   11,  340,  341,   40,   20,  329,  329,  329,  329,
- /*  1050 */   329,  329,  329,  329,  329,  329,  329,  329,  375,  376,
- /*  1060 */   377,  373,  372,  368,  367,  369,  370,  371,  378,  379,
- /*  1070 */   329,  329,  329,   50,   47,   48,   44,   10,   13,  305,
- /*  1080 */   306,   12,   11,  340,  341,   40,   20,  329,  329,  329,
- /*  1090 */   329,  329,  329,  329,  329,  329,  329,  329,  329,  375,
- /*  1100 */   376,  377,  373,  372,  368,  367,  369,  370,  371,  378,
- /*  1110 */   379,  329,  329,  329,  329,  329,   42,  329,  145,  211,
- /*  1120 */   329,  329,    6,  108,  329,  279,  329,  312,  134,  329,
- /*  1130 */   329,  150,  249,  329,  231,  135,  235,   41,   39,  329,
- /*  1140 */   329,   52,  329,   43,  311,  329,  312,  232,  294,  303,
- /*  1150 */   147,  313,  329,  170,  135,  329,   51,   49,  331,  237,
- /*  1160 */   296,  329,  325,  106,    1,  278,  232,  294,  303,  329,
- /*  1170 */   313,  155,  329,   42,  318,  145,  216,  329,   96,    6,
- /*  1180 */   108,   18,  329,  226,  317,  134,  329,  313,  329,  249,
- /*  1190 */   329,  231,  329,  235,   41,   39,  256,  329,   52,  329,
- /*  1200 */    43,  329,  312,  329,  329,  329,  141,  329,  329,   66,
- /*  1210 */   119,  238,  329,   51,   49,  331,  237,  296,  315,  386,
- /*  1220 */   106,    1,  232,  294,  303,  329,  313,  270,  329,  329,
- /*  1230 */    42,  329,  140,   92,  329,   96,    6,  108,   18,   41,
- /*  1240 */   169,  317,  134,  329,  273,   43,  249,  329,  231,  325,
- /*  1250 */   235,   41,   39,  244,  329,   52,   41,   43,  329,  312,
- /*  1260 */   329,  318,   43,  141,  329,  329,   67,  135,  225,  329,
- /*  1270 */    51,   49,  331,  237,  296,  315,  386,  106,    1,  224,
- /*  1280 */   294,  303,  329,  313,  310,  329,  329,   42,  329,  145,
- /*  1290 */   213,  329,   96,    6,  108,  329,   41,  329,  329,  134,
- /*  1300 */   329,  323,   43,  249,  329,  231,  329,  235,  329,   39,
- /*  1310 */   329,  329,   52,   41,  329,  329,  312,  329,  329,   43,
- /*  1320 */   141,   46,  329,   86,  135,  329,  329,   51,   49,  331,
- /*  1330 */   237,  296,  315,  386,  106,    1,  232,  294,  303,  329,
- /*  1340 */   313,  274,  329,  329,   42,  329,  142,  216,  329,   96,
- /*  1350 */     6,  108,  329,   41,  329,  329,  134,  329,  348,   43,
- /*  1360 */   249,  329,  231,  329,  235,  329,    7,  329,  329,   52,
- /*  1370 */    41,  329,  329,  312,  329,  329,   43,  141,  329,  329,
- /*  1380 */    90,  135,  329,  329,   51,   49,  331,  237,  296,  315,
- /*  1390 */   386,  106,    1,  232,  294,  303,  329,  313,  295,  329,
- /*  1400 */   329,   42,  329,  138,  216,  329,   96,    6,  108,  329,
- /*  1410 */    41,  329,  329,  134,  329,  322,   43,  249,  329,  231,
- /*  1420 */   329,  235,  329,   39,  329,  329,   52,   41,  329,  329,
- /*  1430 */   312,  329,  329,   43,  141,  329,  329,   87,  135,  329,
- /*  1440 */   329,   51,   49,  331,  237,  296,  315,  386,  106,    1,
- /*  1450 */   232,  294,  303,  329,  313,  384,  329,  329,   42,  329,
- /*  1460 */   131,  216,  329,   96,    6,  108,  329,   41,  329,  329,
- /*  1470 */   134,  329,  380,   43,  249,  329,  231,  329,  235,  329,
- /*  1480 */    15,  329,  329,   52,   41,  329,  329,  312,  329,  329,
- /*  1490 */    43,  141,  329,  329,   79,  135,  329,  329,   51,   49,
- /*  1500 */   331,  237,  296,  315,  386,  106,    1,  232,  294,  303,
- /*  1510 */   329,  313,  272,  329,  329,   42,  329,  145,  210,  329,
- /*  1520 */    96,    6,  108,  329,   41,  329,  329,  134,  329,  349,
- /*  1530 */    43,  249,  329,  231,  329,  221,  329,   39,  329,  329,
- /*  1540 */    52,   41,  329,  329,  312,  329,  329,   43,  141,  329,
- /*  1550 */   329,   70,  135,  329,  329,   51,   49,  331,  237,  296,
- /*  1560 */   315,  386,  106,    1,  232,  294,  303,  329,  313,  324,
- /*  1570 */   329,  329,   42,  329,  145,  209,  329,   96,    6,  108,
- /*  1580 */   329,   41,  329,  329,  134,  329,  326,   43,  249,  329,
- /*  1590 */   231,  329,  235,  329,   39,  329,  329,   52,   41,  329,
- /*  1600 */   329,  312,  329,  329,   43,  141,  329,  329,   74,  135,
- /*  1610 */   329,  329,   51,   49,  331,  237,  296,  315,  386,  106,
- /*  1620 */     1,  232,  294,  303,  329,  313,  262,  329,  329,   42,
- /*  1630 */   329,  131,  214,  329,   96,    6,  108,  329,   41,  329,
- /*  1640 */   329,  134,  329,  327,   43,  249,  329,  231,  329,  235,
- /*  1650 */   329,   15,  329,  329,   52,   41,  329,  329,  312,  329,
- /*  1660 */   329,   43,  141,  329,  329,   53,  135,  329,  329,   51,
- /*  1670 */    49,  331,  237,  296,  315,  386,  106,  329,  232,  294,
- /*  1680 */   303,  329,  313,  286,  329,  329,   42,  329,  131,  216,
- /*  1690 */   329,   96,    6,  108,  329,   41,  329,  329,  134,  329,
- /*  1700 */   343,   43,  249,  329,  231,  329,  235,  329,   15,  329,
- /*  1710 */   329,   52,   41,  329,  329,  312,  329,  329,   43,  118,
- /*  1720 */   329,  329,   76,  135,  329,  329,   51,   49,  331,  237,
- /*  1730 */   296,  315,  386,  106,  329,  232,  294,  303,  329,  313,
- /*  1740 */   329,  329,  329,  329,  504,  329,  329,  329,   96,  329,
- /*  1750 */   357,  504,  329,  504,  504,  364,  504,  504,  329,  329,
- /*  1760 */   329,   35,  504,  329,  504,    2,  504,    6,  108,  329,
- /*  1770 */   198,  174,  329,  134,  329,  329,  329,  249,  329,  231,
- /*  1780 */   325,  504,  329,   21,    9,  329,  329,  329,  144,  329,
- /*  1790 */   329,  329,  504,  329,  312,   99,  179,  206,  141,  329,
- /*  1800 */   329,   58,  135,  329,  329,  325,  504,  329,   21,    9,
- /*  1810 */   315,  386,  329,  312,  232,  294,  303,  141,  313,  329,
- /*  1820 */    71,  135,  206,  344,   37,  362,  329,  329,  329,  315,
- /*  1830 */   386,  329,  329,  232,  294,  303,  312,  313,  329,  329,
- /*  1840 */   141,  329,  329,   72,  135,  329,  329,  312,  329,  329,
- /*  1850 */   329,  141,  315,  386,   65,  135,  232,  294,  303,  329,
- /*  1860 */   313,  329,  329,  315,  386,  329,  329,  232,  294,  303,
- /*  1870 */   329,  313,  329,  329,  312,  198,  167,  329,  141,  329,
- /*  1880 */   329,   69,  135,  329,  329,  325,  329,  329,   21,    9,
- /*  1890 */   315,  386,  329,  329,  232,  294,  303,  312,  313,  329,
- /*  1900 */   329,  141,  206,  329,   85,  135,  329,  312,  329,  329,
- /*  1910 */   329,  149,  329,  315,  386,  135,  312,  232,  294,  303,
- /*  1920 */   141,  313,  329,   81,  135,  329,  329,  232,  294,  303,
- /*  1930 */   329,  313,  315,  386,  329,  329,  232,  294,  303,  312,
- /*  1940 */   313,  329,  329,  141,  329,  329,   82,  135,  329,  329,
- /*  1950 */   312,  329,  329,  329,  141,  315,  386,   63,  135,  232,
- /*  1960 */   294,  303,  329,  313,  329,  329,  315,  386,  329,  329,
- /*  1970 */   232,  294,  303,  329,  313,  329,  312,  329,  329,  329,
- /*  1980 */   141,  329,  329,   73,  135,  329,  329,  312,  329,  329,
- /*  1990 */   329,  141,  315,  386,   83,  135,  232,  294,  303,  329,
- /*  2000 */   313,  329,  329,  315,  386,  329,  312,  232,  294,  303,
- /*  2010 */   141,  313,  329,   89,  135,  329,  329,  329,  329,  329,
- /*  2020 */   329,  329,  315,  386,  329,  312,  232,  294,  303,  111,
- /*  2030 */   313,  329,   68,  135,  329,  329,  312,  329,  329,  329,
- /*  2040 */   141,  315,  386,   62,  135,  232,  294,  303,  329,  313,
- /*  2050 */   329,  329,  315,  386,  329,  329,  232,  294,  303,  329,
- /*  2060 */   313,  329,  312,  329,  329,  329,  141,  329,  329,   61,
- /*  2070 */   135,  329,  329,  312,  329,  329,  329,  141,  315,  386,
- /*  2080 */    91,  135,  232,  294,  303,  329,  313,  329,  329,  315,
- /*  2090 */   386,  329,  312,  232,  294,  303,  141,  313,  329,   78,
- /*  2100 */   135,  329,  329,  329,  329,  329,  329,  329,  315,  386,
- /*  2110 */   329,  312,  232,  294,  303,  141,  313,  329,   66,  135,
- /*  2120 */   329,  329,  312,  329,  329,  329,  141,  315,  386,   80,
- /*  2130 */   135,  232,  294,  303,  329,  313,  329,  329,  315,  386,
- /*  2140 */   329,  329,  232,  294,  303,  329,  313,  329,  312,  329,
- /*  2150 */   329,  329,  113,  329,  329,   88,  135,  329,  329,  312,
- /*  2160 */   329,  329,  329,  112,  315,  386,   84,  135,  232,  294,
- /*  2170 */   303,  329,  313,  329,  329,  315,  386,  329,  312,  232,
- /*  2180 */   294,  303,  141,  313,  329,   57,  135,  329,  329,  329,
- /*  2190 */   329,  329,  329,  329,  315,  386,  329,  312,  232,  294,
- /*  2200 */   303,   93,  313,  329,   59,  121,  329,  329,  312,  329,
- /*  2210 */   329,  329,  141,  315,  386,   75,  135,  232,  294,  303,
- /*  2220 */   329,  313,  329,  329,  315,  386,  329,  329,  232,  294,
- /*  2230 */   303,  329,  313,  329,  312,  329,  329,  329,  141,  329,
- /*  2240 */   329,   60,  135,  329,  329,  312,  329,  329,  329,  141,
- /*  2250 */   315,  386,   64,  135,  232,  294,  303,  329,  313,  329,
- /*  2260 */   329,  315,  386,  329,  312,  232,  294,  303,  120,  313,
- /*  2270 */   329,   55,  135,  329,  329,  329,  329,  329,  329,  329,
- /*  2280 */   315,  386,  329,  312,  232,  294,  303,   93,  313,  329,
- /*  2290 */    56,  121,  225,  329,  312,  329,  198,  164,  157,  315,
- /*  2300 */   386,  329,  135,  219,  294,  303,  325,  313,  352,   21,
- /*  2310 */     9,  287,  234,  329,  232,  294,  303,  329,  313,  329,
- /*  2320 */    41,  329,  329,  206,  312,  329,   43,  329,  151,    2,
- /*  2330 */   329,  329,  135,  329,  329,  329,  329,  329,  329,  329,
- /*  2340 */   198,  168,  329,  329,  232,  294,  303,  329,  313,  329,
- /*  2350 */   325,  329,  144,   21,    9,  198,  171,  329,  329,  329,
- /*  2360 */   329,  329,  329,  329,  329,  325,  329,  206,   21,    9,
- /*  2370 */   329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
- /*  2380 */   329,  329,  206,
-    );
-    static public $yy_lookahead = array(
- /*     0 */     1,    3,    4,    5,    6,    7,    8,    9,   10,   11,
- /*    10 */    12,   13,   16,   98,   16,   19,   17,   17,  113,  114,
- /*    20 */    22,   23,   16,   97,   18,   19,   28,  112,   29,   29,
- /*    30 */    32,   33,   34,   16,   35,   35,   19,   20,  112,   40,
- /*    40 */    41,   42,   43,   44,   45,   46,   47,   48,   49,   50,
- /*    50 */    51,   52,   53,    4,    5,    6,    7,    8,   62,   93,
- /*    60 */    94,   95,   13,   14,   15,   66,   67,   68,   69,   70,
- /*    70 */    71,   72,   73,   74,   75,   76,   77,    1,   85,   62,
- /*    80 */     1,    1,   89,   38,  117,   92,   93,   82,   83,   84,
- /*    90 */    85,   86,   38,   17,  101,  102,   17,   17,  105,  106,
- /*   100 */   107,   86,  109,   88,   59,   29,   61,    1,   29,   30,
- /*   110 */    65,   35,  119,  120,   35,   61,   40,   41,   42,   43,
- /*   120 */    44,   45,   46,   47,   48,   49,   50,   51,   52,   53,
- /*   130 */    90,   91,   59,   54,   54,   29,   16,   64,   18,   19,
- /*   140 */   100,   35,   66,   67,   68,   69,   70,   71,   72,   73,
- /*   150 */    74,   75,   76,   77,    1,   85,   36,  117,    1,   89,
- /*   160 */    18,    1,   92,   93,   94,    1,   17,   20,   21,   20,
- /*   170 */    17,  101,  102,   17,   17,  105,  106,  107,   29,  109,
- /*   180 */    38,   17,   29,   31,   35,   29,   29,   38,   35,   90,
- /*   190 */    38,   35,   35,   40,   41,   42,   43,   44,   45,   46,
- /*   200 */    47,   48,   49,   50,   51,   52,   53,    1,   61,  111,
- /*   210 */    61,  113,  114,   61,   54,   90,  117,  118,   90,   66,
- /*   220 */    67,   68,   69,   70,   71,   72,   73,   74,   75,   76,
- /*   230 */    77,  103,  104,   27,  110,   29,  112,    1,   84,   85,
- /*   240 */    86,   35,  117,   20,   21,  117,   40,   41,   42,   43,
- /*   250 */    44,   45,   46,   47,   48,   49,   50,   51,   52,   53,
- /*   260 */     1,   91,   16,   59,   25,   19,   20,   31,   64,   16,
- /*   270 */   100,   25,   66,   67,   68,   69,   70,   71,   72,   73,
- /*   280 */    74,   75,   76,   77,   61,   85,   85,  117,   29,   37,
- /*   290 */    54,   38,   18,   19,   35,   37,  110,   39,  112,   40,
- /*   300 */    41,   42,   43,   44,   45,   46,   47,   48,   49,   50,
- /*   310 */    51,   52,   53,    1,   90,   91,   16,   65,   79,   19,
- /*   320 */    20,  121,  122,  122,  100,   66,   67,   68,   69,   70,
- /*   330 */    71,   72,   73,   74,   75,   76,   77,   63,   24,   91,
- /*   340 */    37,  117,   39,   37,   16,   39,   90,   19,  100,    2,
- /*   350 */    19,   37,   40,   41,   42,   43,   44,   45,   46,   47,
- /*   360 */    48,   49,   50,   51,   52,   53,    1,   90,   91,   16,
- /*   370 */    29,   19,   19,  117,   93,   94,   35,  100,   66,   67,
- /*   380 */    68,   69,   70,   71,   72,   73,   74,   75,   76,   77,
- /*   390 */    62,   79,   96,   62,  117,   17,   16,   18,   19,   19,
- /*   400 */    93,   94,   19,   25,   39,   40,   41,   42,   43,   44,
- /*   410 */    45,   46,   47,   48,   49,   50,   51,   52,   53,    1,
- /*   420 */    91,   91,   90,   16,   16,   16,   19,   19,   19,  100,
- /*   430 */   100,   66,   67,   68,   69,   70,   71,   72,   73,   74,
- /*   440 */    75,   76,   77,  108,   29,   91,  117,  117,   30,  117,
- /*   450 */   115,   29,  113,  114,  100,   20,   96,   35,   40,   41,
- /*   460 */    42,   43,   44,   45,   46,   47,   48,   49,   50,   51,
- /*   470 */    52,   53,   91,    1,  118,   99,   18,   26,  110,   20,
- /*   480 */     2,  100,   97,    1,   66,   67,   68,   69,   70,   71,
- /*   490 */    72,   73,   74,   75,   76,   77,    1,  112,  117,   17,
- /*   500 */     1,    2,   85,   99,   19,  110,   89,   10,   16,   19,
- /*   510 */    93,   19,   17,   16,   21,   99,   17,   38,   59,   22,
- /*   520 */    23,   29,  105,  106,  107,   28,  109,   35,   18,   32,
- /*   530 */    33,   34,    2,    1,   65,   40,   41,   42,   43,   44,
- /*   540 */    45,   46,   47,   48,   49,   50,   51,   52,   53,   17,
- /*   550 */    20,   91,   59,   21,   36,   19,   19,   64,   19,   25,
- /*   560 */   100,   66,   67,   68,   69,   70,   71,   72,   73,   74,
- /*   570 */    75,   76,   77,    1,   85,   78,   79,   80,   89,   85,
- /*   580 */    19,   92,   93,   89,   59,   63,   21,   93,   19,   17,
- /*   590 */   101,  102,   17,    1,  105,  106,  107,   18,  109,  105,
- /*   600 */   106,  107,   18,  109,   29,  116,   36,   63,   19,   17,
- /*   610 */    35,    1,   40,   41,   42,   43,   44,   45,   46,   47,
- /*   620 */    48,   49,   50,   51,   52,   53,   61,   17,  108,   38,
- /*   630 */     2,   19,   39,   55,   21,  115,   18,   97,   66,   67,
- /*   640 */    68,   69,   70,   71,   72,   73,   74,   75,   76,   77,
- /*   650 */     1,   85,  112,    1,  100,   89,   85,  115,   92,   93,
- /*   660 */    89,  110,  112,  111,   93,   91,   17,  101,  102,   17,
- /*   670 */    97,  105,  106,  107,  100,  109,  105,  106,  107,   14,
- /*   680 */   109,   29,  116,   87,  123,  112,  112,   35,  123,   40,
- /*   690 */    41,   42,   43,   44,   45,   46,   47,   48,   49,   50,
- /*   700 */    51,   52,   53,    1,    2,  110,   54,  110,  114,  110,
- /*   710 */   123,  123,   97,   97,   97,   66,   67,   68,   69,   70,
- /*   720 */    71,   72,   73,   74,   75,   76,   77,  112,  112,  112,
- /*   730 */   123,  123,  123,  123,  123,  123,  123,  123,  123,  123,
- /*   740 */   123,  123,   40,   41,   42,   43,   44,   45,   46,   47,
- /*   750 */    48,   49,   50,   51,   52,   53,    1,  123,  123,  123,
- /*   760 */   123,  123,  123,  123,  123,   97,   97,   97,   66,   67,
- /*   770 */    68,   69,   70,   71,   72,   73,   74,   75,   76,   77,
- /*   780 */   112,  112,  112,  123,  123,  123,  123,  123,  123,  123,
- /*   790 */   123,  123,  123,  123,   39,   40,   41,   42,   43,   44,
- /*   800 */    45,   46,   47,   48,   49,   50,   51,   52,   53,  123,
- /*   810 */     1,  123,  123,  123,  123,  123,  123,  123,  123,  123,
- /*   820 */   123,   66,   67,   68,   69,   70,   71,   72,   73,   74,
- /*   830 */    75,   76,   77,   24,  123,  123,  123,  123,  123,  123,
- /*   840 */   123,  123,  123,  123,  123,  123,  123,  123,  123,   40,
- /*   850 */    41,   42,   43,   44,   45,   46,   47,   48,   49,   50,
- /*   860 */    51,   52,   53,    1,  123,  123,  123,  123,  123,  123,
- /*   870 */   123,  123,  123,  123,  123,   66,   67,   68,   69,   70,
- /*   880 */    71,   72,   73,   74,   75,   76,   77,  123,  123,  123,
- /*   890 */   123,  123,  123,  123,  123,  123,  123,  123,  123,  123,
- /*   900 */   123,  123,   40,   41,   42,   43,   44,   45,   46,   47,
- /*   910 */    48,   49,   50,   51,   52,   53,  123,  123,  123,  123,
- /*   920 */   123,  123,  123,  123,  123,  123,  123,   65,   66,   67,
- /*   930 */    68,   69,   70,   71,   72,   73,   74,   75,   76,   77,
- /*   940 */     1,   85,  123,    1,  123,   89,   85,  123,   92,   93,
- /*   950 */    89,  123,  123,  123,   93,   91,   17,  101,  102,   17,
- /*   960 */   123,  105,  106,  107,  100,  109,  105,  106,  107,  123,
- /*   970 */   109,   29,  116,  123,  123,  123,  112,   35,  123,   40,
- /*   980 */    41,   42,   43,   44,   45,   46,   47,   48,   49,   50,
- /*   990 */    51,   52,   53,    1,  123,  123,   54,  123,  123,  123,
- /*  1000 */   123,  123,  123,  123,  123,   66,   67,   68,   69,   70,
- /*  1010 */    71,   72,   73,   74,   75,   76,   77,  123,  123,  123,
- /*  1020 */   123,  123,  123,  123,  123,  123,  123,  123,  123,  123,
- /*  1030 */   123,  123,   40,   41,   42,   43,   44,   45,   46,   47,
- /*  1040 */    48,   49,   50,   51,   52,   53,  123,  123,  123,  123,
- /*  1050 */   123,  123,  123,  123,  123,  123,  123,  123,   66,   67,
- /*  1060 */    68,   69,   70,   71,   72,   73,   74,   75,   76,   77,
- /*  1070 */   123,  123,  123,   40,   41,   42,   43,   44,   45,   46,
- /*  1080 */    47,   48,   49,   50,   51,   52,   53,  123,  123,  123,
- /*  1090 */   123,  123,  123,  123,  123,  123,  123,  123,  123,   66,
- /*  1100 */    67,   68,   69,   70,   71,   72,   73,   74,   75,   76,
- /*  1110 */    77,  123,  123,  123,  123,  123,   16,  123,   18,   19,
- /*  1120 */   123,  123,   22,   23,  123,   17,  123,   85,   28,  123,
- /*  1130 */   123,   89,   32,   33,   34,   93,   36,   29,   38,  123,
- /*  1140 */   123,   41,  123,   35,  102,  123,   85,  105,  106,  107,
- /*  1150 */    89,  109,  123,   91,   93,  123,   56,   57,   58,   59,
- /*  1160 */    60,  123,  100,   63,   64,   65,  105,  106,  107,  123,
- /*  1170 */   109,   93,  123,   16,  112,   18,   19,  123,   78,   22,
- /*  1180 */    23,   16,  123,  105,   19,   28,  123,  109,  123,   32,
- /*  1190 */    33,   34,  123,   36,   29,   38,   31,  123,   41,  123,
- /*  1200 */    35,  123,   85,  123,  123,  123,   89,  123,  123,   92,
- /*  1210 */    93,   94,  123,   56,   57,   58,   59,   60,  101,  102,
- /*  1220 */    63,   64,  105,  106,  107,  123,  109,   17,  123,  123,
- /*  1230 */    16,  123,   18,   19,  123,   78,   22,   23,   16,   29,
- /*  1240 */    91,   19,   28,  123,   17,   35,   32,   33,   34,  100,
- /*  1250 */    36,   29,   38,   31,  123,   41,   29,   35,  123,   85,
- /*  1260 */   123,  112,   35,   89,  123,  123,   92,   93,    1,  123,
- /*  1270 */    56,   57,   58,   59,   60,  101,  102,   63,   64,  105,
- /*  1280 */   106,  107,  123,  109,   17,  123,  123,   16,  123,   18,
- /*  1290 */    19,  123,   78,   22,   23,  123,   29,  123,  123,   28,
- /*  1300 */   123,   17,   35,   32,   33,   34,  123,   36,  123,   38,
- /*  1310 */   123,  123,   41,   29,  123,  123,   85,  123,  123,   35,
- /*  1320 */    89,   54,  123,   92,   93,  123,  123,   56,   57,   58,
- /*  1330 */    59,   60,  101,  102,   63,   64,  105,  106,  107,  123,
- /*  1340 */   109,   17,  123,  123,   16,  123,   18,   19,  123,   78,
- /*  1350 */    22,   23,  123,   29,  123,  123,   28,  123,   17,   35,
- /*  1360 */    32,   33,   34,  123,   36,  123,   38,  123,  123,   41,
- /*  1370 */    29,  123,  123,   85,  123,  123,   35,   89,  123,  123,
- /*  1380 */    92,   93,  123,  123,   56,   57,   58,   59,   60,  101,
- /*  1390 */   102,   63,   64,  105,  106,  107,  123,  109,   17,  123,
- /*  1400 */   123,   16,  123,   18,   19,  123,   78,   22,   23,  123,
- /*  1410 */    29,  123,  123,   28,  123,   17,   35,   32,   33,   34,
- /*  1420 */   123,   36,  123,   38,  123,  123,   41,   29,  123,  123,
- /*  1430 */    85,  123,  123,   35,   89,  123,  123,   92,   93,  123,
- /*  1440 */   123,   56,   57,   58,   59,   60,  101,  102,   63,   64,
- /*  1450 */   105,  106,  107,  123,  109,   17,  123,  123,   16,  123,
- /*  1460 */    18,   19,  123,   78,   22,   23,  123,   29,  123,  123,
- /*  1470 */    28,  123,   17,   35,   32,   33,   34,  123,   36,  123,
- /*  1480 */    38,  123,  123,   41,   29,  123,  123,   85,  123,  123,
- /*  1490 */    35,   89,  123,  123,   92,   93,  123,  123,   56,   57,
- /*  1500 */    58,   59,   60,  101,  102,   63,   64,  105,  106,  107,
- /*  1510 */   123,  109,   17,  123,  123,   16,  123,   18,   19,  123,
- /*  1520 */    78,   22,   23,  123,   29,  123,  123,   28,  123,   17,
- /*  1530 */    35,   32,   33,   34,  123,   36,  123,   38,  123,  123,
- /*  1540 */    41,   29,  123,  123,   85,  123,  123,   35,   89,  123,
- /*  1550 */   123,   92,   93,  123,  123,   56,   57,   58,   59,   60,
- /*  1560 */   101,  102,   63,   64,  105,  106,  107,  123,  109,   17,
- /*  1570 */   123,  123,   16,  123,   18,   19,  123,   78,   22,   23,
- /*  1580 */   123,   29,  123,  123,   28,  123,   17,   35,   32,   33,
- /*  1590 */    34,  123,   36,  123,   38,  123,  123,   41,   29,  123,
- /*  1600 */   123,   85,  123,  123,   35,   89,  123,  123,   92,   93,
- /*  1610 */   123,  123,   56,   57,   58,   59,   60,  101,  102,   63,
- /*  1620 */    64,  105,  106,  107,  123,  109,   17,  123,  123,   16,
- /*  1630 */   123,   18,   19,  123,   78,   22,   23,  123,   29,  123,
- /*  1640 */   123,   28,  123,   17,   35,   32,   33,   34,  123,   36,
- /*  1650 */   123,   38,  123,  123,   41,   29,  123,  123,   85,  123,
- /*  1660 */   123,   35,   89,  123,  123,   92,   93,  123,  123,   56,
- /*  1670 */    57,   58,   59,   60,  101,  102,   63,  123,  105,  106,
- /*  1680 */   107,  123,  109,   17,  123,  123,   16,  123,   18,   19,
- /*  1690 */   123,   78,   22,   23,  123,   29,  123,  123,   28,  123,
- /*  1700 */    17,   35,   32,   33,   34,  123,   36,  123,   38,  123,
- /*  1710 */   123,   41,   29,  123,  123,   85,  123,  123,   35,   89,
- /*  1720 */   123,  123,   92,   93,  123,  123,   56,   57,   58,   59,
- /*  1730 */    60,  101,  102,   63,  123,  105,  106,  107,  123,  109,
- /*  1740 */   123,  123,  123,  123,   17,  123,  123,  123,   78,  123,
- /*  1750 */   120,   24,  123,   26,   27,   10,   29,   30,  123,  123,
- /*  1760 */   123,   16,   35,  123,   37,   38,   39,   22,   23,  123,
- /*  1770 */    90,   91,  123,   28,  123,  123,  123,   32,   33,   34,
- /*  1780 */   100,   54,  123,  103,  104,  123,  123,  123,   61,  123,
- /*  1790 */   123,  123,   65,  123,   85,   90,   91,  117,   89,  123,
- /*  1800 */   123,   92,   93,  123,  123,  100,   79,  123,  103,  104,
- /*  1810 */   101,  102,  123,   85,  105,  106,  107,   89,  109,  123,
- /*  1820 */    92,   93,  117,   78,   79,   80,  123,  123,  123,  101,
- /*  1830 */   102,  123,  123,  105,  106,  107,   85,  109,  123,  123,
- /*  1840 */    89,  123,  123,   92,   93,  123,  123,   85,  123,  123,
- /*  1850 */   123,   89,  101,  102,   92,   93,  105,  106,  107,  123,
- /*  1860 */   109,  123,  123,  101,  102,  123,  123,  105,  106,  107,
- /*  1870 */   123,  109,  123,  123,   85,   90,   91,  123,   89,  123,
- /*  1880 */   123,   92,   93,  123,  123,  100,  123,  123,  103,  104,
- /*  1890 */   101,  102,  123,  123,  105,  106,  107,   85,  109,  123,
- /*  1900 */   123,   89,  117,  123,   92,   93,  123,   85,  123,  123,
- /*  1910 */   123,   89,  123,  101,  102,   93,   85,  105,  106,  107,
- /*  1920 */    89,  109,  123,   92,   93,  123,  123,  105,  106,  107,
- /*  1930 */   123,  109,  101,  102,  123,  123,  105,  106,  107,   85,
- /*  1940 */   109,  123,  123,   89,  123,  123,   92,   93,  123,  123,
- /*  1950 */    85,  123,  123,  123,   89,  101,  102,   92,   93,  105,
- /*  1960 */   106,  107,  123,  109,  123,  123,  101,  102,  123,  123,
- /*  1970 */   105,  106,  107,  123,  109,  123,   85,  123,  123,  123,
- /*  1980 */    89,  123,  123,   92,   93,  123,  123,   85,  123,  123,
- /*  1990 */   123,   89,  101,  102,   92,   93,  105,  106,  107,  123,
- /*  2000 */   109,  123,  123,  101,  102,  123,   85,  105,  106,  107,
- /*  2010 */    89,  109,  123,   92,   93,  123,  123,  123,  123,  123,
- /*  2020 */   123,  123,  101,  102,  123,   85,  105,  106,  107,   89,
- /*  2030 */   109,  123,   92,   93,  123,  123,   85,  123,  123,  123,
- /*  2040 */    89,  101,  102,   92,   93,  105,  106,  107,  123,  109,
- /*  2050 */   123,  123,  101,  102,  123,  123,  105,  106,  107,  123,
- /*  2060 */   109,  123,   85,  123,  123,  123,   89,  123,  123,   92,
- /*  2070 */    93,  123,  123,   85,  123,  123,  123,   89,  101,  102,
- /*  2080 */    92,   93,  105,  106,  107,  123,  109,  123,  123,  101,
- /*  2090 */   102,  123,   85,  105,  106,  107,   89,  109,  123,   92,
- /*  2100 */    93,  123,  123,  123,  123,  123,  123,  123,  101,  102,
- /*  2110 */   123,   85,  105,  106,  107,   89,  109,  123,   92,   93,
- /*  2120 */   123,  123,   85,  123,  123,  123,   89,  101,  102,   92,
- /*  2130 */    93,  105,  106,  107,  123,  109,  123,  123,  101,  102,
- /*  2140 */   123,  123,  105,  106,  107,  123,  109,  123,   85,  123,
- /*  2150 */   123,  123,   89,  123,  123,   92,   93,  123,  123,   85,
- /*  2160 */   123,  123,  123,   89,  101,  102,   92,   93,  105,  106,
- /*  2170 */   107,  123,  109,  123,  123,  101,  102,  123,   85,  105,
- /*  2180 */   106,  107,   89,  109,  123,   92,   93,  123,  123,  123,
- /*  2190 */   123,  123,  123,  123,  101,  102,  123,   85,  105,  106,
- /*  2200 */   107,   89,  109,  123,   92,   93,  123,  123,   85,  123,
- /*  2210 */   123,  123,   89,  101,  102,   92,   93,  105,  106,  107,
- /*  2220 */   123,  109,  123,  123,  101,  102,  123,  123,  105,  106,
- /*  2230 */   107,  123,  109,  123,   85,  123,  123,  123,   89,  123,
- /*  2240 */   123,   92,   93,  123,  123,   85,  123,  123,  123,   89,
- /*  2250 */   101,  102,   92,   93,  105,  106,  107,  123,  109,  123,
- /*  2260 */   123,  101,  102,  123,   85,  105,  106,  107,   89,  109,
- /*  2270 */   123,   92,   93,  123,  123,  123,  123,  123,  123,  123,
- /*  2280 */   101,  102,  123,   85,  105,  106,  107,   89,  109,  123,
- /*  2290 */    92,   93,    1,  123,   85,  123,   90,   91,   89,  101,
- /*  2300 */   102,  123,   93,  105,  106,  107,  100,  109,   17,  103,
- /*  2310 */   104,  102,   21,  123,  105,  106,  107,  123,  109,  123,
- /*  2320 */    29,  123,  123,  117,   85,  123,   35,  123,   89,   38,
- /*  2330 */   123,  123,   93,  123,  123,  123,  123,  123,  123,  123,
- /*  2340 */    90,   91,  123,  123,  105,  106,  107,  123,  109,  123,
- /*  2350 */   100,  123,   61,  103,  104,   90,   91,  123,  123,  123,
- /*  2360 */   123,  123,  123,  123,  123,  100,  123,  117,  103,  104,
- /*  2370 */   123,  123,  123,  123,  123,  123,  123,  123,  123,  123,
- /*  2380 */   123,  123,  117,
-);
-    const YY_SHIFT_USE_DFLT = -5;
-    const YY_SHIFT_MAX = 256;
-    static public $yy_shift_ofst = array(
- /*     0 */    -2, 1271, 1157, 1157, 1271, 1157, 1328, 1328, 1100, 1157,
- /*    10 */  1157, 1157, 1157, 1157, 1157, 1157, 1499, 1157, 1157, 1157,
- /*    20 */  1157, 1157, 1556, 1157, 1157, 1157, 1157, 1157, 1157, 1157,
- /*    30 */  1157, 1157, 1157, 1157, 1385, 1214, 1157, 1157, 1157, 1157,
- /*    40 */  1157, 1499, 1214, 1157, 1442, 1442, 1613, 1670, 1670, 1670,
- /*    50 */  1670, 1670, 1670,  206,  153,   76,   -1,  259,  259,  259,
- /*    60 */   809,  939,  755,  862,  702,  649,  365,  312,  418,  495,
- /*    70 */   572,  992,  992,  992,  992,  992,  992,  992,  992,  992,
- /*    80 */   992,  992,  992,  992,  992,  992,  992,  992,  992,  992,
- /*    90 */  1033, 1033, 2291, 1267,  106,   -2, 1745, 1222, 1165,  157,
- /*   100 */   157,  492,  492,  499,  106,  106,  274,  493,  142,  497,
- /*   110 */    49,   79,  942,  652,  246,   17,  328,  300,  236,  223,
- /*   120 */    80,  147,  532, 1227,  353,  353,  353,  422,  407,  142,
- /*   130 */   353,  353,  610,  353,  341,  565,  379,  353,  380,  142,
- /*   140 */   408,  160,  409,  353,  379,  409,  353,  472,  613,  472,
- /*   150 */   472,  472,  472,  472,  472,  613,  472,   -5, 1284, 1210,
- /*   160 */    -4, 1108,    0,  156,  575, 1683, 1552, 1512, 1569, 1609,
- /*   170 */  1666, 1324, 1626,    6, 1495, 1398, 1381, 1341, 1438, 1455,
- /*   180 */    73,  482,   73,  204,  592,  204,  204,  204,  164,  204,
- /*   190 */   253,  204,  204,  665,  613,  613,  613,  479,  472,  347,
- /*   200 */   415,  415,  472,  347,   -5,   -5,   -5,   -5,   -5, 1727,
- /*   210 */   149,   45,  120,  152,   54,  530,   54,  314,  252,  378,
- /*   220 */   306,  459,  258,  303,  239,  331,  522,  536,  469,  537,
- /*   230 */   539,  569,  534,  544,  561,  525,  518,  570,  593,  612,
- /*   240 */   578,  628,  591,  579,  510,  584,  589,  458,  435,  352,
- /*   250 */   485,  478,  451,  479,  490,  383,  618,
-);
-    const YY_REDUCE_USE_DFLT = -96;
-    const YY_REDUCE_MAX = 208;
-    static public $yy_reduce_ofst = array(
- /*     0 */     5,   -7,  489,  566, 1630,  856,   70, 1117, 1865, 1854,
- /*    10 */  1831, 1812, 1891, 1902, 1977, 1951, 1940, 1921, 1789, 1762,
- /*    20 */  1402, 1345, 1288, 1231, 1459, 1516, 1751, 1728, 1709, 1573,
- /*    30 */  1988, 2007, 2123, 2149, 2160, 2198, 2179, 1174, 2093, 2026,
- /*    40 */  2037, 2063, 2112, 2074, 1042, 2209, 1822, 2239, 1061,  861,
- /*    50 */   494,  417,  571, 2265, 2250, 2206, 1705, 1785, 1680, 1705,
- /*    60 */   128,  128,  128,  128,  128,  128,  128,  128,  128,  128,
- /*    70 */   128,  128,  128,  128,  128,  128,  128,  128,  128,  128,
- /*    80 */   128,  128,  128,  128,  128,  128,  128,  128,  128,  128,
- /*    90 */   128,  128,  277,  224,   40,  154,  200,  864, 1062,  170,
- /*   100 */   330,  574, 1149,   99,  329,  381, 1078,   98,  -34,  201,
- /*   110 */    15,  125,  125,  125,  -85,  124,  124,  124,  125,  -95,
- /*   120 */   125,  -95,  332,  354,  573,  616,  617,  460,  615,  307,
- /*   130 */   385,  540,  256,  -74,  248,  -95,  335,  668,  540,  281,
- /*   140 */   540,  125,  670,  669,  520,  540,  186,  125,  339,  125,
- /*   150 */   125,  125,  125,  125,  125,  -95,  125,  125,  554,  554,
- /*   160 */   550,  554,  554,  554,  554,  554,  554,  554,  554,  554,
- /*   170 */   554,  554,  554,  542,  554,  554,  554,  554,  554,  554,
- /*   180 */   595,  -33,  551,  552,  -33,  552,  552,  552,  -33,  552,
- /*   190 */   597,  552,  552,  596,  594,  594,  594,  599,  -33,  356,
- /*   200 */   296,  360,  -33,  356,  395,  404,  376,  416,  368,
-);
-    static public $yyExpectedTokens = array(
-        /* 0 */ array(3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 16, 22, 23, 28, 32, 33, 34, ),
-        /* 1 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 36, 38, 41, 56, 57, 58, 59, 60, 63, 64, 78, ),
-        /* 2 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 36, 38, 41, 56, 57, 58, 59, 60, 63, 64, 78, ),
-        /* 3 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 36, 38, 41, 56, 57, 58, 59, 60, 63, 64, 78, ),
-        /* 4 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 36, 38, 41, 56, 57, 58, 59, 60, 63, 64, 78, ),
-        /* 5 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 36, 38, 41, 56, 57, 58, 59, 60, 63, 64, 78, ),
-        /* 6 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 36, 38, 41, 56, 57, 58, 59, 60, 63, 64, 78, ),
-        /* 7 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 36, 38, 41, 56, 57, 58, 59, 60, 63, 64, 78, ),
-        /* 8 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 36, 38, 41, 56, 57, 58, 59, 60, 63, 64, 65, 78, ),
-        /* 9 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 36, 38, 41, 56, 57, 58, 59, 60, 63, 64, 78, ),
-        /* 10 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 36, 38, 41, 56, 57, 58, 59, 60, 63, 64, 78, ),
-        /* 11 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 36, 38, 41, 56, 57, 58, 59, 60, 63, 64, 78, ),
-        /* 12 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 36, 38, 41, 56, 57, 58, 59, 60, 63, 64, 78, ),
-        /* 13 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 36, 38, 41, 56, 57, 58, 59, 60, 63, 64, 78, ),
-        /* 14 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 36, 38, 41, 56, 57, 58, 59, 60, 63, 64, 78, ),
-        /* 15 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 36, 38, 41, 56, 57, 58, 59, 60, 63, 64, 78, ),
-        /* 16 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 36, 38, 41, 56, 57, 58, 59, 60, 63, 64, 78, ),
-        /* 17 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 36, 38, 41, 56, 57, 58, 59, 60, 63, 64, 78, ),
-        /* 18 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 36, 38, 41, 56, 57, 58, 59, 60, 63, 64, 78, ),
-        /* 19 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 36, 38, 41, 56, 57, 58, 59, 60, 63, 64, 78, ),
-        /* 20 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 36, 38, 41, 56, 57, 58, 59, 60, 63, 64, 78, ),
-        /* 21 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 36, 38, 41, 56, 57, 58, 59, 60, 63, 64, 78, ),
-        /* 22 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 36, 38, 41, 56, 57, 58, 59, 60, 63, 64, 78, ),
-        /* 23 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 36, 38, 41, 56, 57, 58, 59, 60, 63, 64, 78, ),
-        /* 24 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 36, 38, 41, 56, 57, 58, 59, 60, 63, 64, 78, ),
-        /* 25 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 36, 38, 41, 56, 57, 58, 59, 60, 63, 64, 78, ),
-        /* 26 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 36, 38, 41, 56, 57, 58, 59, 60, 63, 64, 78, ),
-        /* 27 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 36, 38, 41, 56, 57, 58, 59, 60, 63, 64, 78, ),
-        /* 28 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 36, 38, 41, 56, 57, 58, 59, 60, 63, 64, 78, ),
-        /* 29 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 36, 38, 41, 56, 57, 58, 59, 60, 63, 64, 78, ),
-        /* 30 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 36, 38, 41, 56, 57, 58, 59, 60, 63, 64, 78, ),
-        /* 31 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 36, 38, 41, 56, 57, 58, 59, 60, 63, 64, 78, ),
-        /* 32 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 36, 38, 41, 56, 57, 58, 59, 60, 63, 64, 78, ),
-        /* 33 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 36, 38, 41, 56, 57, 58, 59, 60, 63, 64, 78, ),
-        /* 34 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 36, 38, 41, 56, 57, 58, 59, 60, 63, 64, 78, ),
-        /* 35 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 36, 38, 41, 56, 57, 58, 59, 60, 63, 64, 78, ),
-        /* 36 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 36, 38, 41, 56, 57, 58, 59, 60, 63, 64, 78, ),
-        /* 37 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 36, 38, 41, 56, 57, 58, 59, 60, 63, 64, 78, ),
-        /* 38 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 36, 38, 41, 56, 57, 58, 59, 60, 63, 64, 78, ),
-        /* 39 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 36, 38, 41, 56, 57, 58, 59, 60, 63, 64, 78, ),
-        /* 40 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 36, 38, 41, 56, 57, 58, 59, 60, 63, 64, 78, ),
-        /* 41 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 36, 38, 41, 56, 57, 58, 59, 60, 63, 64, 78, ),
-        /* 42 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 36, 38, 41, 56, 57, 58, 59, 60, 63, 64, 78, ),
-        /* 43 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 36, 38, 41, 56, 57, 58, 59, 60, 63, 64, 78, ),
-        /* 44 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 36, 38, 41, 56, 57, 58, 59, 60, 63, 64, 78, ),
-        /* 45 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 36, 38, 41, 56, 57, 58, 59, 60, 63, 64, 78, ),
-        /* 46 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 36, 38, 41, 56, 57, 58, 59, 60, 63, 78, ),
-        /* 47 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 36, 38, 41, 56, 57, 58, 59, 60, 63, 78, ),
-        /* 48 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 36, 38, 41, 56, 57, 58, 59, 60, 63, 78, ),
-        /* 49 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 36, 38, 41, 56, 57, 58, 59, 60, 63, 78, ),
-        /* 50 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 36, 38, 41, 56, 57, 58, 59, 60, 63, 78, ),
-        /* 51 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 36, 38, 41, 56, 57, 58, 59, 60, 63, 78, ),
-        /* 52 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 36, 38, 41, 56, 57, 58, 59, 60, 63, 78, ),
-        /* 53 */ array(1, 27, 29, 35, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, ),
-        /* 54 */ array(1, 17, 29, 35, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, ),
-        /* 55 */ array(1, 17, 29, 35, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, ),
-        /* 56 */ array(1, 17, 29, 35, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, ),
-        /* 57 */ array(1, 29, 35, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, ),
-        /* 58 */ array(1, 29, 35, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, ),
-        /* 59 */ array(1, 29, 35, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, ),
-        /* 60 */ array(1, 24, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, ),
-        /* 61 */ array(1, 17, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, ),
-        /* 62 */ array(1, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, ),
-        /* 63 */ array(1, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, ),
-        /* 64 */ array(1, 2, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, ),
-        /* 65 */ array(1, 17, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, ),
-        /* 66 */ array(1, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, ),
-        /* 67 */ array(1, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 79, ),
-        /* 68 */ array(1, 30, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, ),
-        /* 69 */ array(1, 17, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, ),
-        /* 70 */ array(1, 17, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, ),
-        /* 71 */ array(1, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, ),
-        /* 72 */ array(1, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, ),
-        /* 73 */ array(1, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, ),
-        /* 74 */ array(1, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, ),
-        /* 75 */ array(1, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, ),
-        /* 76 */ array(1, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, ),
-        /* 77 */ array(1, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, ),
-        /* 78 */ array(1, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, ),
-        /* 79 */ array(1, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, ),
-        /* 80 */ array(1, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, ),
-        /* 81 */ array(1, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, ),
-        /* 82 */ array(1, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, ),
-        /* 83 */ array(1, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, ),
-        /* 84 */ array(1, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, ),
-        /* 85 */ array(1, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, ),
-        /* 86 */ array(1, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, ),
-        /* 87 */ array(1, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, ),
-        /* 88 */ array(1, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, ),
-        /* 89 */ array(1, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, ),
-        /* 90 */ array(40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, ),
-        /* 91 */ array(40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, ),
-        /* 92 */ array(1, 17, 21, 29, 35, 38, 61, ),
-        /* 93 */ array(1, 17, 29, 35, 54, ),
-        /* 94 */ array(1, 29, 35, ),
-        /* 95 */ array(3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 16, 22, 23, 28, 32, 33, 34, ),
-        /* 96 */ array(10, 16, 22, 23, 28, 32, 33, 34, 78, 79, 80, ),
-        /* 97 */ array(16, 19, 29, 31, 35, ),
-        /* 98 */ array(16, 19, 29, 31, 35, ),
-        /* 99 */ array(1, 17, 29, 35, ),
-        /* 100 */ array(1, 17, 29, 35, ),
-        /* 101 */ array(16, 19, 29, 35, ),
-        /* 102 */ array(16, 19, 29, 35, ),
-        /* 103 */ array(1, 2, 17, ),
-        /* 104 */ array(1, 29, 35, ),
-        /* 105 */ array(1, 29, 35, ),
-        /* 106 */ array(18, 19, 63, ),
-        /* 107 */ array(21, 59, 64, ),
-        /* 108 */ array(18, 38, ),
-        /* 109 */ array(10, 16, 22, 23, 28, 32, 33, 34, 78, 79, 80, ),
-        /* 110 */ array(4, 5, 6, 7, 8, 13, 14, 15, ),
-        /* 111 */ array(1, 17, 29, 30, 35, 54, ),
-        /* 112 */ array(1, 17, 29, 35, 54, ),
-        /* 113 */ array(1, 17, 29, 35, 54, ),
-        /* 114 */ array(16, 19, 20, 25, ),
-        /* 115 */ array(16, 19, 20, 62, ),
-        /* 116 */ array(16, 19, 62, ),
-        /* 117 */ array(16, 19, 20, ),
-        /* 118 */ array(1, 31, 54, ),
-        /* 119 */ array(20, 21, 61, ),
-        /* 120 */ array(1, 17, 54, ),
-        /* 121 */ array(20, 21, 61, ),
-        /* 122 */ array(1, 17, 21, ),
-        /* 123 */ array(17, 29, 35, ),
-        /* 124 */ array(16, 19, ),
-        /* 125 */ array(16, 19, ),
-        /* 126 */ array(16, 19, ),
-        /* 127 */ array(29, 35, ),
-        /* 128 */ array(16, 19, ),
-        /* 129 */ array(18, 38, ),
-        /* 130 */ array(16, 19, ),
-        /* 131 */ array(16, 19, ),
-        /* 132 */ array(1, 17, ),
-        /* 133 */ array(16, 19, ),
-        /* 134 */ array(29, 35, ),
-        /* 135 */ array(21, 61, ),
-        /* 136 */ array(18, 19, ),
-        /* 137 */ array(16, 19, ),
-        /* 138 */ array(16, 19, ),
-        /* 139 */ array(18, 38, ),
-        /* 140 */ array(16, 19, ),
-        /* 141 */ array(1, 54, ),
-        /* 142 */ array(16, 19, ),
-        /* 143 */ array(16, 19, ),
-        /* 144 */ array(18, 19, ),
-        /* 145 */ array(16, 19, ),
-        /* 146 */ array(16, 19, ),
-        /* 147 */ array(1, ),
-        /* 148 */ array(21, ),
-        /* 149 */ array(1, ),
-        /* 150 */ array(1, ),
-        /* 151 */ array(1, ),
-        /* 152 */ array(1, ),
-        /* 153 */ array(1, ),
-        /* 154 */ array(1, ),
-        /* 155 */ array(21, ),
-        /* 156 */ array(1, ),
-        /* 157 */ array(),
-        /* 158 */ array(17, 29, 35, ),
-        /* 159 */ array(17, 29, 35, ),
-        /* 160 */ array(16, 19, 62, ),
-        /* 161 */ array(17, 29, 35, ),
-        /* 162 */ array(17, 29, 35, ),
-        /* 163 */ array(17, 29, 35, ),
-        /* 164 */ array(17, 29, 35, ),
-        /* 165 */ array(17, 29, 35, ),
-        /* 166 */ array(17, 29, 35, ),
-        /* 167 */ array(17, 29, 35, ),
-        /* 168 */ array(17, 29, 35, ),
-        /* 169 */ array(17, 29, 35, ),
-        /* 170 */ array(17, 29, 35, ),
-        /* 171 */ array(17, 29, 35, ),
-        /* 172 */ array(17, 29, 35, ),
-        /* 173 */ array(16, 18, 19, ),
-        /* 174 */ array(17, 29, 35, ),
-        /* 175 */ array(17, 29, 35, ),
-        /* 176 */ array(17, 29, 35, ),
-        /* 177 */ array(17, 29, 35, ),
-        /* 178 */ array(17, 29, 35, ),
-        /* 179 */ array(17, 29, 35, ),
-        /* 180 */ array(59, 64, ),
-        /* 181 */ array(1, 17, ),
-        /* 182 */ array(59, 64, ),
-        /* 183 */ array(59, 64, ),
-        /* 184 */ array(1, 17, ),
-        /* 185 */ array(59, 64, ),
-        /* 186 */ array(59, 64, ),
-        /* 187 */ array(59, 64, ),
-        /* 188 */ array(1, 17, ),
-        /* 189 */ array(59, 64, ),
-        /* 190 */ array(16, 38, ),
-        /* 191 */ array(59, 64, ),
-        /* 192 */ array(59, 64, ),
-        /* 193 */ array(14, ),
-        /* 194 */ array(21, ),
-        /* 195 */ array(21, ),
-        /* 196 */ array(21, ),
-        /* 197 */ array(38, ),
-        /* 198 */ array(1, ),
-        /* 199 */ array(2, ),
-        /* 200 */ array(29, ),
-        /* 201 */ array(29, ),
-        /* 202 */ array(1, ),
-        /* 203 */ array(2, ),
-        /* 204 */ array(),
-        /* 205 */ array(),
-        /* 206 */ array(),
-        /* 207 */ array(),
-        /* 208 */ array(),
-        /* 209 */ array(17, 24, 26, 27, 29, 30, 35, 37, 38, 39, 54, 61, 65, 79, ),
-        /* 210 */ array(17, 20, 29, 35, 38, 61, ),
-        /* 211 */ array(38, 59, 61, 65, ),
-        /* 212 */ array(16, 18, 19, 36, ),
-        /* 213 */ array(31, 38, 61, ),
-        /* 214 */ array(38, 61, ),
-        /* 215 */ array(2, 20, ),
-        /* 216 */ array(38, 61, ),
-        /* 217 */ array(24, 37, ),
-        /* 218 */ array(37, 65, ),
-        /* 219 */ array(17, 25, ),
-        /* 220 */ array(37, 39, ),
-        /* 221 */ array(20, 59, ),
-        /* 222 */ array(37, 39, ),
-        /* 223 */ array(37, 39, ),
-        /* 224 */ array(25, 79, ),
-        /* 225 */ array(19, 62, ),
-        /* 226 */ array(63, ),
-        /* 227 */ array(19, ),
-        /* 228 */ array(65, ),
-        /* 229 */ array(19, ),
-        /* 230 */ array(19, ),
-        /* 231 */ array(19, ),
-        /* 232 */ array(25, ),
-        /* 233 */ array(63, ),
-        /* 234 */ array(19, ),
-        /* 235 */ array(59, ),
-        /* 236 */ array(36, ),
-        /* 237 */ array(36, ),
-        /* 238 */ array(39, ),
-        /* 239 */ array(19, ),
-        /* 240 */ array(55, ),
-        /* 241 */ array(2, ),
-        /* 242 */ array(38, ),
-        /* 243 */ array(18, ),
-        /* 244 */ array(18, ),
-        /* 245 */ array(18, ),
-        /* 246 */ array(19, ),
-        /* 247 */ array(18, ),
-        /* 248 */ array(20, ),
-        /* 249 */ array(19, ),
-        /* 250 */ array(19, ),
-        /* 251 */ array(2, ),
-        /* 252 */ array(26, ),
-        /* 253 */ array(38, ),
-        /* 254 */ array(19, ),
-        /* 255 */ array(19, ),
-        /* 256 */ array(18, ),
-        /* 257 */ array(),
-        /* 258 */ array(),
-        /* 259 */ array(),
-        /* 260 */ array(),
-        /* 261 */ array(),
-        /* 262 */ array(),
-        /* 263 */ array(),
-        /* 264 */ array(),
-        /* 265 */ array(),
-        /* 266 */ array(),
-        /* 267 */ array(),
-        /* 268 */ array(),
-        /* 269 */ array(),
-        /* 270 */ array(),
-        /* 271 */ array(),
-        /* 272 */ array(),
-        /* 273 */ array(),
-        /* 274 */ array(),
-        /* 275 */ array(),
-        /* 276 */ array(),
-        /* 277 */ array(),
-        /* 278 */ array(),
-        /* 279 */ array(),
-        /* 280 */ array(),
-        /* 281 */ array(),
-        /* 282 */ array(),
-        /* 283 */ array(),
-        /* 284 */ array(),
-        /* 285 */ array(),
-        /* 286 */ array(),
-        /* 287 */ array(),
-        /* 288 */ array(),
-        /* 289 */ array(),
-        /* 290 */ array(),
-        /* 291 */ array(),
-        /* 292 */ array(),
-        /* 293 */ array(),
-        /* 294 */ array(),
-        /* 295 */ array(),
-        /* 296 */ array(),
-        /* 297 */ array(),
-        /* 298 */ array(),
-        /* 299 */ array(),
-        /* 300 */ array(),
-        /* 301 */ array(),
-        /* 302 */ array(),
-        /* 303 */ array(),
-        /* 304 */ array(),
-        /* 305 */ array(),
-        /* 306 */ array(),
-        /* 307 */ array(),
-        /* 308 */ array(),
-        /* 309 */ array(),
-        /* 310 */ array(),
-        /* 311 */ array(),
-        /* 312 */ array(),
-        /* 313 */ array(),
-        /* 314 */ array(),
-        /* 315 */ array(),
-        /* 316 */ array(),
-        /* 317 */ array(),
-        /* 318 */ array(),
-        /* 319 */ array(),
-        /* 320 */ array(),
-        /* 321 */ array(),
-        /* 322 */ array(),
-        /* 323 */ array(),
-        /* 324 */ array(),
-        /* 325 */ array(),
-        /* 326 */ array(),
-        /* 327 */ array(),
-        /* 328 */ array(),
-        /* 329 */ array(),
-        /* 330 */ array(),
-        /* 331 */ array(),
-        /* 332 */ array(),
-        /* 333 */ array(),
-        /* 334 */ array(),
-        /* 335 */ array(),
-        /* 336 */ array(),
-        /* 337 */ array(),
-        /* 338 */ array(),
-        /* 339 */ array(),
-        /* 340 */ array(),
-        /* 341 */ array(),
-        /* 342 */ array(),
-        /* 343 */ array(),
-        /* 344 */ array(),
-        /* 345 */ array(),
-        /* 346 */ array(),
-        /* 347 */ array(),
-        /* 348 */ array(),
-        /* 349 */ array(),
-        /* 350 */ array(),
-        /* 351 */ array(),
-        /* 352 */ array(),
-        /* 353 */ array(),
-        /* 354 */ array(),
-        /* 355 */ array(),
-        /* 356 */ array(),
-        /* 357 */ array(),
-        /* 358 */ array(),
-        /* 359 */ array(),
-        /* 360 */ array(),
-        /* 361 */ array(),
-        /* 362 */ array(),
-        /* 363 */ array(),
-        /* 364 */ array(),
-        /* 365 */ array(),
-        /* 366 */ array(),
-        /* 367 */ array(),
-        /* 368 */ array(),
-        /* 369 */ array(),
-        /* 370 */ array(),
-        /* 371 */ array(),
-        /* 372 */ array(),
-        /* 373 */ array(),
-        /* 374 */ array(),
-        /* 375 */ array(),
-        /* 376 */ array(),
-        /* 377 */ array(),
-        /* 378 */ array(),
-        /* 379 */ array(),
-        /* 380 */ array(),
-        /* 381 */ array(),
-        /* 382 */ array(),
-        /* 383 */ array(),
-        /* 384 */ array(),
-        /* 385 */ array(),
-        /* 386 */ array(),
-        /* 387 */ array(),
-        /* 388 */ array(),
-        /* 389 */ array(),
-        /* 390 */ array(),
-);
-    static public $yy_default = array(
- /*     0 */   394,  578,  549,  549,  595,  549,  595,  595,  595,  595,
- /*    10 */   595,  595,  595,  595,  595,  595,  595,  595,  595,  595,
- /*    20 */   595,  595,  595,  595,  595,  595,  595,  595,  595,  595,
- /*    30 */   595,  595,  595,  595,  595,  595,  595,  595,  595,  595,
- /*    40 */   595,  595,  595,  595,  595,  595,  595,  595,  595,  595,
- /*    50 */   595,  595,  595,  455,  595,  595,  595,  455,  455,  455,
- /*    60 */   595,  595,  595,  595,  595,  595,  595,  595,  460,  595,
- /*    70 */   595,  466,  465,  484,  547,  579,  581,  548,  580,  489,
- /*    80 */   488,  480,  479,  481,  457,  485,  462,  476,  460,  437,
- /*    90 */   492,  493,  504,  468,  455,  391,  595,  455,  455,  475,
- /*   100 */   512,  455,  455,  595,  455,  455,  595,  561,  595,  595,
- /*   110 */   595,  468,  468,  468,  595,  522,  522,  522,  468,  513,
- /*   120 */   468,  513,  595,  595,  595,  595,  595,  455,  595,  595,
- /*   130 */   595,  595,  595,  595,  455,  513,  595,  595,  595,  595,
- /*   140 */   595,  468,  595,  595,  595,  595,  522,  473,  558,  491,
- /*   150 */   478,  472,  497,  495,  496,  513,  471,  556,  595,  595,
- /*   160 */   523,  595,  595,  595,  595,  595,  595,  595,  595,  595,
- /*   170 */   595,  595,  595,  595,  595,  595,  595,  595,  595,  595,
- /*   180 */   516,  595,  518,  519,  595,  520,  540,  542,  595,  539,
- /*   190 */   522,  517,  541,  410,  562,  559,  536,  522,  475,  551,
- /*   200 */   594,  594,  512,  550,  522,  555,  555,  555,  522,  470,
- /*   210 */   504,  504,  595,  504,  490,  534,  504,  595,  595,  494,
- /*   220 */   595,  500,  595,  595,  494,  595,  595,  595,  595,  595,
- /*   230 */   595,  595,  494,  595,  595,  500,  502,  595,  595,  595,
- /*   240 */   506,  534,  560,  595,  595,  595,  595,  595,  595,  595,
- /*   250 */   595,  534,  463,  534,  595,  595,  595,  401,  543,  400,
- /*   260 */   402,  546,  445,  398,  397,  393,  464,  438,  593,  467,
- /*   270 */   435,  395,  440,  434,  439,  396,  399,  456,  531,  420,
- /*   280 */   529,  392,  528,  506,  527,  535,  444,  557,  545,  544,
- /*   290 */   530,  412,  453,  526,  505,  419,  507,  525,  532,  470,
- /*   300 */   514,  521,  524,  508,  510,  482,  483,  416,  415,  417,
- /*   310 */   418,  477,  511,  515,  538,  469,  509,  534,  533,  432,
- /*   320 */   446,  447,  443,  442,  436,  454,  433,  441,  554,  448,
- /*   330 */   498,  499,  501,  503,  452,  451,  449,  450,  552,  553,
- /*   340 */   486,  487,  589,  430,  582,  583,  584,  431,  429,  426,
- /*   350 */   537,  427,  428,  406,  587,  575,  404,  577,  576,  405,
- /*   360 */   585,  586,  588,  591,  592,  425,  424,  569,  568,  570,
- /*   370 */   571,  572,  567,  566,  414,  563,  564,  565,  573,  574,
- /*   380 */   422,  590,  407,  423,  421,  408,  474,  413,  411,  409,
- /*   390 */   403,
-);
-    const YYNOCODE = 124;
-    const YYSTACKDEPTH = 100;
-    const YYNSTATE = 391;
-    const YYNRULE = 204;
-    const YYERRORSYMBOL = 81;
+    const TP_VERT = 1;
+
+    const TP_COLON = 2;
+
+    const TP_PHP = 3;
+
+    const TP_NOCACHE = 4;
+
+    const TP_TEXT = 5;
+
+    const TP_STRIPON = 6;
+
+    const TP_STRIPOFF = 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 = 535;
+
+    const YY_ACCEPT_ACTION = 534;
+
+    const YY_ERROR_ACTION = 533;
+
+    const YY_SZ_ACTTAB = 2082;
+
+    static public $yy_action = array(278, 8, 134, 451, 281, 68, 207, 7, 85, 248, 29, 98, 168, 114, 252, 451, 367, 230,
+                                     315, 245, 235, 249, 233, 36, 28, 145, 38, 42, 140, 36, 27, 39, 41, 322, 222, 300,
+                                     27, 213, 195, 82, 1, 31, 265, 92, 164, 181, 53, 278, 8, 133, 97, 281, 201, 249, 7,
+                                     85, 35, 307, 35, 307, 114, 226, 227, 215, 230, 108, 245, 235, 265, 208, 195, 28,
+                                     195, 5, 42, 184, 268, 277, 39, 41, 322, 222, 218, 258, 213, 120, 82, 1, 333, 265,
+                                     181, 175, 3, 53, 278, 8, 135, 105, 281, 206, 249, 7, 85, 35, 307, 207, 24, 114, 16,
+                                     103, 305, 230, 17, 245, 235, 404, 233, 195, 28, 288, 15, 42, 96, 265, 20, 39, 41,
+                                     322, 222, 300, 404, 213, 450, 82, 1, 6, 265, 404, 52, 113, 53, 278, 8, 135, 450,
+                                     281, 206, 289, 7, 85, 261, 463, 228, 244, 114, 122, 296, 463, 230, 102, 245, 235,
+                                     236, 198, 182, 28, 262, 122, 42, 143, 274, 102, 39, 41, 322, 222, 300, 33, 213,
+                                     314, 82, 1, 274, 265, 207, 86, 311, 53, 278, 8, 136, 195, 281, 206, 362, 7, 85,
+                                     283, 285, 287, 229, 114, 33, 228, 309, 230, 326, 245, 235, 36, 233, 291, 28, 479,
+                                     479, 42, 27, 147, 479, 39, 41, 322, 222, 300, 159, 213, 249, 82, 1, 193, 265, 94,
+                                     169, 249, 53, 278, 8, 135, 251, 281, 197, 249, 7, 85, 248, 29, 91, 150, 114, 252,
+                                     193, 479, 230, 207, 245, 235, 249, 233, 195, 28, 288, 191, 42, 407, 450, 207, 39,
+                                     41, 322, 222, 300, 179, 213, 195, 82, 1, 450, 265, 407, 52, 249, 53, 278, 8, 135,
+                                     407, 281, 204, 195, 7, 85, 313, 251, 93, 155, 114, 226, 225, 12, 230, 108, 245,
+                                     235, 249, 233, 247, 28, 479, 479, 42, 282, 189, 479, 39, 41, 322, 222, 300, 161,
+                                     213, 195, 82, 1, 25, 265, 103, 177, 249, 53, 278, 8, 132, 142, 281, 206, 249, 7,
+                                     85, 195, 244, 34, 249, 114, 103, 193, 103, 230, 251, 245, 235, 207, 233, 289, 4,
+                                     237, 113, 42, 228, 146, 138, 39, 41, 322, 222, 300, 10, 213, 249, 82, 1, 148, 265,
+                                     251, 113, 99, 53, 278, 8, 137, 251, 281, 206, 288, 7, 85, 294, 103, 186, 246, 114,
+                                     237, 335, 33, 230, 319, 245, 235, 329, 233, 255, 23, 52, 331, 42, 188, 246, 264,
+                                     39, 41, 322, 222, 300, 167, 213, 138, 82, 1, 34, 265, 288, 10, 249, 53, 278, 8,
+                                     135, 153, 281, 199, 207, 7, 85, 234, 226, 250, 249, 114, 108, 193, 190, 230, 308,
+                                     245, 235, 337, 209, 232, 28, 128, 160, 42, 128, 193, 207, 39, 41, 322, 222, 300,
+                                     11, 213, 463, 82, 1, 158, 265, 27, 463, 108, 53, 278, 8, 137, 176, 281, 206, 180,
+                                     7, 85, 220, 14, 276, 249, 114, 269, 207, 172, 230, 251, 245, 235, 106, 233, 286,
+                                     23, 407, 115, 42, 259, 193, 141, 39, 41, 322, 222, 300, 267, 213, 312, 82, 407,
+                                     144, 265, 207, 207, 38, 53, 407, 187, 246, 272, 273, 271, 270, 266, 184, 318, 207,
+                                     13, 278, 8, 22, 242, 281, 2, 173, 7, 85, 36, 84, 265, 19, 114, 6, 156, 27, 230,
+                                     137, 245, 235, 223, 217, 304, 249, 237, 248, 29, 228, 214, 163, 252, 119, 66, 112,
+                                     40, 43, 37, 102, 249, 126, 298, 260, 265, 192, 212, 297, 301, 284, 274, 295, 170,
+                                     324, 257, 256, 82, 304, 185, 265, 211, 302, 228, 214, 336, 221, 123, 73, 112, 166,
+                                     334, 183, 102, 248, 29, 298, 260, 253, 252, 212, 297, 301, 275, 274, 279, 195, 304,
+                                     36, 294, 165, 205, 228, 214, 171, 27, 123, 58, 109, 225, 117, 251, 102, 139, 149,
+                                     298, 260, 89, 151, 212, 297, 301, 304, 274, 301, 181, 157, 228, 214, 248, 29, 123,
+                                     73, 112, 252, 249, 87, 102, 35, 307, 298, 260, 88, 36, 212, 297, 301, 174, 274, 90,
+                                     27, 304, 195, 95, 301, 216, 228, 214, 301, 301, 123, 46, 109, 110, 301, 301, 102,
+                                     301, 207, 298, 260, 450, 405, 212, 297, 301, 231, 274, 401, 301, 304, 238, 301,
+                                     450, 301, 228, 214, 405, 327, 119, 66, 112, 301, 36, 405, 102, 301, 450, 298, 260,
+                                     27, 301, 212, 297, 301, 304, 274, 301, 301, 450, 228, 214, 301, 301, 123, 73, 112,
+                                     303, 301, 301, 102, 301, 301, 298, 260, 301, 301, 212, 297, 301, 137, 274, 301,
+                                     254, 304, 301, 301, 301, 210, 228, 214, 248, 29, 123, 75, 112, 252, 301, 301, 102,
+                                     301, 301, 298, 260, 301, 301, 212, 297, 301, 301, 274, 301, 301, 304, 301, 243,
+                                     301, 82, 228, 214, 265, 301, 123, 60, 112, 301, 301, 301, 102, 241, 301, 298, 260,
+                                     301, 301, 212, 297, 301, 304, 274, 301, 301, 301, 228, 214, 301, 301, 104, 71, 112,
+                                     301, 301, 301, 102, 301, 301, 298, 260, 301, 301, 212, 297, 301, 301, 274, 301,
+                                     301, 304, 301, 301, 301, 301, 228, 81, 301, 301, 83, 47, 107, 301, 301, 301, 102,
+                                     301, 301, 298, 260, 301, 301, 212, 297, 301, 301, 274, 301, 301, 304, 301, 301,
+                                     301, 301, 228, 214, 301, 301, 123, 76, 112, 301, 301, 301, 102, 301, 301, 298, 260,
+                                     301, 301, 212, 297, 301, 304, 274, 301, 301, 301, 228, 214, 301, 301, 123, 67, 112,
+                                     301, 301, 301, 102, 301, 301, 298, 260, 301, 301, 212, 297, 301, 301, 274, 301,
+                                     301, 304, 301, 301, 301, 301, 228, 214, 301, 301, 123, 64, 112, 301, 301, 301, 102,
+                                     301, 301, 298, 260, 301, 310, 212, 297, 301, 301, 274, 301, 278, 9, 299, 301, 281,
+                                     301, 301, 7, 85, 301, 301, 301, 301, 114, 310, 301, 301, 230, 301, 245, 235, 278,
+                                     9, 299, 301, 281, 301, 301, 7, 85, 301, 301, 301, 301, 114, 301, 301, 301, 230,
+                                     301, 245, 235, 301, 301, 181, 154, 316, 21, 301, 181, 152, 301, 301, 301, 249, 304,
+                                     301, 35, 307, 249, 228, 203, 35, 307, 123, 61, 112, 325, 21, 301, 102, 195, 301,
+                                     298, 260, 301, 195, 212, 297, 301, 301, 274, 304, 301, 301, 181, 162, 228, 214,
+                                     301, 301, 123, 62, 112, 301, 249, 301, 102, 35, 307, 298, 260, 301, 301, 212, 297,
+                                     301, 301, 274, 301, 301, 304, 195, 207, 301, 301, 228, 214, 301, 301, 123, 65, 112,
+                                     196, 301, 301, 102, 301, 301, 298, 260, 301, 301, 212, 297, 301, 301, 274, 304,
+                                     301, 301, 301, 301, 228, 214, 301, 301, 123, 48, 112, 40, 43, 37, 102, 301, 301,
+                                     298, 260, 301, 301, 212, 297, 301, 301, 274, 304, 301, 324, 257, 256, 228, 214,
+                                     301, 301, 123, 63, 112, 301, 301, 301, 102, 18, 200, 298, 260, 292, 301, 212, 297,
+                                     301, 301, 274, 301, 301, 304, 301, 207, 301, 301, 228, 202, 301, 293, 116, 59, 112,
+                                     320, 301, 301, 102, 301, 301, 298, 260, 301, 301, 212, 297, 301, 301, 274, 304,
+                                     265, 301, 301, 301, 228, 79, 301, 301, 83, 45, 107, 40, 43, 37, 102, 301, 301, 298,
+                                     260, 301, 301, 212, 297, 301, 301, 274, 304, 301, 324, 257, 256, 228, 214, 301,
+                                     301, 123, 58, 112, 301, 301, 301, 102, 301, 301, 298, 260, 301, 301, 212, 297, 301,
+                                     301, 274, 301, 301, 304, 301, 207, 301, 301, 228, 214, 301, 301, 123, 72, 112, 40,
+                                     43, 37, 102, 301, 301, 298, 260, 301, 301, 212, 297, 301, 301, 274, 304, 178, 324,
+                                     257, 256, 228, 214, 301, 301, 123, 55, 112, 40, 43, 37, 102, 301, 301, 298, 260,
+                                     301, 301, 212, 297, 301, 301, 274, 304, 301, 324, 257, 256, 228, 214, 301, 301,
+                                     123, 54, 112, 301, 301, 301, 102, 301, 301, 298, 260, 301, 301, 212, 297, 301, 301,
+                                     274, 301, 301, 304, 301, 207, 301, 301, 228, 214, 301, 301, 101, 77, 112, 280, 301,
+                                     301, 102, 301, 301, 298, 260, 301, 301, 212, 297, 301, 301, 274, 304, 301, 301,
+                                     301, 301, 228, 214, 301, 301, 123, 80, 112, 40, 43, 37, 102, 301, 301, 298, 260,
+                                     301, 301, 212, 297, 301, 301, 274, 304, 301, 324, 257, 256, 228, 214, 301, 301,
+                                     123, 56, 112, 301, 301, 301, 102, 301, 301, 298, 260, 301, 301, 212, 297, 301, 301,
+                                     274, 301, 301, 304, 301, 207, 301, 301, 228, 214, 301, 301, 123, 70, 112, 194, 301,
+                                     301, 102, 301, 301, 298, 260, 301, 301, 212, 297, 301, 301, 274, 304, 301, 301,
+                                     301, 301, 228, 214, 301, 301, 123, 74, 112, 40, 43, 37, 102, 301, 301, 298, 260,
+                                     301, 301, 212, 297, 301, 301, 274, 304, 301, 324, 257, 256, 228, 214, 301, 301,
+                                     123, 49, 112, 301, 301, 301, 102, 301, 301, 298, 260, 301, 301, 212, 297, 301, 301,
+                                     274, 301, 301, 304, 301, 207, 301, 301, 228, 214, 301, 301, 100, 57, 112, 301, 301,
+                                     301, 102, 301, 301, 298, 260, 301, 301, 212, 297, 301, 301, 274, 304, 301, 301,
+                                     301, 301, 228, 214, 301, 301, 123, 44, 112, 40, 43, 37, 102, 301, 301, 298, 260,
+                                     301, 301, 212, 297, 301, 301, 274, 304, 301, 324, 257, 256, 228, 214, 301, 301,
+                                     123, 69, 112, 301, 301, 301, 102, 301, 301, 298, 260, 301, 301, 212, 297, 301, 301,
+                                     274, 301, 301, 304, 301, 301, 301, 301, 228, 214, 301, 301, 118, 50, 112, 301, 301,
+                                     301, 102, 301, 301, 298, 260, 301, 301, 212, 297, 301, 301, 274, 304, 301, 301,
+                                     301, 301, 228, 214, 301, 301, 123, 78, 112, 301, 301, 301, 102, 301, 301, 298, 260,
+                                     207, 301, 212, 297, 301, 301, 274, 304, 301, 301, 359, 301, 228, 224, 301, 301,
+                                     121, 301, 112, 301, 301, 288, 102, 301, 301, 36, 306, 301, 301, 212, 297, 301, 27,
+                                     274, 301, 301, 304, 301, 301, 301, 52, 228, 224, 301, 301, 131, 301, 112, 301, 301,
+                                     301, 102, 301, 301, 219, 321, 301, 301, 212, 297, 301, 301, 274, 219, 479, 479,
+                                     301, 301, 301, 479, 463, 301, 301, 479, 479, 301, 30, 301, 479, 463, 417, 417, 301,
+                                     301, 301, 301, 479, 479, 301, 207, 301, 479, 463, 301, 301, 301, 301, 301, 463,
+                                     328, 463, 301, 479, 301, 463, 332, 207, 463, 301, 463, 288, 479, 301, 463, 36, 450,
+                                     290, 417, 417, 417, 463, 27, 463, 301, 479, 301, 463, 450, 301, 52, 301, 36, 301,
+                                     301, 417, 417, 417, 301, 27, 301, 301, 304, 301, 40, 43, 37, 228, 224, 301, 301,
+                                     127, 301, 112, 301, 301, 301, 102, 301, 301, 301, 324, 257, 256, 212, 297, 301,
+                                     301, 274, 301, 301, 304, 301, 301, 219, 301, 228, 224, 301, 301, 125, 301, 112,
+                                     301, 479, 479, 102, 15, 301, 479, 463, 301, 301, 212, 297, 301, 301, 274, 534, 51,
+                                     263, 285, 287, 229, 304, 301, 228, 301, 301, 228, 224, 207, 301, 124, 301, 112,
+                                     301, 301, 463, 102, 463, 207, 479, 301, 463, 301, 212, 297, 301, 304, 274, 207,
+                                     301, 301, 228, 224, 36, 301, 130, 301, 112, 301, 301, 27, 102, 301, 301, 301, 40,
+                                     43, 37, 212, 297, 301, 32, 274, 36, 239, 40, 43, 37, 301, 301, 27, 301, 324, 257,
+                                     256, 40, 43, 37, 301, 301, 301, 301, 324, 257, 256, 301, 301, 301, 301, 301, 304,
+                                     301, 324, 257, 256, 228, 224, 301, 301, 129, 301, 112, 301, 301, 301, 102, 301,
+                                     301, 26, 301, 301, 219, 212, 297, 301, 301, 274, 301, 479, 479, 301, 479, 479, 479,
+                                     463, 207, 479, 463, 301, 301, 301, 301, 301, 301, 301, 301, 301, 301, 301, 301,
+                                     301, 301, 301, 301, 301, 301, 301, 301, 301, 301, 301, 301, 463, 301, 463, 463,
+                                     479, 463, 463, 479, 207, 463, 40, 43, 37, 301, 301, 301, 301, 301, 301, 301, 301,
+                                     301, 301, 301, 301, 301, 301, 324, 257, 256, 301, 330, 301, 301, 301, 301, 301,
+                                     301, 301, 301, 301, 301, 301, 411, 301, 40, 43, 37, 207, 301, 301, 301, 301, 411,
+                                     301, 411, 301, 207, 411, 301, 317, 301, 324, 257, 256, 411, 301, 411, 301, 411,
+                                     301, 301, 301, 301, 301, 301, 301, 111, 237, 301, 301, 301, 301, 301, 323, 40, 43,
+                                     37, 301, 207, 301, 301, 301, 301, 40, 43, 37, 301, 301, 373, 301, 301, 324, 257,
+                                     256, 301, 240, 301, 301, 301, 301, 324, 257, 256, 36, 301, 301, 301, 301, 301, 301,
+                                     27, 301, 301, 450, 301, 301, 301, 301, 301, 301, 301, 301, 301, 301, 301, 450,);
+
+    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, 2, 39, 14, 26, 33, 43, 44, 45, 46, 47, 33, 49, 98, 51,
+                                        52, 23, 54, 71, 72, 71, 58, 12, 13, 14, 36, 16, 17, 81, 19, 20, 84, 85, 84, 85,
+                                        25, 75, 76, 77, 29, 79, 31, 32, 54, 34, 98, 36, 98, 36, 39, 8, 9, 10, 43, 44,
+                                        45, 46, 47, 14, 49, 48, 51, 52, 53, 54, 71, 72, 35, 58, 12, 13, 14, 67, 16, 17,
+                                        81, 19, 20, 84, 85, 1, 15, 25, 21, 18, 53, 29, 13, 31, 32, 11, 34, 98, 36, 22,
+                                        15, 39, 35, 54, 28, 43, 44, 45, 46, 47, 26, 49, 36, 51, 52, 36, 54, 33, 41, 48,
+                                        58, 12, 13, 14, 48, 16, 17, 64, 19, 20, 70, 46, 69, 99, 25, 75, 59, 52, 29, 79,
+                                        31, 32, 70, 34, 71, 36, 86, 75, 39, 51, 90, 79, 43, 44, 45, 46, 47, 35, 49, 37,
+                                        51, 52, 90, 54, 1, 102, 103, 58, 12, 13, 14, 98, 16, 17, 11, 19, 20, 63, 64, 65,
+                                        66, 25, 35, 69, 37, 29, 34, 31, 32, 26, 34, 17, 36, 12, 13, 39, 33, 72, 17, 43,
+                                        44, 45, 46, 47, 72, 49, 81, 51, 52, 98, 54, 71, 72, 81, 58, 12, 13, 14, 93, 16,
+                                        17, 81, 19, 20, 12, 13, 71, 72, 25, 17, 98, 50, 29, 1, 31, 32, 81, 34, 98, 36,
+                                        22, 71, 39, 11, 36, 1, 43, 44, 45, 46, 47, 72, 49, 98, 51, 52, 48, 54, 26, 41,
+                                        81, 58, 12, 13, 14, 33, 16, 17, 98, 19, 20, 53, 93, 71, 72, 25, 75, 76, 15, 29,
+                                        79, 31, 32, 81, 34, 22, 36, 12, 13, 39, 11, 71, 17, 43, 44, 45, 46, 47, 72, 49,
+                                        98, 51, 52, 15, 54, 18, 72, 81, 58, 12, 13, 14, 72, 16, 17, 81, 19, 20, 98, 99,
+                                        15, 81, 25, 18, 98, 18, 29, 93, 31, 32, 1, 34, 64, 36, 46, 48, 39, 69, 72, 46,
+                                        43, 44, 45, 46, 47, 52, 49, 81, 51, 52, 91, 54, 93, 48, 80, 58, 12, 13, 14, 93,
+                                        16, 17, 22, 19, 20, 92, 18, 94, 95, 25, 46, 103, 35, 29, 37, 31, 32, 53, 34, 17,
+                                        36, 41, 53, 39, 94, 95, 95, 43, 44, 45, 46, 47, 72, 49, 46, 51, 52, 15, 54, 22,
+                                        52, 81, 58, 12, 13, 14, 72, 16, 17, 1, 19, 20, 50, 75, 76, 81, 25, 79, 98, 80,
+                                        29, 89, 31, 32, 89, 34, 18, 36, 96, 51, 39, 96, 98, 1, 43, 44, 45, 46, 47, 26,
+                                        49, 46, 51, 52, 75, 54, 33, 52, 79, 58, 12, 13, 14, 72, 16, 17, 14, 19, 20, 17,
+                                        28, 65, 81, 25, 68, 1, 91, 29, 93, 31, 32, 79, 34, 37, 36, 11, 17, 39, 17, 98,
+                                        14, 43, 44, 45, 46, 47, 9, 49, 96, 51, 26, 27, 54, 1, 1, 2, 58, 33, 94, 95, 3,
+                                        4, 5, 6, 7, 8, 34, 1, 2, 12, 13, 13, 14, 16, 36, 17, 19, 20, 26, 17, 54, 42, 25,
+                                        36, 72, 33, 29, 14, 31, 32, 17, 17, 64, 81, 46, 12, 13, 69, 70, 72, 17, 73, 74,
+                                        75, 38, 39, 40, 79, 81, 17, 82, 83, 54, 17, 86, 87, 88, 17, 90, 17, 91, 55, 56,
+                                        57, 51, 64, 71, 54, 100, 101, 69, 70, 53, 50, 73, 74, 75, 91, 53, 80, 79, 12,
+                                        13, 82, 83, 17, 17, 86, 87, 88, 5, 90, 81, 98, 64, 26, 92, 28, 97, 69, 70, 91,
+                                        33, 73, 74, 75, 76, 78, 93, 79, 79, 91, 82, 83, 79, 91, 86, 87, 88, 64, 90, 104,
+                                        71, 72, 69, 70, 12, 13, 73, 74, 75, 17, 81, 79, 79, 84, 85, 82, 83, 79, 26, 86,
+                                        87, 88, 91, 90, 79, 33, 64, 98, 91, 104, 97, 69, 70, 104, 104, 73, 74, 75, 76,
+                                        104, 104, 79, 104, 1, 82, 83, 36, 11, 86, 87, 88, 15, 90, 11, 104, 64, 46, 104,
+                                        48, 104, 69, 70, 26, 53, 73, 74, 75, 104, 26, 33, 79, 104, 36, 82, 83, 33, 104,
+                                        86, 87, 88, 64, 90, 104, 104, 48, 69, 70, 104, 104, 73, 74, 75, 101, 104, 104,
+                                        79, 104, 104, 82, 83, 104, 104, 86, 87, 88, 14, 90, 104, 17, 64, 104, 104, 104,
+                                        97, 69, 70, 12, 13, 73, 74, 75, 17, 104, 104, 79, 104, 104, 82, 83, 104, 104,
+                                        86, 87, 88, 104, 90, 104, 104, 64, 104, 49, 104, 51, 69, 70, 54, 104, 73, 74,
+                                        75, 104, 104, 104, 79, 50, 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, 5, 86, 87, 88, 104, 90, 104, 12, 13, 14, 104,
+                                        16, 104, 104, 19, 20, 104, 104, 104, 104, 25, 5, 104, 104, 29, 104, 31, 32, 12,
+                                        13, 14, 104, 16, 104, 104, 19, 20, 104, 104, 104, 104, 25, 104, 104, 104, 29,
+                                        104, 31, 32, 104, 104, 71, 72, 58, 59, 104, 71, 72, 104, 104, 104, 81, 64, 104,
+                                        84, 85, 81, 69, 70, 84, 85, 73, 74, 75, 58, 59, 104, 79, 98, 104, 82, 83, 104,
+                                        98, 86, 87, 88, 104, 90, 64, 104, 104, 71, 72, 69, 70, 104, 104, 73, 74, 75,
+                                        104, 81, 104, 79, 84, 85, 82, 83, 104, 104, 86, 87, 88, 104, 90, 104, 104, 64,
+                                        98, 1, 104, 104, 69, 70, 104, 104, 73, 74, 75, 11, 104, 104, 79, 104, 104, 82,
+                                        83, 104, 104, 86, 87, 88, 104, 90, 64, 104, 104, 104, 104, 69, 70, 104, 104, 73,
+                                        74, 75, 38, 39, 40, 79, 104, 104, 82, 83, 104, 104, 86, 87, 88, 104, 90, 64,
+                                        104, 55, 56, 57, 69, 70, 104, 104, 73, 74, 75, 104, 104, 104, 79, 13, 14, 82,
+                                        83, 17, 104, 86, 87, 88, 104, 90, 104, 104, 64, 104, 1, 104, 104, 69, 70, 104,
+                                        34, 73, 74, 75, 11, 104, 104, 79, 104, 104, 82, 83, 104, 104, 86, 87, 88, 104,
+                                        90, 64, 54, 104, 104, 104, 69, 70, 104, 104, 73, 74, 75, 38, 39, 40, 79, 104,
+                                        104, 82, 83, 104, 104, 86, 87, 88, 104, 90, 64, 104, 55, 56, 57, 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, 1, 104, 104, 69, 70, 104, 104, 73, 74, 75, 38, 39, 40,
+                                        79, 104, 104, 82, 83, 104, 104, 86, 87, 88, 104, 90, 64, 27, 55, 56, 57, 69, 70,
+                                        104, 104, 73, 74, 75, 38, 39, 40, 79, 104, 104, 82, 83, 104, 104, 86, 87, 88,
+                                        104, 90, 64, 104, 55, 56, 57, 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, 1, 104, 104,
+                                        69, 70, 104, 104, 73, 74, 75, 11, 104, 104, 79, 104, 104, 82, 83, 104, 104, 86,
+                                        87, 88, 104, 90, 64, 104, 104, 104, 104, 69, 70, 104, 104, 73, 74, 75, 38, 39,
+                                        40, 79, 104, 104, 82, 83, 104, 104, 86, 87, 88, 104, 90, 64, 104, 55, 56, 57,
+                                        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, 1, 104, 104, 69, 70, 104, 104, 73, 74, 75,
+                                        11, 104, 104, 79, 104, 104, 82, 83, 104, 104, 86, 87, 88, 104, 90, 64, 104, 104,
+                                        104, 104, 69, 70, 104, 104, 73, 74, 75, 38, 39, 40, 79, 104, 104, 82, 83, 104,
+                                        104, 86, 87, 88, 104, 90, 64, 104, 55, 56, 57, 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, 1, 104, 104, 69, 70, 104, 104, 73, 74, 75, 104, 104, 104, 79, 104, 104,
+                                        82, 83, 104, 104, 86, 87, 88, 104, 90, 64, 104, 104, 104, 104, 69, 70, 104, 104,
+                                        73, 74, 75, 38, 39, 40, 79, 104, 104, 82, 83, 104, 104, 86, 87, 88, 104, 90, 64,
+                                        104, 55, 56, 57, 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, 64, 104, 104, 104, 104, 69, 70, 104, 104, 73, 74, 75, 104, 104, 104,
+                                        79, 104, 104, 82, 83, 1, 104, 86, 87, 88, 104, 90, 64, 104, 104, 11, 104, 69,
+                                        70, 104, 104, 73, 104, 75, 104, 104, 22, 79, 104, 104, 26, 83, 104, 104, 86, 87,
+                                        88, 33, 90, 104, 104, 64, 104, 104, 104, 41, 69, 70, 104, 104, 73, 104, 75, 104,
+                                        104, 104, 79, 104, 104, 2, 83, 104, 104, 86, 87, 88, 104, 90, 2, 12, 13, 104,
+                                        104, 104, 17, 18, 104, 104, 12, 13, 104, 15, 104, 17, 18, 1, 2, 104, 104, 104,
+                                        104, 12, 13, 104, 1, 104, 17, 18, 104, 104, 104, 104, 104, 46, 11, 48, 104, 50,
+                                        104, 52, 53, 1, 46, 104, 48, 22, 50, 104, 52, 26, 36, 11, 38, 39, 40, 46, 33,
+                                        48, 104, 50, 104, 52, 48, 104, 41, 104, 26, 104, 104, 55, 56, 57, 104, 33, 104,
+                                        104, 64, 104, 38, 39, 40, 69, 70, 104, 104, 73, 104, 75, 104, 104, 104, 79, 104,
+                                        104, 104, 55, 56, 57, 86, 87, 88, 104, 90, 104, 104, 64, 104, 104, 2, 104, 69,
+                                        70, 104, 104, 73, 104, 75, 104, 12, 13, 79, 15, 104, 17, 18, 104, 104, 86, 87,
+                                        88, 104, 90, 61, 62, 63, 64, 65, 66, 64, 104, 69, 104, 104, 69, 70, 1, 104, 73,
+                                        104, 75, 104, 104, 46, 79, 48, 1, 50, 104, 52, 104, 86, 87, 88, 64, 90, 1, 104,
+                                        104, 69, 70, 26, 104, 73, 104, 75, 104, 104, 33, 79, 104, 104, 104, 38, 39, 40,
+                                        86, 87, 88, 24, 90, 26, 37, 38, 39, 40, 104, 104, 33, 104, 55, 56, 57, 38, 39,
+                                        40, 104, 104, 104, 104, 55, 56, 57, 104, 104, 104, 104, 104, 64, 104, 55, 56,
+                                        57, 69, 70, 104, 104, 73, 104, 75, 104, 104, 104, 79, 104, 104, 2, 104, 104, 2,
+                                        86, 87, 88, 104, 90, 104, 12, 13, 104, 12, 13, 17, 18, 1, 17, 18, 104, 104, 104,
+                                        104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104,
+                                        104, 104, 104, 104, 104, 46, 104, 48, 46, 50, 48, 52, 50, 1, 52, 38, 39, 40,
+                                        104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 55, 56,
+                                        57, 104, 59, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 11, 104, 38,
+                                        39, 40, 1, 104, 104, 104, 104, 21, 104, 23, 104, 1, 26, 104, 53, 104, 55, 56,
+                                        57, 33, 104, 35, 104, 37, 104, 104, 104, 104, 104, 104, 104, 21, 46, 104, 104,
+                                        104, 104, 104, 37, 38, 39, 40, 104, 1, 104, 104, 104, 104, 38, 39, 40, 104, 104,
+                                        11, 104, 104, 55, 56, 57, 104, 18, 104, 104, 104, 104, 55, 56, 57, 26, 104, 104,
+                                        104, 104, 104, 104, 33, 104, 104, 36, 104, 104, 104, 104, 104, 104, 104, 104,
+                                        104, 104, 104, 48,);
+
+    const YY_SHIFT_USE_DFLT = - 34;
+
+    const YY_SHIFT_MAX = 242;
+
+    static public $yy_shift_ofst = array(517, 270, 82, 270, 317, 82, 82, 317, - 12, - 12, 35, 411, 82, 82, 82, 129, 82,
+                                         82, 82, 176, 82, 82, 82, 82, 82, 82, 223, 82, 82, 82, 82, 82, 82, 82, 82, 82,
+                                         411, 364, 364, 458, 458, 458, 458, 458, 1830, 1706, 1810, 1810, 1810, 1810,
+                                         1810, 517, 733, 933, 2001, 1306, 1389, 1223, 1820, 1952, 526, 1917, 1992, 1140,
+                                         1057, 1472, 1472, 1472, 2033, 1472, 1472, 1472, 1472, 1472, 1472, 1472, 1472,
+                                         1472, 1196, 1689, 1196, 1600, 533, 183, 512, 14, 954, - 3, 589, 634, 634, 684,
+                                         684, 512, 512, 368, 14, 14, 512, 513, 484, 104, 746, 518, 252, 67, 232, 91,
+                                         232, 325, 3, 486, 307, 462, 433, 428, 349, 3, 5, 452, 462, 264, 327, 264, 264,
+                                         264, 264, 264, 327, 264, 264, - 34, 1772, 1653, 1662, 1902, 1899, 1675, 1113,
+                                         543, 105, 295, 3, 415, 69, 69, 3, 3, 313, 313, 3, 313, 3, 3, 3, 3, 3, 3, 283,
+                                         3, 415, 3, 3, 3, 3, 69, 313, 3, 3, 3, 313, 313, 313, 99, 313, 3, 3, 3, 69, 3,
+                                         498, 264, 264, 24, 497, 264, 327, 327, 327, 264, 24, 264, - 34, - 34, - 34,
+                                         - 34, - 34, 1680, 1977, 678, 201, 652, 238, 97, 96, 357, 228, 382, 344, 308,
+                                         142, 57, 37, - 33, 360, 87, 167, 539, 545, 562, 507, 194, 172, 118, 397, 456,
+                                         402, 18, 299, 605, 556, 588, 552, 508, 481, 479, 398, 492, 534, 499, 522, 560,
+                                         498,);
+
+    const YY_REDUCE_USE_DFLT = - 61;
+
+    const YY_REDUCE_MAX = 196;
+
+    static public $yy_reduce_ofst = array(1737, 488, 575, 633, 550, 658, 521, 604, 770, 1102, 1075, 1407, 1461, 1517,
+                                          1351, 1158, 1212, 1295, 1046, 716, 992, 936, 853, 963, 1019, 687, 1268, 1241,
+                                          1129, 1185, 1490, 1434, 1378, 1324, 799, 824, 741, 1544, 1573, 1819, 1678,
+                                          1740, 1707, 1765, 923, - 28, 571, - 28, 19, 918, 959, 134, 80, 83, - 26, - 26,
+                                          - 26, - 26, - 26, - 26, - 26, - 26, - 26, - 26, - 26, - 26, - 26, - 26, 160,
+                                          - 26, - 26, - 26, - 26, - 26, - 26, - 26, - 26, - 26, - 26, 222, - 26, 222,
+                                          92, 175, - 60, - 14, 288, 145, 199, 286, 254, 152, 246, 354, 401, 293, 358,
+                                          221, 340, 240, 190, 190, 279, 412, 190, 416, 395, 310, 279, 310, 472, 389,
+                                          310, 352, 260, 93, 190, 487, 190, 190, 355, 190, 310, 190, 190, 190, 515, 190,
+                                          424, 190, 190, 190, 530, 530, 530, 530, 530, 530, 551, 535, 530, 530, 531,
+                                          540, 574, 555, 531, 531, 524, 524, 531, 524, 531, 531, 531, 531, 531, 531,
+                                          549, 531, 544, 531, 531, 531, 531, 587, 524, 531, 531, 531, 524, 524, 524,
+                                          573, 524, 531, 531, 531, 580, 531, 579, 131, 131, 54, 30, 131, 311, 311, 311,
+                                          131, 54, 131, 294, 519, 489, 359, 506,);
+
+    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, 24, 26, 33, 38, 39, 40, 55, 56, 57,),
+                                            array(1, 11, 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(14, 17, 49, 51, 54,),
+                                            array(5, 12, 13, 14, 16, 19, 20, 25, 29, 31, 32, 58, 59,),
+                                            array(1, 21, 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, 27, 38, 39, 40, 55, 56, 57,),
+                                            array(1, 37, 38, 39, 40, 55, 56, 57,),
+                                            array(1, 38, 39, 40, 53, 55, 56, 57,), array(1, 2, 38, 39, 40, 55, 56, 57,),
+                                            array(1, 38, 39, 40, 55, 56, 57, 59,),
+                                            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, 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(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(5, 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(1, 26, 33,), array(18, 46, 52,), array(14, 36, 54,),
+                                            array(14, 36, 54,), array(1, 26, 33,), array(1, 2,),
+                                            array(1, 11, 26, 27, 33,), array(1, 11, 26, 33,), array(12, 13, 17, 50,),
+                                            array(13, 14, 17, 54,), array(1, 11, 26, 33,), array(8, 9, 10,),
+                                            array(12, 13, 17,), array(15, 18, 48,), array(12, 13, 17,),
+                                            array(15, 18, 48,), array(26, 33,), array(14, 54,), array(18, 48,),
+                                            array(14, 17,), array(26, 33,), array(1, 18,), array(1, 53,),
+                                            array(26, 33,), array(1, 11,), array(1, 28,), array(14, 17,), array(1,),
+                                            array(18,), array(1,), array(1,), array(1,), array(1,), array(1,),
+                                            array(18,), 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(46, 52,), array(14, 54,), array(14, 54,),
+                                            array(26, 33,), array(26, 33,), array(46, 52,), array(46, 52,),
+                                            array(26, 33,), array(46, 52,), array(26, 33,), array(26, 33,),
+                                            array(26, 33,), array(26, 33,), array(26, 33,), array(26, 33,),
+                                            array(15, 22,), array(26, 33,), array(46, 52,), array(26, 33,),
+                                            array(26, 33,), array(26, 33,), array(26, 33,), array(14, 54,),
+                                            array(46, 52,), array(26, 33,), array(26, 33,), array(26, 33,),
+                                            array(46, 52,), array(46, 52,), array(46, 52,), array(13, 36,),
+                                            array(46, 52,), array(26, 33,), array(26, 33,), array(26, 33,),
+                                            array(14, 54,), array(26, 33,), array(36,), array(1,), array(1,), array(2,),
+                                            array(9,), array(1,), array(18,), array(18,), array(18,), array(1,),
+                                            array(2,), 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(12, 13, 17, 50,), array(36, 46, 48, 53,), array(22, 41, 53,),
+                                            array(22, 41, 59,), array(28, 36, 48,), array(35, 37,), array(36, 48,),
+                                            array(17, 50,), array(46, 53,), array(15, 46,), array(35, 37,),
+                                            array(35, 53,), array(36, 48,), array(36, 48,), array(22, 41,),
+                                            array(21, 35,), array(35, 37,), array(53,), array(53,), array(17,),
+                                            array(36,), array(17,), array(34,), array(51,), array(22,), array(37,),
+                                            array(15,), array(23,), array(11,), array(5,), array(17,), array(17,),
+                                            array(17,), array(46,), array(17,), array(17,), array(51,), array(34,),
+                                            array(17,), array(42,), array(17,), array(17,), array(36,), 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(341, 518, 498, 533, 533, 498, 498, 533, 533, 533, 533, 533, 533, 533, 533, 533,
+                                      533, 533, 533, 533, 533, 533, 533, 533, 533, 533, 533, 533, 533, 533, 533, 533,
+                                      533, 533, 533, 533, 533, 533, 533, 533, 533, 533, 533, 533, 401, 533, 377, 401,
+                                      401, 401, 368, 338, 533, 533, 533, 533, 533, 406, 533, 533, 533, 533, 533, 533,
+                                      533, 520, 521, 422, 440, 382, 496, 406, 412, 497, 519, 408, 413, 403, 429, 430,
+                                      428, 430, 533, 415, 401, 533, 533, 401, 401, 401, 401, 447, 421, 401, 401, 510,
+                                      533, 533, 401, 391, 415, 415, 463, 533, 415, 533, 463, 453, 463, 453, 379, 533,
+                                      453, 533, 401, 395, 415, 401, 415, 415, 533, 425, 453, 415, 433, 431, 397, 418,
+                                      507, 432, 419, 505, 452, 452, 452, 452, 452, 452, 533, 465, 479, 463, 386, 456,
+                                      533, 533, 388, 387, 461, 457, 364, 459, 384, 360, 385, 361, 380, 378, 533, 363,
+                                      458, 365, 369, 381, 366, 533, 490, 376, 375, 372, 491, 460, 489, 463, 488, 370,
+                                      374, 390, 533, 389, 463, 421, 396, 499, 354, 398, 511, 508, 485, 392, 500, 447,
+                                      504, 504, 463, 504, 463, 440, 436, 440, 464, 440, 430, 430, 440, 533, 440, 533,
+                                      436, 436, 533, 533, 533, 448, 430, 533, 533, 533, 443, 533, 509, 533, 533, 533,
+                                      430, 533, 533, 409, 533, 346, 533, 533, 533, 436, 533, 533, 533, 438, 533, 442,
+                                      533, 533, 479, 451, 503, 394, 486, 383, 483, 400, 410, 481, 482, 402, 450, 502,
+                                      514, 513, 479, 501, 420, 427, 426, 339, 487, 480, 350, 351, 352, 353, 349, 347,
+                                      344, 345, 455, 348, 355, 356, 358, 399, 484, 371, 357, 340, 454, 342, 414, 343,
+                                      434, 531, 530, 466, 467, 468, 462, 417, 526, 441, 416, 528, 443, 444, 516, 517,
+                                      446, 515, 424, 423, 445, 495, 532, 525, 492, 475, 493, 393, 522, 477, 437, 494,
+                                      469, 506, 435, 442, 512, 523, 439, 470, 529, 473, 527, 476, 474, 478, 472, 524,
+                                      471, 449,);
+
+    const YYNOCODE = 105;
+
+    const YYSTACKDEPTH = 500;
+
+    const YYNSTATE = 338;
+
+    const YYNRULE = 195;
+
+    const YYERRORSYMBOL = 60;
+
     const YYERRSYMDT = 'yy0';
+
     const YYFALLBACK = 0;
-    static public $yyFallback = array(
-    );
-    static function Trace($TraceFILE, $zTracePrompt)
+
+    public static $yyFallback = array();
+
+    public function Trace($TraceFILE, $zTracePrompt)
     {
         if (!$TraceFILE) {
             $zTracePrompt = 0;
         } elseif (!$zTracePrompt) {
             $TraceFILE = 0;
         }
-        self::$yyTraceFILE = $TraceFILE;
-        self::$yyTracePrompt = $zTracePrompt;
+        $this->yyTraceFILE = $TraceFILE;
+        $this->yyTracePrompt = $zTracePrompt;
     }
 
-    static function PrintTrace()
+    public function PrintTrace()
     {
-        self::$yyTraceFILE = fopen('php://output', 'w');
-        self::$yyTracePrompt = '<br>';
+        $this->yyTraceFILE = fopen('php://output', 'w');
+        $this->yyTracePrompt = '<br>';
     }
 
-    static public $yyTraceFILE;
-    static public $yyTracePrompt;
+    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',         'COMMENT',
-  'PHPSTARTTAG',   'PHPENDTAG',     'ASPSTARTTAG',   'ASPENDTAG',
-  'FAKEPHPSTARTTAG',  'XMLTAG',        'TEXT',          'STRIPON',
-  'STRIPOFF',      'LITERALSTART',  'LITERALEND',    'LITERAL',
-  'LDEL',          'RDEL',          'DOLLAR',        'ID',
-  'EQUAL',         'PTR',           'LDELIF',        'LDELFOR',
-  'SEMICOLON',     'INCDEC',        'TO',            'STEP',
-  'LDELFOREACH',   'SPACE',         'AS',            'APTR',
-  'LDELSETFILTER',  'SMARTYBLOCKCHILD',  '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',   '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',       'literal_elements',
-  'literal_element',  'value',         'modifierlist',  'attributes',
-  'expr',          'varindexed',    'statement',     'statements',
-  'optspace',      'varvar',        'foraction',     'modparameters',
-  'attribute',     'ternary',       'array',         'ifcond',
-  'lop',           'variable',      'function',      'doublequoted_with_quotes',
-  'static_class_access',  'object',        'arrayindex',    'indexdef',
-  'varvarele',     'objectchain',   'objectelement',  'method',
-  'params',        'modifier',      'modparameter',  'arrayelements',
-  'arrayelement',  'doublequoted',  'doublequotedcontent',
-    );
-
-    static public $yyRuleName = array(
- /*   0 */ "start ::= template",
- /*   1 */ "template ::= template_element",
- /*   2 */ "template ::= template template_element",
- /*   3 */ "template ::=",
- /*   4 */ "template_element ::= smartytag",
- /*   5 */ "template_element ::= COMMENT",
- /*   6 */ "template_element ::= literal",
- /*   7 */ "template_element ::= PHPSTARTTAG",
- /*   8 */ "template_element ::= PHPENDTAG",
- /*   9 */ "template_element ::= ASPSTARTTAG",
- /*  10 */ "template_element ::= ASPENDTAG",
- /*  11 */ "template_element ::= FAKEPHPSTARTTAG",
- /*  12 */ "template_element ::= XMLTAG",
- /*  13 */ "template_element ::= TEXT",
- /*  14 */ "template_element ::= STRIPON",
- /*  15 */ "template_element ::= STRIPOFF",
- /*  16 */ "literal ::= LITERALSTART LITERALEND",
- /*  17 */ "literal ::= LITERALSTART literal_elements LITERALEND",
- /*  18 */ "literal_elements ::= literal_elements literal_element",
- /*  19 */ "literal_elements ::=",
- /*  20 */ "literal_element ::= literal",
- /*  21 */ "literal_element ::= LITERAL",
- /*  22 */ "literal_element ::= PHPSTARTTAG",
- /*  23 */ "literal_element ::= FAKEPHPSTARTTAG",
- /*  24 */ "literal_element ::= PHPENDTAG",
- /*  25 */ "literal_element ::= ASPSTARTTAG",
- /*  26 */ "literal_element ::= ASPENDTAG",
- /*  27 */ "smartytag ::= LDEL value RDEL",
- /*  28 */ "smartytag ::= LDEL value modifierlist attributes RDEL",
- /*  29 */ "smartytag ::= LDEL value attributes RDEL",
- /*  30 */ "smartytag ::= LDEL expr modifierlist attributes RDEL",
- /*  31 */ "smartytag ::= LDEL expr attributes RDEL",
- /*  32 */ "smartytag ::= LDEL DOLLAR ID EQUAL value RDEL",
- /*  33 */ "smartytag ::= LDEL DOLLAR ID EQUAL expr RDEL",
- /*  34 */ "smartytag ::= LDEL DOLLAR ID EQUAL expr attributes RDEL",
- /*  35 */ "smartytag ::= LDEL varindexed EQUAL expr attributes RDEL",
- /*  36 */ "smartytag ::= LDEL ID attributes RDEL",
- /*  37 */ "smartytag ::= LDEL ID RDEL",
- /*  38 */ "smartytag ::= LDEL ID PTR ID attributes RDEL",
- /*  39 */ "smartytag ::= LDEL ID modifierlist attributes RDEL",
- /*  40 */ "smartytag ::= LDEL ID PTR ID modifierlist attributes RDEL",
- /*  41 */ "smartytag ::= LDELIF expr RDEL",
- /*  42 */ "smartytag ::= LDELIF expr attributes RDEL",
- /*  43 */ "smartytag ::= LDELIF statement RDEL",
- /*  44 */ "smartytag ::= LDELIF statement attributes RDEL",
- /*  45 */ "smartytag ::= LDELFOR statements SEMICOLON optspace expr SEMICOLON optspace DOLLAR varvar foraction attributes RDEL",
- /*  46 */ "foraction ::= EQUAL expr",
- /*  47 */ "foraction ::= INCDEC",
- /*  48 */ "smartytag ::= LDELFOR statement TO expr attributes RDEL",
- /*  49 */ "smartytag ::= LDELFOR statement TO expr STEP expr attributes RDEL",
- /*  50 */ "smartytag ::= LDELFOREACH attributes RDEL",
- /*  51 */ "smartytag ::= LDELFOREACH SPACE value AS DOLLAR varvar attributes RDEL",
- /*  52 */ "smartytag ::= LDELFOREACH SPACE value AS DOLLAR varvar APTR DOLLAR varvar attributes RDEL",
- /*  53 */ "smartytag ::= LDELFOREACH SPACE expr AS DOLLAR varvar attributes RDEL",
- /*  54 */ "smartytag ::= LDELFOREACH SPACE expr AS DOLLAR varvar APTR DOLLAR varvar attributes RDEL",
- /*  55 */ "smartytag ::= LDELSETFILTER ID modparameters RDEL",
- /*  56 */ "smartytag ::= LDELSETFILTER ID modparameters modifierlist RDEL",
- /*  57 */ "smartytag ::= SMARTYBLOCKCHILD",
- /*  58 */ "smartytag ::= LDELSLASH ID RDEL",
- /*  59 */ "smartytag ::= LDELSLASH ID modifierlist RDEL",
- /*  60 */ "smartytag ::= LDELSLASH ID PTR ID RDEL",
- /*  61 */ "smartytag ::= LDELSLASH ID PTR ID modifierlist RDEL",
- /*  62 */ "attributes ::= attributes attribute",
- /*  63 */ "attributes ::= attribute",
- /*  64 */ "attributes ::=",
- /*  65 */ "attribute ::= SPACE ID EQUAL ID",
- /*  66 */ "attribute ::= ATTR expr",
- /*  67 */ "attribute ::= ATTR value",
- /*  68 */ "attribute ::= SPACE ID",
- /*  69 */ "attribute ::= SPACE expr",
- /*  70 */ "attribute ::= SPACE value",
- /*  71 */ "attribute ::= SPACE INTEGER EQUAL expr",
- /*  72 */ "statements ::= statement",
- /*  73 */ "statements ::= statements COMMA statement",
- /*  74 */ "statement ::= DOLLAR varvar EQUAL expr",
- /*  75 */ "statement ::= varindexed EQUAL expr",
- /*  76 */ "statement ::= OPENP statement CLOSEP",
- /*  77 */ "expr ::= value",
- /*  78 */ "expr ::= ternary",
- /*  79 */ "expr ::= DOLLAR ID COLON ID",
- /*  80 */ "expr ::= expr MATH value",
- /*  81 */ "expr ::= expr UNIMATH value",
- /*  82 */ "expr ::= expr ANDSYM value",
- /*  83 */ "expr ::= array",
- /*  84 */ "expr ::= expr modifierlist",
- /*  85 */ "expr ::= expr ifcond expr",
- /*  86 */ "expr ::= expr ISIN array",
- /*  87 */ "expr ::= expr ISIN value",
- /*  88 */ "expr ::= expr lop expr",
- /*  89 */ "expr ::= expr ISDIVBY expr",
- /*  90 */ "expr ::= expr ISNOTDIVBY expr",
- /*  91 */ "expr ::= expr ISEVEN",
- /*  92 */ "expr ::= expr ISNOTEVEN",
- /*  93 */ "expr ::= expr ISEVENBY expr",
- /*  94 */ "expr ::= expr ISNOTEVENBY expr",
- /*  95 */ "expr ::= expr ISODD",
- /*  96 */ "expr ::= expr ISNOTODD",
- /*  97 */ "expr ::= expr ISODDBY expr",
- /*  98 */ "expr ::= expr ISNOTODDBY expr",
- /*  99 */ "expr ::= value INSTANCEOF ID",
- /* 100 */ "expr ::= value INSTANCEOF value",
- /* 101 */ "ternary ::= OPENP expr CLOSEP QMARK DOLLAR ID COLON expr",
- /* 102 */ "ternary ::= OPENP expr CLOSEP QMARK expr COLON expr",
- /* 103 */ "value ::= variable",
- /* 104 */ "value ::= UNIMATH value",
- /* 105 */ "value ::= NOT value",
- /* 106 */ "value ::= TYPECAST value",
- /* 107 */ "value ::= variable INCDEC",
- /* 108 */ "value ::= HEX",
- /* 109 */ "value ::= INTEGER",
- /* 110 */ "value ::= INTEGER DOT INTEGER",
- /* 111 */ "value ::= INTEGER DOT",
- /* 112 */ "value ::= DOT INTEGER",
- /* 113 */ "value ::= ID",
- /* 114 */ "value ::= function",
- /* 115 */ "value ::= OPENP expr CLOSEP",
- /* 116 */ "value ::= SINGLEQUOTESTRING",
- /* 117 */ "value ::= doublequoted_with_quotes",
- /* 118 */ "value ::= ID DOUBLECOLON static_class_access",
- /* 119 */ "value ::= varindexed DOUBLECOLON static_class_access",
- /* 120 */ "value ::= smartytag",
- /* 121 */ "value ::= value modifierlist",
- /* 122 */ "variable ::= varindexed",
- /* 123 */ "variable ::= DOLLAR varvar AT ID",
- /* 124 */ "variable ::= object",
- /* 125 */ "variable ::= HATCH ID HATCH",
- /* 126 */ "variable ::= HATCH ID HATCH arrayindex",
- /* 127 */ "variable ::= HATCH variable HATCH",
- /* 128 */ "variable ::= HATCH variable HATCH arrayindex",
- /* 129 */ "varindexed ::= DOLLAR varvar arrayindex",
- /* 130 */ "arrayindex ::= arrayindex indexdef",
- /* 131 */ "arrayindex ::=",
- /* 132 */ "indexdef ::= DOT DOLLAR varvar",
- /* 133 */ "indexdef ::= DOT DOLLAR varvar AT ID",
- /* 134 */ "indexdef ::= DOT ID",
- /* 135 */ "indexdef ::= DOT INTEGER",
- /* 136 */ "indexdef ::= DOT LDEL expr RDEL",
- /* 137 */ "indexdef ::= OPENB ID CLOSEB",
- /* 138 */ "indexdef ::= OPENB ID DOT ID CLOSEB",
- /* 139 */ "indexdef ::= OPENB expr CLOSEB",
- /* 140 */ "indexdef ::= OPENB CLOSEB",
- /* 141 */ "varvar ::= varvarele",
- /* 142 */ "varvar ::= varvar varvarele",
- /* 143 */ "varvarele ::= ID",
- /* 144 */ "varvarele ::= LDEL expr RDEL",
- /* 145 */ "object ::= varindexed objectchain",
- /* 146 */ "objectchain ::= objectelement",
- /* 147 */ "objectchain ::= objectchain objectelement",
- /* 148 */ "objectelement ::= PTR ID arrayindex",
- /* 149 */ "objectelement ::= PTR DOLLAR varvar arrayindex",
- /* 150 */ "objectelement ::= PTR LDEL expr RDEL arrayindex",
- /* 151 */ "objectelement ::= PTR ID LDEL expr RDEL arrayindex",
- /* 152 */ "objectelement ::= PTR method",
- /* 153 */ "function ::= ID OPENP params CLOSEP",
- /* 154 */ "method ::= ID OPENP params CLOSEP",
- /* 155 */ "method ::= DOLLAR ID OPENP params CLOSEP",
- /* 156 */ "params ::= params COMMA expr",
- /* 157 */ "params ::= expr",
- /* 158 */ "params ::=",
- /* 159 */ "modifierlist ::= modifierlist modifier modparameters",
- /* 160 */ "modifierlist ::= modifier modparameters",
- /* 161 */ "modifier ::= VERT AT ID",
- /* 162 */ "modifier ::= VERT ID",
- /* 163 */ "modparameters ::= modparameters modparameter",
- /* 164 */ "modparameters ::=",
- /* 165 */ "modparameter ::= COLON value",
- /* 166 */ "modparameter ::= COLON array",
- /* 167 */ "static_class_access ::= method",
- /* 168 */ "static_class_access ::= method objectchain",
- /* 169 */ "static_class_access ::= ID",
- /* 170 */ "static_class_access ::= DOLLAR ID arrayindex",
- /* 171 */ "static_class_access ::= DOLLAR ID arrayindex objectchain",
- /* 172 */ "ifcond ::= EQUALS",
- /* 173 */ "ifcond ::= NOTEQUALS",
- /* 174 */ "ifcond ::= GREATERTHAN",
- /* 175 */ "ifcond ::= LESSTHAN",
- /* 176 */ "ifcond ::= GREATEREQUAL",
- /* 177 */ "ifcond ::= LESSEQUAL",
- /* 178 */ "ifcond ::= IDENTITY",
- /* 179 */ "ifcond ::= NONEIDENTITY",
- /* 180 */ "ifcond ::= MOD",
- /* 181 */ "lop ::= LAND",
- /* 182 */ "lop ::= LOR",
- /* 183 */ "lop ::= LXOR",
- /* 184 */ "array ::= OPENB arrayelements CLOSEB",
- /* 185 */ "arrayelements ::= arrayelement",
- /* 186 */ "arrayelements ::= arrayelements COMMA arrayelement",
- /* 187 */ "arrayelements ::=",
- /* 188 */ "arrayelement ::= value APTR expr",
- /* 189 */ "arrayelement ::= ID APTR expr",
- /* 190 */ "arrayelement ::= expr",
- /* 191 */ "doublequoted_with_quotes ::= QUOTE QUOTE",
- /* 192 */ "doublequoted_with_quotes ::= QUOTE doublequoted QUOTE",
- /* 193 */ "doublequoted ::= doublequoted doublequotedcontent",
- /* 194 */ "doublequoted ::= doublequotedcontent",
- /* 195 */ "doublequotedcontent ::= BACKTICK variable BACKTICK",
- /* 196 */ "doublequotedcontent ::= BACKTICK expr BACKTICK",
- /* 197 */ "doublequotedcontent ::= DOLLARID",
- /* 198 */ "doublequotedcontent ::= LDEL variable RDEL",
- /* 199 */ "doublequotedcontent ::= LDEL expr RDEL",
- /* 200 */ "doublequotedcontent ::= smartytag",
- /* 201 */ "doublequotedcontent ::= TEXT",
- /* 202 */ "optspace ::= SPACE",
- /* 203 */ "optspace ::=",
-    );
-
-    function tokenName($tokenType)
+    public $yyTokenName = array('$', 'VERT', 'COLON', 'PHP', 'NOCACHE', 'TEXT', 'STRIPON', 'STRIPOFF', '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', 'template_element ::= literal',
+                                      'template_element ::= PHP', 'template_element ::= NOCACHE',
+                                      'template_element ::= text_content', 'text_content ::= TEXT',
+                                      'text_content ::= text_content TEXT', 'template_element ::= STRIPON',
+                                      'template_element ::= STRIPOFF', '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', 'expr ::= variable INSTANCEOF variable',
+                                      '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)
     {
         if ($tokenType === 0) {
             return 'End of Input';
@@ -1480,46 +1040,54 @@ static public $yy_action = array(
         }
     }
 
-    static function yy_destructor($yymajor, $yypminor)
+    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 */
         }
     }
 
-    function yy_pop_parser_stack()
+    public function yy_pop_parser_stack()
     {
-        if (!count($this->yystack)) {
+        if (empty($this->yystack)) {
             return;
         }
         $yytos = array_pop($this->yystack);
-        if (self::$yyTraceFILE && $this->yyidx >= 0) {
-            fwrite(self::$yyTraceFILE,
-                self::$yyTracePrompt . 'Popping ' . $this->yyTokenName[$yytos->major] .
-                    "\n");
+        if ($this->yyTraceFILE && $this->yyidx >= 0) {
+            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;
     }
 
-    function __destruct()
+    public function __destruct()
     {
         while ($this->yystack !== Array()) {
             $this->yy_pop_parser_stack();
         }
-        if (is_resource(self::$yyTraceFILE)) {
-            fclose(self::$yyTraceFILE);
+        if (is_resource($this->yyTraceFILE)) {
+            fclose($this->yyTraceFILE);
         }
     }
 
-    function yy_get_expected_tokens($token)
+    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;
@@ -1529,7 +1097,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
@@ -1537,25 +1105,33 @@ static public $yy_action = array(
                         return array_unique($expected);
                     }
                     $yyruleno = $yyact - self::YYNSTATE;
-                    $this->yyidx -= self::$yyRuleInfo[$yyruleno]['rhs'];
-                    $nextstate = $this->yy_find_reduce_action(
-                        $this->yystack[$this->yyidx]->stateno,
-                        self::$yyRuleInfo[$yyruleno]['lhs']);
+                    $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])) {
-		        $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 TP_yyStackEntry;
                         $x->stateno = $nextstate;
-                        $x->major = self::$yyRuleInfo[$yyruleno]['lhs'];
+                        $x->major = self::$yyRuleInfo[$yyruleno][0];
                         $this->yystack[$this->yyidx] = $x;
                         continue 2;
                     } elseif ($nextstate == self::YYNSTATE + self::YYNRULE + 1) {
@@ -1577,19 +1153,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);
     }
 
-    function yy_is_expected_token($token)
+    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;
@@ -1599,7 +1184,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
@@ -1607,22 +1192,30 @@ static public $yy_action = array(
                         return true;
                     }
                     $yyruleno = $yyact - self::YYNSTATE;
-                    $this->yyidx -= self::$yyRuleInfo[$yyruleno]['rhs'];
-                    $nextstate = $this->yy_find_reduce_action(
-                        $this->yystack[$this->yyidx]->stateno,
-                        self::$yyRuleInfo[$yyruleno]['lhs']);
-                    if (isset(self::$yyExpectedTokens[$nextstate]) &&
-                          in_array($token, self::$yyExpectedTokens[$nextstate], true)) {
-                        $this->yyidx = $yyidx;
-                        $this->yystack = $stack;
-                        return true;
+                    $this->yyidx -= self::$yyRuleInfo[$yyruleno][1];
+                    $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 TP_yyStackEntry;
                         $x->stateno = $nextstate;
-                        $x->major = self::$yyRuleInfo[$yyruleno]['lhs'];
+                        $x->major = self::$yyRuleInfo[$yyruleno][0];
                         $this->yystack[$this->yyidx] = $x;
                         continue 2;
                     } elseif ($nextstate == self::YYNSTATE + self::YYNRULE + 1) {
@@ -1650,10 +1243,11 @@ static public $yy_action = array(
         } while (true);
         $this->yyidx = $yyidx;
         $this->yystack = $stack;
+
         return true;
     }
 
-   function yy_find_shift_action($iLookAhead)
+    public function yy_find_shift_action($iLookAhead)
     {
         $stateno = $this->yystack[$this->yyidx]->stateno;
 
@@ -1670,24 +1264,26 @@ 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 (self::$yyTraceFILE) {
-                    fwrite(self::$yyTraceFILE, self::$yyTracePrompt . "FALLBACK " .
-                        $this->yyTokenName[$iLookAhead] . " => " .
-                        $this->yyTokenName[$iFallback] . "\n");
+        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");
                 }
+
                 return $this->yy_find_shift_action($iFallback);
             }
+
             return self::$yy_default[$stateno];
         } else {
             return self::$yy_action[$i];
         }
     }
 
-    function yy_find_reduce_action($stateno, $iLookAhead)
+    public function yy_find_reduce_action($stateno, $iLookAhead)
     {
         /* $stateno = $this->yystack[$this->yyidx]->stateno; */
 
@@ -1702,1416 +1298,1430 @@ 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];
         }
     }
 
-    function yy_shift($yyNewState, $yyMajor, $yypMinor)
+    public function yy_shift($yyNewState, $yyMajor, $yypMinor)
     {
-        $this->yyidx++;
+        $this->yyidx ++;
         if ($this->yyidx >= self::YYSTACKDEPTH) {
-            $this->yyidx--;
-            if (self::$yyTraceFILE) {
-                fprintf(self::$yyTraceFILE, "%sStack Overflow!\n", self::$yyTracePrompt);
+            $this->yyidx --;
+            if ($this->yyTraceFILE) {
+                fprintf($this->yyTraceFILE, "%sStack Overflow!\n", $this->yyTracePrompt);
             }
             while ($this->yyidx >= 0) {
                 $this->yy_pop_parser_stack();
             }
-#line 84 "smarty_internal_templateparser.y"
+            #line 214 "../smarty/lexer/smarty_internal_templateparser.y"
+
+            $this->internalError = true;
+            $this->compiler->trigger_template_error("Stack overflow in template parser");
 
-    $this->internalError = true;
-    $this->compiler->trigger_template_error("Stack overflow in template parser");
-#line 1724 "smarty_internal_templateparser.php"
             return;
         }
         $yytos = new TP_yyStackEntry;
         $yytos->stateno = $yyNewState;
         $yytos->major = $yyMajor;
         $yytos->minor = $yypMinor;
-        array_push($this->yystack, $yytos);
-        if (self::$yyTraceFILE && $this->yyidx > 0) {
-            fprintf(self::$yyTraceFILE, "%sShift %d\n", self::$yyTracePrompt,
-                $yyNewState);
-            fprintf(self::$yyTraceFILE, "%sStack:", self::$yyTracePrompt);
-            for($i = 1; $i <= $this->yyidx; $i++) {
-                fprintf(self::$yyTraceFILE, " %s",
-                    $this->yyTokenName[$this->yystack[$i]->major]);
+        $this->yystack[] = $yytos;
+        if ($this->yyTraceFILE && $this->yyidx > 0) {
+            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]);
             }
-            fwrite(self::$yyTraceFILE,"\n");
+            fwrite($this->yyTraceFILE, "\n");
         }
     }
 
-    static public $yyRuleInfo = array(
-  array( 'lhs' => 82, 'rhs' => 1 ),
-  array( 'lhs' => 83, 'rhs' => 1 ),
-  array( 'lhs' => 83, 'rhs' => 2 ),
-  array( 'lhs' => 83, 'rhs' => 0 ),
-  array( 'lhs' => 84, 'rhs' => 1 ),
-  array( 'lhs' => 84, 'rhs' => 1 ),
-  array( 'lhs' => 84, 'rhs' => 1 ),
-  array( 'lhs' => 84, 'rhs' => 1 ),
-  array( 'lhs' => 84, 'rhs' => 1 ),
-  array( 'lhs' => 84, 'rhs' => 1 ),
-  array( 'lhs' => 84, 'rhs' => 1 ),
-  array( 'lhs' => 84, 'rhs' => 1 ),
-  array( 'lhs' => 84, 'rhs' => 1 ),
-  array( 'lhs' => 84, 'rhs' => 1 ),
-  array( 'lhs' => 84, 'rhs' => 1 ),
-  array( 'lhs' => 84, 'rhs' => 1 ),
-  array( 'lhs' => 86, 'rhs' => 2 ),
-  array( 'lhs' => 86, 'rhs' => 3 ),
-  array( 'lhs' => 87, 'rhs' => 2 ),
-  array( 'lhs' => 87, 'rhs' => 0 ),
-  array( 'lhs' => 88, 'rhs' => 1 ),
-  array( 'lhs' => 88, 'rhs' => 1 ),
-  array( 'lhs' => 88, 'rhs' => 1 ),
-  array( 'lhs' => 88, 'rhs' => 1 ),
-  array( 'lhs' => 88, 'rhs' => 1 ),
-  array( 'lhs' => 88, 'rhs' => 1 ),
-  array( 'lhs' => 88, 'rhs' => 1 ),
-  array( 'lhs' => 85, 'rhs' => 3 ),
-  array( 'lhs' => 85, 'rhs' => 5 ),
-  array( 'lhs' => 85, 'rhs' => 4 ),
-  array( 'lhs' => 85, 'rhs' => 5 ),
-  array( 'lhs' => 85, 'rhs' => 4 ),
-  array( 'lhs' => 85, 'rhs' => 6 ),
-  array( 'lhs' => 85, 'rhs' => 6 ),
-  array( 'lhs' => 85, 'rhs' => 7 ),
-  array( 'lhs' => 85, 'rhs' => 6 ),
-  array( 'lhs' => 85, 'rhs' => 4 ),
-  array( 'lhs' => 85, 'rhs' => 3 ),
-  array( 'lhs' => 85, 'rhs' => 6 ),
-  array( 'lhs' => 85, 'rhs' => 5 ),
-  array( 'lhs' => 85, 'rhs' => 7 ),
-  array( 'lhs' => 85, 'rhs' => 3 ),
-  array( 'lhs' => 85, 'rhs' => 4 ),
-  array( 'lhs' => 85, 'rhs' => 3 ),
-  array( 'lhs' => 85, 'rhs' => 4 ),
-  array( 'lhs' => 85, 'rhs' => 12 ),
-  array( 'lhs' => 98, 'rhs' => 2 ),
-  array( 'lhs' => 98, 'rhs' => 1 ),
-  array( 'lhs' => 85, 'rhs' => 6 ),
-  array( 'lhs' => 85, 'rhs' => 8 ),
-  array( 'lhs' => 85, 'rhs' => 3 ),
-  array( 'lhs' => 85, 'rhs' => 8 ),
-  array( 'lhs' => 85, 'rhs' => 11 ),
-  array( 'lhs' => 85, 'rhs' => 8 ),
-  array( 'lhs' => 85, 'rhs' => 11 ),
-  array( 'lhs' => 85, 'rhs' => 4 ),
-  array( 'lhs' => 85, 'rhs' => 5 ),
-  array( 'lhs' => 85, 'rhs' => 1 ),
-  array( 'lhs' => 85, 'rhs' => 3 ),
-  array( 'lhs' => 85, 'rhs' => 4 ),
-  array( 'lhs' => 85, 'rhs' => 5 ),
-  array( 'lhs' => 85, 'rhs' => 6 ),
-  array( 'lhs' => 91, 'rhs' => 2 ),
-  array( 'lhs' => 91, 'rhs' => 1 ),
-  array( 'lhs' => 91, 'rhs' => 0 ),
-  array( 'lhs' => 100, 'rhs' => 4 ),
-  array( 'lhs' => 100, 'rhs' => 2 ),
-  array( 'lhs' => 100, 'rhs' => 2 ),
-  array( 'lhs' => 100, 'rhs' => 2 ),
-  array( 'lhs' => 100, 'rhs' => 2 ),
-  array( 'lhs' => 100, 'rhs' => 2 ),
-  array( 'lhs' => 100, 'rhs' => 4 ),
-  array( 'lhs' => 95, 'rhs' => 1 ),
-  array( 'lhs' => 95, 'rhs' => 3 ),
-  array( 'lhs' => 94, 'rhs' => 4 ),
-  array( 'lhs' => 94, 'rhs' => 3 ),
-  array( 'lhs' => 94, 'rhs' => 3 ),
-  array( 'lhs' => 92, 'rhs' => 1 ),
-  array( 'lhs' => 92, 'rhs' => 1 ),
-  array( 'lhs' => 92, 'rhs' => 4 ),
-  array( 'lhs' => 92, 'rhs' => 3 ),
-  array( 'lhs' => 92, 'rhs' => 3 ),
-  array( 'lhs' => 92, 'rhs' => 3 ),
-  array( 'lhs' => 92, 'rhs' => 1 ),
-  array( 'lhs' => 92, 'rhs' => 2 ),
-  array( 'lhs' => 92, 'rhs' => 3 ),
-  array( 'lhs' => 92, 'rhs' => 3 ),
-  array( 'lhs' => 92, 'rhs' => 3 ),
-  array( 'lhs' => 92, 'rhs' => 3 ),
-  array( 'lhs' => 92, 'rhs' => 3 ),
-  array( 'lhs' => 92, 'rhs' => 3 ),
-  array( 'lhs' => 92, 'rhs' => 2 ),
-  array( 'lhs' => 92, 'rhs' => 2 ),
-  array( 'lhs' => 92, 'rhs' => 3 ),
-  array( 'lhs' => 92, 'rhs' => 3 ),
-  array( 'lhs' => 92, 'rhs' => 2 ),
-  array( 'lhs' => 92, 'rhs' => 2 ),
-  array( 'lhs' => 92, 'rhs' => 3 ),
-  array( 'lhs' => 92, 'rhs' => 3 ),
-  array( 'lhs' => 92, 'rhs' => 3 ),
-  array( 'lhs' => 92, 'rhs' => 3 ),
-  array( 'lhs' => 101, 'rhs' => 8 ),
-  array( 'lhs' => 101, 'rhs' => 7 ),
-  array( 'lhs' => 89, 'rhs' => 1 ),
-  array( 'lhs' => 89, 'rhs' => 2 ),
-  array( 'lhs' => 89, 'rhs' => 2 ),
-  array( 'lhs' => 89, 'rhs' => 2 ),
-  array( 'lhs' => 89, 'rhs' => 2 ),
-  array( 'lhs' => 89, 'rhs' => 1 ),
-  array( 'lhs' => 89, 'rhs' => 1 ),
-  array( 'lhs' => 89, 'rhs' => 3 ),
-  array( 'lhs' => 89, 'rhs' => 2 ),
-  array( 'lhs' => 89, 'rhs' => 2 ),
-  array( 'lhs' => 89, 'rhs' => 1 ),
-  array( 'lhs' => 89, 'rhs' => 1 ),
-  array( 'lhs' => 89, 'rhs' => 3 ),
-  array( 'lhs' => 89, 'rhs' => 1 ),
-  array( 'lhs' => 89, 'rhs' => 1 ),
-  array( 'lhs' => 89, 'rhs' => 3 ),
-  array( 'lhs' => 89, 'rhs' => 3 ),
-  array( 'lhs' => 89, 'rhs' => 1 ),
-  array( 'lhs' => 89, 'rhs' => 2 ),
-  array( 'lhs' => 105, 'rhs' => 1 ),
-  array( 'lhs' => 105, 'rhs' => 4 ),
-  array( 'lhs' => 105, 'rhs' => 1 ),
-  array( 'lhs' => 105, 'rhs' => 3 ),
-  array( 'lhs' => 105, 'rhs' => 4 ),
-  array( 'lhs' => 105, 'rhs' => 3 ),
-  array( 'lhs' => 105, 'rhs' => 4 ),
-  array( 'lhs' => 93, 'rhs' => 3 ),
-  array( 'lhs' => 110, 'rhs' => 2 ),
-  array( 'lhs' => 110, 'rhs' => 0 ),
-  array( 'lhs' => 111, 'rhs' => 3 ),
-  array( 'lhs' => 111, 'rhs' => 5 ),
-  array( 'lhs' => 111, 'rhs' => 2 ),
-  array( 'lhs' => 111, 'rhs' => 2 ),
-  array( 'lhs' => 111, 'rhs' => 4 ),
-  array( 'lhs' => 111, 'rhs' => 3 ),
-  array( 'lhs' => 111, 'rhs' => 5 ),
-  array( 'lhs' => 111, 'rhs' => 3 ),
-  array( 'lhs' => 111, 'rhs' => 2 ),
-  array( 'lhs' => 97, 'rhs' => 1 ),
-  array( 'lhs' => 97, 'rhs' => 2 ),
-  array( 'lhs' => 112, 'rhs' => 1 ),
-  array( 'lhs' => 112, 'rhs' => 3 ),
-  array( 'lhs' => 109, 'rhs' => 2 ),
-  array( 'lhs' => 113, 'rhs' => 1 ),
-  array( 'lhs' => 113, 'rhs' => 2 ),
-  array( 'lhs' => 114, 'rhs' => 3 ),
-  array( 'lhs' => 114, 'rhs' => 4 ),
-  array( 'lhs' => 114, 'rhs' => 5 ),
-  array( 'lhs' => 114, 'rhs' => 6 ),
-  array( 'lhs' => 114, 'rhs' => 2 ),
-  array( 'lhs' => 106, 'rhs' => 4 ),
-  array( 'lhs' => 115, 'rhs' => 4 ),
-  array( 'lhs' => 115, 'rhs' => 5 ),
-  array( 'lhs' => 116, 'rhs' => 3 ),
-  array( 'lhs' => 116, 'rhs' => 1 ),
-  array( 'lhs' => 116, 'rhs' => 0 ),
-  array( 'lhs' => 90, 'rhs' => 3 ),
-  array( 'lhs' => 90, 'rhs' => 2 ),
-  array( 'lhs' => 117, 'rhs' => 3 ),
-  array( 'lhs' => 117, 'rhs' => 2 ),
-  array( 'lhs' => 99, 'rhs' => 2 ),
-  array( 'lhs' => 99, 'rhs' => 0 ),
-  array( 'lhs' => 118, 'rhs' => 2 ),
-  array( 'lhs' => 118, 'rhs' => 2 ),
-  array( 'lhs' => 108, 'rhs' => 1 ),
-  array( 'lhs' => 108, 'rhs' => 2 ),
-  array( 'lhs' => 108, 'rhs' => 1 ),
-  array( 'lhs' => 108, 'rhs' => 3 ),
-  array( 'lhs' => 108, 'rhs' => 4 ),
-  array( 'lhs' => 103, 'rhs' => 1 ),
-  array( 'lhs' => 103, 'rhs' => 1 ),
-  array( 'lhs' => 103, 'rhs' => 1 ),
-  array( 'lhs' => 103, 'rhs' => 1 ),
-  array( 'lhs' => 103, 'rhs' => 1 ),
-  array( 'lhs' => 103, 'rhs' => 1 ),
-  array( 'lhs' => 103, 'rhs' => 1 ),
-  array( 'lhs' => 103, 'rhs' => 1 ),
-  array( 'lhs' => 103, 'rhs' => 1 ),
-  array( 'lhs' => 104, 'rhs' => 1 ),
-  array( 'lhs' => 104, 'rhs' => 1 ),
-  array( 'lhs' => 104, 'rhs' => 1 ),
-  array( 'lhs' => 102, 'rhs' => 3 ),
-  array( 'lhs' => 119, 'rhs' => 1 ),
-  array( 'lhs' => 119, 'rhs' => 3 ),
-  array( 'lhs' => 119, 'rhs' => 0 ),
-  array( 'lhs' => 120, 'rhs' => 3 ),
-  array( 'lhs' => 120, 'rhs' => 3 ),
-  array( 'lhs' => 120, 'rhs' => 1 ),
-  array( 'lhs' => 107, 'rhs' => 2 ),
-  array( 'lhs' => 107, 'rhs' => 3 ),
-  array( 'lhs' => 121, 'rhs' => 2 ),
-  array( 'lhs' => 121, 'rhs' => 1 ),
-  array( 'lhs' => 122, 'rhs' => 3 ),
-  array( 'lhs' => 122, 'rhs' => 3 ),
-  array( 'lhs' => 122, 'rhs' => 1 ),
-  array( 'lhs' => 122, 'rhs' => 3 ),
-  array( 'lhs' => 122, 'rhs' => 3 ),
-  array( 'lhs' => 122, 'rhs' => 1 ),
-  array( 'lhs' => 122, 'rhs' => 1 ),
-  array( 'lhs' => 96, 'rhs' => 1 ),
-  array( 'lhs' => 96, 'rhs' => 0 ),
-    );
-
-    static public $yyReduceMap = array(
-        0 => 0,
-        1 => 1,
-        2 => 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,
-        19 => 16,
-        203 => 16,
-        17 => 17,
-        76 => 17,
-        18 => 18,
-        104 => 18,
-        106 => 18,
-        107 => 18,
-        130 => 18,
-        168 => 18,
-        20 => 20,
-        21 => 20,
-        47 => 20,
-        69 => 20,
-        70 => 20,
-        77 => 20,
-        78 => 20,
-        83 => 20,
-        103 => 20,
-        108 => 20,
-        109 => 20,
-        114 => 20,
-        116 => 20,
-        117 => 20,
-        124 => 20,
-        141 => 20,
-        167 => 20,
-        169 => 20,
-        185 => 20,
-        190 => 20,
-        202 => 20,
-        22 => 22,
-        23 => 22,
-        24 => 24,
-        25 => 25,
-        26 => 26,
-        27 => 27,
-        28 => 28,
-        29 => 29,
-        31 => 29,
-        30 => 30,
-        32 => 32,
-        33 => 32,
-        34 => 34,
-        35 => 35,
-        36 => 36,
-        37 => 37,
-        38 => 38,
-        39 => 39,
-        40 => 40,
-        41 => 41,
-        42 => 42,
-        44 => 42,
-        43 => 43,
-        45 => 45,
-        46 => 46,
-        48 => 48,
-        49 => 49,
-        50 => 50,
-        51 => 51,
-        52 => 52,
-        53 => 53,
-        54 => 54,
-        55 => 55,
-        56 => 56,
-        57 => 57,
-        58 => 58,
-        59 => 59,
-        60 => 60,
-        61 => 61,
-        62 => 62,
-        63 => 63,
-        72 => 63,
-        157 => 63,
-        161 => 63,
-        165 => 63,
-        166 => 63,
-        64 => 64,
-        158 => 64,
-        164 => 64,
-        65 => 65,
-        66 => 66,
-        67 => 66,
-        68 => 68,
-        71 => 71,
-        73 => 73,
-        74 => 74,
-        75 => 74,
-        79 => 79,
-        80 => 80,
-        81 => 80,
-        82 => 80,
-        84 => 84,
-        121 => 84,
-        85 => 85,
-        88 => 85,
-        99 => 85,
-        86 => 86,
-        87 => 87,
-        89 => 89,
-        90 => 90,
-        91 => 91,
-        96 => 91,
-        92 => 92,
-        95 => 92,
-        93 => 93,
-        98 => 93,
-        94 => 94,
-        97 => 94,
-        100 => 100,
-        101 => 101,
-        102 => 102,
-        105 => 105,
-        110 => 110,
-        111 => 111,
-        112 => 112,
-        113 => 113,
-        115 => 115,
-        118 => 118,
-        119 => 119,
-        120 => 120,
-        122 => 122,
-        123 => 123,
-        125 => 125,
-        126 => 126,
-        127 => 127,
-        128 => 128,
-        129 => 129,
-        131 => 131,
-        187 => 131,
-        132 => 132,
-        133 => 133,
-        134 => 134,
-        135 => 135,
-        136 => 136,
-        139 => 136,
-        137 => 137,
-        138 => 138,
-        140 => 140,
-        142 => 142,
-        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,
-        159 => 159,
-        160 => 160,
-        162 => 162,
-        163 => 163,
-        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,
-        186 => 186,
-        188 => 188,
-        189 => 189,
-        191 => 191,
-        192 => 192,
-        193 => 193,
-        194 => 194,
-        195 => 195,
-        196 => 195,
-        198 => 195,
-        197 => 197,
-        199 => 199,
-        200 => 200,
-        201 => 201,
-    );
-#line 95 "smarty_internal_templateparser.y"
-    function yy_r0(){
-    $this->_retvalue = $this->root_buffer->to_smarty_php();
-    }
-#line 2160 "smarty_internal_templateparser.php"
-#line 103 "smarty_internal_templateparser.y"
-    function yy_r1(){
-    $this->current_buffer->append_subtree($this->yystack[$this->yyidx + 0]->minor);
-    }
-#line 2165 "smarty_internal_templateparser.php"
-#line 119 "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_tag($this, $this->compiler->processNocacheCode($tmp.$this->yystack[$this->yyidx + 0]->minor,true));
-    } else {
-        $this->_retvalue = new _smarty_tag($this, $this->yystack[$this->yyidx + 0]->minor);
-    }
-    $this->compiler->has_variable_string = false;
-    $this->block_nesting_level = count($this->compiler->_tag_stack);
-    }
-#line 2177 "smarty_internal_templateparser.php"
-#line 131 "smarty_internal_templateparser.y"
-    function yy_r5(){
-    $this->_retvalue = new _smarty_tag($this, '');
-    }
-#line 2182 "smarty_internal_templateparser.php"
-#line 136 "smarty_internal_templateparser.y"
-    function yy_r6(){
-    $this->_retvalue = new _smarty_text($this, $this->yystack[$this->yyidx + 0]->minor);
-    }
-#line 2187 "smarty_internal_templateparser.php"
-#line 141 "smarty_internal_templateparser.y"
-    function yy_r7(){
-    if ($this->php_handling == Smarty::PHP_PASSTHRU) {
-        $this->_retvalue = new _smarty_text($this, self::escape_start_tag($this->yystack[$this->yyidx + 0]->minor));
-    } elseif ($this->php_handling == Smarty::PHP_QUOTE) {
-        $this->_retvalue = new _smarty_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);
+    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 => 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 => 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 => 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,
+                                       17  => 9, 18 => 9, 45 => 9, 68 => 9, 69 => 9, 77 => 9, 78 => 9, 82 => 9, 92 => 9,
+                                       97  => 9, 98 => 9, 103 => 9, 105 => 9, 106 => 9, 110 => 9, 112 => 9, 117 => 9,
+                                       178 => 9, 183 => 9, 10 => 10, 11 => 11, 12 => 12, 13 => 13, 16 => 13, 14 => 14,
+                                       76  => 14, 15 => 15, 93 => 15, 95 => 15, 96 => 15, 124 => 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, 159 => 62, 163 => 62, 167 => 62, 168 => 62, 63 => 63,
+                                       160 => 63, 166 => 63, 64 => 64, 65 => 65, 66 => 65, 67 => 67, 144 => 67,
+                                       70  => 70, 72 => 72, 73 => 73, 74 => 73, 75 => 75, 79 => 79, 80 => 80, 81 => 80,
+                                       83  => 83, 109 => 83, 84 => 84, 85 => 85, 86 => 86, 87 => 87, 88 => 88, 89 => 88,
+                                       90  => 90, 91 => 91, 94 => 94, 99 => 99, 100 => 100, 101 => 101, 102 => 102,
+                                       104 => 104, 107 => 107, 108 => 108, 111 => 111, 113 => 113, 114 => 114,
+                                       115 => 115, 116 => 116, 118 => 118, 119 => 119, 120 => 120, 121 => 121,
+                                       122 => 122, 123 => 123, 125 => 125, 180 => 125, 126 => 126, 127 => 127,
+                                       128 => 128, 129 => 129, 130 => 130, 131 => 131, 139 => 131, 132 => 132,
+                                       133 => 133, 134 => 134, 135 => 134, 137 => 134, 138 => 134, 136 => 136,
+                                       140 => 140, 141 => 141, 142 => 142, 184 => 142, 143 => 143, 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,
+                                       158 => 158, 161 => 161, 162 => 162, 164 => 164, 165 => 165, 169 => 169,
+                                       170 => 170, 171 => 171, 172 => 172, 173 => 173, 174 => 174, 175 => 175,
+                                       176 => 176, 177 => 177, 179 => 179, 181 => 181, 182 => 182, 185 => 185,
+                                       186 => 186, 187 => 187, 188 => 188, 189 => 188, 191 => 188, 190 => 190,
+                                       192 => 192, 193 => 193, 194 => 194,);
+
+    #line 225 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r0()
+    {
+        $this->root_buffer->prepend_array($this, $this->template_prefix);
+        $this->root_buffer->append_array($this, $this->template_postfix);
+        $this->_retvalue = $this->root_buffer->to_smarty_php($this);
+    }
+
+    #line 235 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r1()
+    {
+        if ($this->yystack[$this->yyidx + 0]->minor != null) {
+            $this->current_buffer->append_subtree($this, $this->yystack[$this->yyidx + 0]->minor);
         }
-        $this->_retvalue = new _smarty_text($this, $this->compiler->processNocacheCode('<?php', true));
-    } elseif ($this->php_handling == Smarty::PHP_REMOVE) {
-        $this->_retvalue = new _smarty_text($this, '');
     }
+
+    #line 242 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r2()
+    {
+        if ($this->yystack[$this->yyidx + 0]->minor != null) {
+            // because of possible code injection
+            $this->current_buffer->append_subtree($this, $this->yystack[$this->yyidx + 0]->minor);
+        }
+    }
+
+    #line 256 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r4()
+    {
+        if ($this->compiler->has_code) {
+            $this->_retvalue = $this->mergePrefixCode($this->yystack[$this->yyidx + 0]->minor);
+        } else {
+            $this->_retvalue = null;
+        }
+        $this->compiler->has_variable_string = false;
+        $this->block_nesting_level = count($this->compiler->_tag_stack);
+    }
+
+    #line 267 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r5()
+    {
+        $this->_retvalue = new Smarty_Internal_ParseTree_Text($this->yystack[$this->yyidx + 0]->minor);
+    }
+
+    #line 271 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r6()
+    {
+        $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;
+            }
+            $this->compiler->prefix_code = array();
+            $this->_retvalue =
+                new Smarty_Internal_ParseTree_Tag($this, $this->compiler->processNocacheCode($tmp . $code, true));
+        } else {
+            $this->_retvalue = null;
+        }
     }
-#line 2203 "smarty_internal_templateparser.php"
-#line 157 "smarty_internal_templateparser.y"
-    function yy_r8(){
-    if ($this->is_xml) {
+
+    #line 282 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r7()
+    {
         $this->compiler->tag_nocache = true;
-        $this->is_xml = false;
-        $save = $this->template->has_nocache_code;
-        $this->_retvalue = new _smarty_text($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_text($this, '?<?php ?>>');
-    } elseif ($this->php_handling == Smarty::PHP_QUOTE) {
-        $this->_retvalue = new _smarty_text($this, htmlspecialchars('?>', ENT_QUOTES));
-    } elseif ($this->php_handling == Smarty::PHP_ALLOW) {
-        $this->_retvalue = new _smarty_text($this, $this->compiler->processNocacheCode('?>', true));
-    } elseif ($this->php_handling == Smarty::PHP_REMOVE) {
-        $this->_retvalue = new _smarty_text($this, '');
-    }
-    }
-#line 2222 "smarty_internal_templateparser.php"
-#line 176 "smarty_internal_templateparser.y"
-    function yy_r9(){
-    if ($this->php_handling == Smarty::PHP_PASSTHRU) {
-        $this->_retvalue = new _smarty_text($this, '<<?php ?>%');
-    } elseif ($this->php_handling == Smarty::PHP_QUOTE) {
-        $this->_retvalue = new _smarty_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);
+        $save = $this->template->compiled->has_nocache_code;
+        $this->_retvalue = new Smarty_Internal_ParseTree_Tag($this,
+                                                             $this->compiler->processNocacheCode("<?php echo '{$this->yystack[$this->yyidx + 0]->minor}';?>\n",
+                                                                                                 $this->compiler,
+                                                                                                 true));
+        $this->template->compiled->has_nocache_code = $save;
+    }
+
+    #line 289 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r8()
+    {
+        $this->_retvalue = $this->compiler->processText($this->yystack[$this->yyidx + 0]->minor);
+    }
+
+    #line 293 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r9()
+    {
+        $this->_retvalue = $this->yystack[$this->yyidx + 0]->minor;
+    }
+
+    #line 297 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r10()
+    {
+        $this->_retvalue = $this->yystack[$this->yyidx + - 1]->minor . $this->yystack[$this->yyidx + 0]->minor;
+    }
+
+    #line 302 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r11()
+    {
+        $this->strip = true;
+    }
+
+    #line 306 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r12()
+    {
+        $this->strip = false;
+    }
+
+    #line 311 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r13()
+    {
+        $this->_retvalue = '';
+    }
+
+    #line 315 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r14()
+    {
+        $this->_retvalue = $this->yystack[$this->yyidx + - 1]->minor;
+    }
+
+    #line 319 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r15()
+    {
+        $this->_retvalue = $this->yystack[$this->yyidx + - 1]->minor . $this->yystack[$this->yyidx + 0]->minor;
+    }
+
+    #line 335 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r19()
+    {
+        $this->_retvalue = $this->yystack[$this->yyidx + - 1]->minor;
+    }
+
+    #line 341 "../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 351 "../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 355 "../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));
+    }
+
+    #line 359 "../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 373 "../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));
+    }
+
+    #line 386 "../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' => '\'' .
+                                                                 substr($this->yystack[$this->yyidx + - 2]->minor, 1) .
+                                                                 '\'')));
+    }
+
+    #line 394 "../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 398 "../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['var'])), $this->yystack[$this->yyidx + 0]->minor),
+                                                       array('smarty_internal_index' => $this->yystack[$this->yyidx +
+                                                       - 3]->minor['smarty_internal_index']));
+    }
+
+    #line 403 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r33()
+    {
+        $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 425 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r34()
+    {
+        if (defined($this->yystack[$this->yyidx + - 1]->minor)) {
+            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 {
+            $this->_retvalue = $this->compiler->compileTag($this->yystack[$this->yyidx + - 1]->minor,
+                                                           $this->yystack[$this->yyidx + 0]->minor);
+        }
+    }
+
+    #line 435 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r35()
+    {
+        if (defined($this->yystack[$this->yyidx + 0]->minor)) {
+            if ($this->security) {
+                $this->security->isTrustedConstant($this->yystack[$this->yyidx + 0]->minor, $this->compiler);
             }
-            $this->_retvalue = new _smarty_text($this, $this->compiler->processNocacheCode('<%', true));
+            $this->_retvalue = $this->compiler->compileTag('private_print_expression', array(),
+                                                           array('value' => $this->yystack[$this->yyidx + 0]->minor));
         } else {
-            $this->_retvalue = new _smarty_text($this, '<<?php ?>%');
+            $this->_retvalue = $this->compiler->compileTag($this->yystack[$this->yyidx + 0]->minor, array());
         }
-    } elseif ($this->php_handling == Smarty::PHP_REMOVE) {
-        if ($this->asp_tags) {
-            $this->_retvalue = new _smarty_text($this, '');
+    }
+
+    #line 448 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r36()
+    {
+        if (defined($this->yystack[$this->yyidx + - 2]->minor)) {
+            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));
         } else {
-            $this->_retvalue = new _smarty_text($this, '<<?php ?>%');
+            $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()')) . ';?>';
         }
     }
+
+    #line 461 "../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 466 "../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()')) . ';?>';
+    }
+
+    #line 472 "../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 477 "../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 482 "../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 493 "../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 +
+                                                                          - 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 497 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r44()
+    {
+        $this->_retvalue = '=' . $this->yystack[$this->yyidx + 0]->minor;
     }
-#line 2246 "smarty_internal_templateparser.php"
-#line 200 "smarty_internal_templateparser.y"
-    function yy_r10(){
-    if ($this->php_handling == Smarty::PHP_PASSTHRU) {
-        $this->_retvalue = new _smarty_text($this, '%<?php ?>>');
-    } elseif ($this->php_handling == Smarty::PHP_QUOTE) {
-        $this->_retvalue = new _smarty_text($this, htmlspecialchars('%>', ENT_QUOTES));
-    } elseif ($this->php_handling == Smarty::PHP_ALLOW) {
-        if ($this->asp_tags) {
-            $this->_retvalue = new _smarty_text($this, $this->compiler->processNocacheCode('%>', true));
+
+    #line 505 "../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);
+    }
+
+    #line 509 "../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);
+    }
+
+    #line 514 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r48()
+    {
+        $this->_retvalue = $this->compiler->compileTag('foreach', $this->yystack[$this->yyidx + 0]->minor);
+    }
+
+    #line 519 "../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 +
+                                                                              - 3]->minor),
+                                                                                    array('item' => $this->yystack[$this->yyidx +
+                                                                                    - 1]->minor))));
+    }
+
+    #line 523 "../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 +
+                                                                              - 5]->minor),
+                                                                                    array('item' => $this->yystack[$this->yyidx +
+                                                                                    - 1]->minor),
+                                                                                    array('key' => $this->yystack[$this->yyidx +
+                                                                                    - 3]->minor))));
+    }
+
+    #line 536 "../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 540 "../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 545 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r55()
+    {
+        $j = strrpos($this->yystack[$this->yyidx + 0]->minor, '.');
+        if ($this->yystack[$this->yyidx + 0]->minor[$j + 1] == 'c') {
+            // {$smarty.block.child}
+            $this->_retvalue = SMARTY_INTERNAL_COMPILE_BLOCK::compileChildBlock($this->compiler);
         } else {
-            $this->_retvalue = new _smarty_text($this, '%<?php ?>>');
+            // {$smarty.block.parent}
+            $this->_retvalue = SMARTY_INTERNAL_COMPILE_BLOCK::compileParentBlock($this->compiler);
         }
-    } elseif ($this->php_handling == Smarty::PHP_REMOVE) {
-        if ($this->asp_tags) {
-            $this->_retvalue = new _smarty_text($this, '');
+    }
+
+    #line 558 "../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 = new _smarty_text($this, '%<?php ?>>');
+            $this->_retvalue = $this->compiler->compileTag($tag . 'close', array());
         }
     }
+
+    #line 567 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r57()
+    {
+        $this->_retvalue = $this->compiler->compileTag($this->yystack[$this->yyidx + 0]->minor . 'close', array());
+    }
+
+    #line 571 "../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 576 "../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 580 "../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));
     }
-#line 2267 "smarty_internal_templateparser.php"
-#line 220 "smarty_internal_templateparser.y"
-    function yy_r11(){
-    if ($this->strip) {
-        $this->_retvalue = new _smarty_text($this, preg_replace('![\t ]*[\r\n]+[\t ]*!', ' ', self::escape_start_tag($this->yystack[$this->yyidx + 0]->minor)));
-    } else {
-        $this->_retvalue = new _smarty_text($this, self::escape_start_tag($this->yystack[$this->yyidx + 0]->minor));
-    }
-    }
-#line 2276 "smarty_internal_templateparser.php"
-#line 229 "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_text($this, $this->compiler->processNocacheCode("<?php echo '<?xml';?>", $this->compiler, true));
-    $this->template->has_nocache_code = $save;
-    }
-#line 2285 "smarty_internal_templateparser.php"
-#line 238 "smarty_internal_templateparser.y"
-    function yy_r13(){
-    if ($this->strip) {
-        $this->_retvalue = new _smarty_text($this, preg_replace('![\t ]*[\r\n]+[\t ]*!', ' ', $this->yystack[$this->yyidx + 0]->minor));
-    } else {
-        $this->_retvalue = new _smarty_text($this, $this->yystack[$this->yyidx + 0]->minor);
-    }
-    }
-#line 2294 "smarty_internal_templateparser.php"
-#line 247 "smarty_internal_templateparser.y"
-    function yy_r14(){
-    $this->strip = true;
-    $this->_retvalue = new _smarty_text($this, '');
-    }
-#line 2300 "smarty_internal_templateparser.php"
-#line 252 "smarty_internal_templateparser.y"
-    function yy_r15(){
-    $this->strip = false;
-    $this->_retvalue = new _smarty_text($this, '');
-    }
-#line 2306 "smarty_internal_templateparser.php"
-#line 258 "smarty_internal_templateparser.y"
-    function yy_r16(){
-    $this->_retvalue = '';
-    }
-#line 2311 "smarty_internal_templateparser.php"
-#line 262 "smarty_internal_templateparser.y"
-    function yy_r17(){
-    $this->_retvalue = $this->yystack[$this->yyidx + -1]->minor;
-    }
-#line 2316 "smarty_internal_templateparser.php"
-#line 266 "smarty_internal_templateparser.y"
-    function yy_r18(){
-    $this->_retvalue = $this->yystack[$this->yyidx + -1]->minor.$this->yystack[$this->yyidx + 0]->minor;
-    }
-#line 2321 "smarty_internal_templateparser.php"
-#line 274 "smarty_internal_templateparser.y"
-    function yy_r20(){
-    $this->_retvalue = $this->yystack[$this->yyidx + 0]->minor;
-    }
-#line 2326 "smarty_internal_templateparser.php"
-#line 282 "smarty_internal_templateparser.y"
-    function yy_r22(){
-    $this->_retvalue = self::escape_start_tag($this->yystack[$this->yyidx + 0]->minor);
-    }
-#line 2331 "smarty_internal_templateparser.php"
-#line 290 "smarty_internal_templateparser.y"
-    function yy_r24(){
-    $this->_retvalue = self::escape_end_tag($this->yystack[$this->yyidx + 0]->minor);
-    }
-#line 2336 "smarty_internal_templateparser.php"
-#line 294 "smarty_internal_templateparser.y"
-    function yy_r25(){
-    $this->_retvalue = '<<?php ?>%';
-    }
-#line 2341 "smarty_internal_templateparser.php"
-#line 298 "smarty_internal_templateparser.y"
-    function yy_r26(){
-    $this->_retvalue = '%<?php ?>>';
-    }
-#line 2346 "smarty_internal_templateparser.php"
-#line 307 "smarty_internal_templateparser.y"
-    function yy_r27(){
-    $this->_retvalue = $this->compiler->compileTag('private_print_expression',array(),array('value'=>$this->yystack[$this->yyidx + -1]->minor));
-    }
-#line 2351 "smarty_internal_templateparser.php"
-#line 311 "smarty_internal_templateparser.y"
-    function yy_r28(){
-    $this->_retvalue = $this->compiler->compileTag('private_print_expression',$this->yystack[$this->yyidx + -1]->minor,array('value'=>$this->yystack[$this->yyidx + -3]->minor, 'modifierlist'=>$this->yystack[$this->yyidx + -2]->minor));
-    }
-#line 2356 "smarty_internal_templateparser.php"
-#line 315 "smarty_internal_templateparser.y"
-    function yy_r29(){
-    $this->_retvalue = $this->compiler->compileTag('private_print_expression',$this->yystack[$this->yyidx + -1]->minor,array('value'=>$this->yystack[$this->yyidx + -2]->minor));
-    }
-#line 2361 "smarty_internal_templateparser.php"
-#line 319 "smarty_internal_templateparser.y"
-    function yy_r30(){
-    $this->_retvalue = $this->compiler->compileTag('private_print_expression',$this->yystack[$this->yyidx + -1]->minor,array('value'=>$this->yystack[$this->yyidx + -3]->minor,'modifierlist'=>$this->yystack[$this->yyidx + -2]->minor));
-    }
-#line 2366 "smarty_internal_templateparser.php"
-#line 332 "smarty_internal_templateparser.y"
-    function yy_r32(){
-    $this->_retvalue = $this->compiler->compileTag('assign',array(array('value'=>$this->yystack[$this->yyidx + -1]->minor),array('var'=>"'".$this->yystack[$this->yyidx + -3]->minor."'")));
-    }
-#line 2371 "smarty_internal_templateparser.php"
-#line 340 "smarty_internal_templateparser.y"
-    function yy_r34(){
-    $this->_retvalue = $this->compiler->compileTag('assign',array_merge(array(array('value'=>$this->yystack[$this->yyidx + -2]->minor),array('var'=>"'".$this->yystack[$this->yyidx + -4]->minor."'")),$this->yystack[$this->yyidx + -1]->minor));
-    }
-#line 2376 "smarty_internal_templateparser.php"
-#line 344 "smarty_internal_templateparser.y"
-    function yy_r35(){
-    $this->_retvalue = $this->compiler->compileTag('assign',array_merge(array(array('value'=>$this->yystack[$this->yyidx + -2]->minor),array('var'=>$this->yystack[$this->yyidx + -4]->minor['var'])),$this->yystack[$this->yyidx + -1]->minor),array('smarty_internal_index'=>$this->yystack[$this->yyidx + -4]->minor['smarty_internal_index']));
-    }
-#line 2381 "smarty_internal_templateparser.php"
-#line 349 "smarty_internal_templateparser.y"
-    function yy_r36(){
-    $this->_retvalue = $this->compiler->compileTag($this->yystack[$this->yyidx + -2]->minor,$this->yystack[$this->yyidx + -1]->minor);
-    }
-#line 2386 "smarty_internal_templateparser.php"
-#line 353 "smarty_internal_templateparser.y"
-    function yy_r37(){
-    $this->_retvalue = $this->compiler->compileTag($this->yystack[$this->yyidx + -1]->minor,array());
-    }
-#line 2391 "smarty_internal_templateparser.php"
-#line 358 "smarty_internal_templateparser.y"
-    function yy_r38(){
-    $this->_retvalue = $this->compiler->compileTag($this->yystack[$this->yyidx + -4]->minor,$this->yystack[$this->yyidx + -1]->minor,array('object_methode'=>$this->yystack[$this->yyidx + -2]->minor));
-    }
-#line 2396 "smarty_internal_templateparser.php"
-#line 363 "smarty_internal_templateparser.y"
-    function yy_r39(){
-    $this->_retvalue = '<?php ob_start();?>'.$this->compiler->compileTag($this->yystack[$this->yyidx + -3]->minor,$this->yystack[$this->yyidx + -1]->minor).'<?php echo ';
-    $this->_retvalue .= $this->compiler->compileTag('private_modifier',array(),array('modifierlist'=>$this->yystack[$this->yyidx + -2]->minor,'value'=>'ob_get_clean()')).'?>';
-    }
-#line 2402 "smarty_internal_templateparser.php"
-#line 369 "smarty_internal_templateparser.y"
-    function yy_r40(){
-    $this->_retvalue = '<?php ob_start();?>'.$this->compiler->compileTag($this->yystack[$this->yyidx + -5]->minor,$this->yystack[$this->yyidx + -1]->minor,array('object_methode'=>$this->yystack[$this->yyidx + -3]->minor)).'<?php echo ';
-    $this->_retvalue .= $this->compiler->compileTag('private_modifier',array(),array('modifierlist'=>$this->yystack[$this->yyidx + -2]->minor,'value'=>'ob_get_clean()')).'?>';
-    }
-#line 2408 "smarty_internal_templateparser.php"
-#line 375 "smarty_internal_templateparser.y"
-    function yy_r41(){
-    $tag = trim(substr($this->yystack[$this->yyidx + -2]->minor,$this->lex->ldel_length));
-    $this->_retvalue = $this->compiler->compileTag(($tag == 'else if')? 'elseif' : $tag,array(),array('if condition'=>$this->yystack[$this->yyidx + -1]->minor));
-    }
-#line 2414 "smarty_internal_templateparser.php"
-#line 380 "smarty_internal_templateparser.y"
-    function yy_r42(){
-    $tag = trim(substr($this->yystack[$this->yyidx + -3]->minor,$this->lex->ldel_length));
-    $this->_retvalue = $this->compiler->compileTag(($tag == 'else if')? 'elseif' : $tag,$this->yystack[$this->yyidx + -1]->minor,array('if condition'=>$this->yystack[$this->yyidx + -2]->minor));
-    }
-#line 2420 "smarty_internal_templateparser.php"
-#line 385 "smarty_internal_templateparser.y"
-    function yy_r43(){
-    $tag = trim(substr($this->yystack[$this->yyidx + -2]->minor,$this->lex->ldel_length));
-    $this->_retvalue = $this->compiler->compileTag(($tag == 'else if')? 'elseif' : $tag,array(),array('if condition'=>$this->yystack[$this->yyidx + -1]->minor));
-    }
-#line 2426 "smarty_internal_templateparser.php"
-#line 396 "smarty_internal_templateparser.y"
-    function yy_r45(){
-    $this->_retvalue = $this->compiler->compileTag('for',array_merge($this->yystack[$this->yyidx + -1]->minor,array(array('start'=>$this->yystack[$this->yyidx + -10]->minor),array('ifexp'=>$this->yystack[$this->yyidx + -7]->minor),array('var'=>$this->yystack[$this->yyidx + -3]->minor),array('step'=>$this->yystack[$this->yyidx + -2]->minor))),1);
-    }
-#line 2431 "smarty_internal_templateparser.php"
-#line 400 "smarty_internal_templateparser.y"
-    function yy_r46(){
-    $this->_retvalue = '='.$this->yystack[$this->yyidx + 0]->minor;
-    }
-#line 2436 "smarty_internal_templateparser.php"
-#line 408 "smarty_internal_templateparser.y"
-    function yy_r48(){
-    $this->_retvalue = $this->compiler->compileTag('for',array_merge($this->yystack[$this->yyidx + -1]->minor,array(array('start'=>$this->yystack[$this->yyidx + -4]->minor),array('to'=>$this->yystack[$this->yyidx + -2]->minor))),0);
-    }
-#line 2441 "smarty_internal_templateparser.php"
-#line 412 "smarty_internal_templateparser.y"
-    function yy_r49(){
-    $this->_retvalue = $this->compiler->compileTag('for',array_merge($this->yystack[$this->yyidx + -1]->minor,array(array('start'=>$this->yystack[$this->yyidx + -6]->minor),array('to'=>$this->yystack[$this->yyidx + -4]->minor),array('step'=>$this->yystack[$this->yyidx + -2]->minor))),0);
-    }
-#line 2446 "smarty_internal_templateparser.php"
-#line 417 "smarty_internal_templateparser.y"
-    function yy_r50(){
-    $this->_retvalue = $this->compiler->compileTag('foreach',$this->yystack[$this->yyidx + -1]->minor);
-    }
-#line 2451 "smarty_internal_templateparser.php"
-#line 422 "smarty_internal_templateparser.y"
-    function yy_r51(){
-    $this->_retvalue = $this->compiler->compileTag('foreach',array_merge($this->yystack[$this->yyidx + -1]->minor,array(array('from'=>$this->yystack[$this->yyidx + -5]->minor),array('item'=>$this->yystack[$this->yyidx + -2]->minor))));
-    }
-#line 2456 "smarty_internal_templateparser.php"
-#line 426 "smarty_internal_templateparser.y"
-    function yy_r52(){
-    $this->_retvalue = $this->compiler->compileTag('foreach',array_merge($this->yystack[$this->yyidx + -1]->minor,array(array('from'=>$this->yystack[$this->yyidx + -8]->minor),array('item'=>$this->yystack[$this->yyidx + -2]->minor),array('key'=>$this->yystack[$this->yyidx + -5]->minor))));
-    }
-#line 2461 "smarty_internal_templateparser.php"
-#line 430 "smarty_internal_templateparser.y"
-    function yy_r53(){
-    $this->_retvalue = $this->compiler->compileTag('foreach',array_merge($this->yystack[$this->yyidx + -1]->minor,array(array('from'=>$this->yystack[$this->yyidx + -5]->minor),array('item'=>$this->yystack[$this->yyidx + -2]->minor))));
-    }
-#line 2466 "smarty_internal_templateparser.php"
-#line 434 "smarty_internal_templateparser.y"
-    function yy_r54(){
-    $this->_retvalue = $this->compiler->compileTag('foreach',array_merge($this->yystack[$this->yyidx + -1]->minor,array(array('from'=>$this->yystack[$this->yyidx + -8]->minor),array('item'=>$this->yystack[$this->yyidx + -2]->minor),array('key'=>$this->yystack[$this->yyidx + -5]->minor))));
-    }
-#line 2471 "smarty_internal_templateparser.php"
-#line 439 "smarty_internal_templateparser.y"
-    function yy_r55(){
-    $this->_retvalue = $this->compiler->compileTag('setfilter',array(),array('modifier_list'=>array(array_merge(array($this->yystack[$this->yyidx + -2]->minor),$this->yystack[$this->yyidx + -1]->minor))));
-    }
-#line 2476 "smarty_internal_templateparser.php"
-#line 443 "smarty_internal_templateparser.y"
-    function yy_r56(){
-    $this->_retvalue = $this->compiler->compileTag('setfilter',array(),array('modifier_list'=>array_merge(array(array_merge(array($this->yystack[$this->yyidx + -3]->minor),$this->yystack[$this->yyidx + -2]->minor)),$this->yystack[$this->yyidx + -1]->minor)));
-    }
-#line 2481 "smarty_internal_templateparser.php"
-#line 448 "smarty_internal_templateparser.y"
-    function yy_r57(){
-    $this->_retvalue = SMARTY_INTERNAL_COMPILE_BLOCK::compileChildBlock($this->compiler);
-    }
-#line 2486 "smarty_internal_templateparser.php"
-#line 454 "smarty_internal_templateparser.y"
-    function yy_r58(){
-    $this->_retvalue = $this->compiler->compileTag($this->yystack[$this->yyidx + -1]->minor.'close',array());
-    }
-#line 2491 "smarty_internal_templateparser.php"
-#line 458 "smarty_internal_templateparser.y"
-    function yy_r59(){
-    $this->_retvalue = $this->compiler->compileTag($this->yystack[$this->yyidx + -2]->minor.'close',array(),array('modifier_list'=>$this->yystack[$this->yyidx + -1]->minor));
-    }
-#line 2496 "smarty_internal_templateparser.php"
-#line 463 "smarty_internal_templateparser.y"
-    function yy_r60(){
-    $this->_retvalue = $this->compiler->compileTag($this->yystack[$this->yyidx + -3]->minor.'close',array(),array('object_methode'=>$this->yystack[$this->yyidx + -1]->minor));
-    }
-#line 2501 "smarty_internal_templateparser.php"
-#line 467 "smarty_internal_templateparser.y"
-    function yy_r61(){
-    $this->_retvalue = $this->compiler->compileTag($this->yystack[$this->yyidx + -4]->minor.'close',array(),array('object_methode'=>$this->yystack[$this->yyidx + -2]->minor, 'modifier_list'=>$this->yystack[$this->yyidx + -1]->minor));
-    }
-#line 2506 "smarty_internal_templateparser.php"
-#line 475 "smarty_internal_templateparser.y"
-    function yy_r62(){
-    $this->_retvalue = $this->yystack[$this->yyidx + -1]->minor;
-    $this->_retvalue[] = $this->yystack[$this->yyidx + 0]->minor;
-    }
-#line 2512 "smarty_internal_templateparser.php"
-#line 481 "smarty_internal_templateparser.y"
-    function yy_r63(){
-    $this->_retvalue = array($this->yystack[$this->yyidx + 0]->minor);
-    }
-#line 2517 "smarty_internal_templateparser.php"
-#line 486 "smarty_internal_templateparser.y"
-    function yy_r64(){
-    $this->_retvalue = array();
-    }
-#line 2522 "smarty_internal_templateparser.php"
-#line 491 "smarty_internal_templateparser.y"
-    function yy_r65(){
-    if (preg_match('~^true$~i', $this->yystack[$this->yyidx + 0]->minor)) {
-        $this->_retvalue = array($this->yystack[$this->yyidx + -2]->minor=>'true');
-    } elseif (preg_match('~^false$~i', $this->yystack[$this->yyidx + 0]->minor)) {
-        $this->_retvalue = array($this->yystack[$this->yyidx + -2]->minor=>'false');
-    } elseif (preg_match('~^null$~i', $this->yystack[$this->yyidx + 0]->minor)) {
-        $this->_retvalue = array($this->yystack[$this->yyidx + -2]->minor=>'null');
-    } else {
-        $this->_retvalue = array($this->yystack[$this->yyidx + -2]->minor=>"'".$this->yystack[$this->yyidx + 0]->minor."'");
-    }
-    }
-#line 2535 "smarty_internal_templateparser.php"
-#line 503 "smarty_internal_templateparser.y"
-    function yy_r66(){
-    $this->_retvalue = array(trim($this->yystack[$this->yyidx + -1]->minor," =\n\r\t")=>$this->yystack[$this->yyidx + 0]->minor);
-    }
-#line 2540 "smarty_internal_templateparser.php"
-#line 511 "smarty_internal_templateparser.y"
-    function yy_r68(){
-    $this->_retvalue = "'".$this->yystack[$this->yyidx + 0]->minor."'";
-    }
-#line 2545 "smarty_internal_templateparser.php"
-#line 523 "smarty_internal_templateparser.y"
-    function yy_r71(){
-    $this->_retvalue = array($this->yystack[$this->yyidx + -2]->minor=>$this->yystack[$this->yyidx + 0]->minor);
-    }
-#line 2550 "smarty_internal_templateparser.php"
-#line 536 "smarty_internal_templateparser.y"
-    function yy_r73(){
-    $this->yystack[$this->yyidx + -2]->minor[]=$this->yystack[$this->yyidx + 0]->minor;
-    $this->_retvalue = $this->yystack[$this->yyidx + -2]->minor;
-    }
-#line 2556 "smarty_internal_templateparser.php"
-#line 541 "smarty_internal_templateparser.y"
-    function yy_r74(){
-    $this->_retvalue = array('var' => $this->yystack[$this->yyidx + -2]->minor, 'value'=>$this->yystack[$this->yyidx + 0]->minor);
-    }
-#line 2561 "smarty_internal_templateparser.php"
-#line 569 "smarty_internal_templateparser.y"
-    function yy_r79(){
-    $this->_retvalue = '$_smarty_tpl->getStreamVariable(\''. $this->yystack[$this->yyidx + -2]->minor .'://'. $this->yystack[$this->yyidx + 0]->minor . '\')';
-    }
-#line 2566 "smarty_internal_templateparser.php"
-#line 574 "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 2571 "smarty_internal_templateparser.php"
-#line 593 "smarty_internal_templateparser.y"
-    function yy_r84(){
-    $this->_retvalue = $this->compiler->compileTag('private_modifier',array(),array('value'=>$this->yystack[$this->yyidx + -1]->minor,'modifierlist'=>$this->yystack[$this->yyidx + 0]->minor));
-    }
-#line 2576 "smarty_internal_templateparser.php"
-#line 599 "smarty_internal_templateparser.y"
-    function yy_r85(){
-    $this->_retvalue = $this->yystack[$this->yyidx + -2]->minor.$this->yystack[$this->yyidx + -1]->minor.$this->yystack[$this->yyidx + 0]->minor;
-    }
-#line 2581 "smarty_internal_templateparser.php"
-#line 603 "smarty_internal_templateparser.y"
-    function yy_r86(){
-    $this->_retvalue = 'in_array('.$this->yystack[$this->yyidx + -2]->minor.','.$this->yystack[$this->yyidx + 0]->minor.')';
-    }
-#line 2586 "smarty_internal_templateparser.php"
-#line 607 "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 2591 "smarty_internal_templateparser.php"
-#line 615 "smarty_internal_templateparser.y"
-    function yy_r89(){
-    $this->_retvalue = '!('.$this->yystack[$this->yyidx + -2]->minor.' % '.$this->yystack[$this->yyidx + 0]->minor.')';
-    }
-#line 2596 "smarty_internal_templateparser.php"
-#line 619 "smarty_internal_templateparser.y"
-    function yy_r90(){
-    $this->_retvalue = '('.$this->yystack[$this->yyidx + -2]->minor.' % '.$this->yystack[$this->yyidx + 0]->minor.')';
-    }
-#line 2601 "smarty_internal_templateparser.php"
-#line 623 "smarty_internal_templateparser.y"
-    function yy_r91(){
-    $this->_retvalue = '!(1 & '.$this->yystack[$this->yyidx + -1]->minor.')';
-    }
-#line 2606 "smarty_internal_templateparser.php"
-#line 627 "smarty_internal_templateparser.y"
-    function yy_r92(){
-    $this->_retvalue = '(1 & '.$this->yystack[$this->yyidx + -1]->minor.')';
-    }
-#line 2611 "smarty_internal_templateparser.php"
-#line 631 "smarty_internal_templateparser.y"
-    function yy_r93(){
-    $this->_retvalue = '!(1 & '.$this->yystack[$this->yyidx + -2]->minor.' / '.$this->yystack[$this->yyidx + 0]->minor.')';
-    }
-#line 2616 "smarty_internal_templateparser.php"
-#line 635 "smarty_internal_templateparser.y"
-    function yy_r94(){
-    $this->_retvalue = '(1 & '.$this->yystack[$this->yyidx + -2]->minor.' / '.$this->yystack[$this->yyidx + 0]->minor.')';
-    }
-#line 2621 "smarty_internal_templateparser.php"
-#line 659 "smarty_internal_templateparser.y"
-    function yy_r100(){
-    $this->prefix_number++;
-    $this->compiler->prefix_code[] = '<?php $_tmp'.$this->prefix_number.'='.$this->yystack[$this->yyidx + 0]->minor.';?>';
-    $this->_retvalue = $this->yystack[$this->yyidx + -2]->minor.$this->yystack[$this->yyidx + -1]->minor.'$_tmp'.$this->prefix_number;
-    }
-#line 2628 "smarty_internal_templateparser.php"
-#line 668 "smarty_internal_templateparser.y"
-    function yy_r101(){
-    $this->_retvalue = $this->yystack[$this->yyidx + -6]->minor.' ? '. $this->compileVariable("'".$this->yystack[$this->yyidx + -2]->minor."'") . ' : '.$this->yystack[$this->yyidx + 0]->minor;
-    }
-#line 2633 "smarty_internal_templateparser.php"
-#line 672 "smarty_internal_templateparser.y"
-    function yy_r102(){
-    $this->_retvalue = $this->yystack[$this->yyidx + -5]->minor.' ? '.$this->yystack[$this->yyidx + -2]->minor.' : '.$this->yystack[$this->yyidx + 0]->minor;
-    }
-#line 2638 "smarty_internal_templateparser.php"
-#line 687 "smarty_internal_templateparser.y"
-    function yy_r105(){
-    $this->_retvalue = '!'.$this->yystack[$this->yyidx + 0]->minor;
-    }
-#line 2643 "smarty_internal_templateparser.php"
-#line 708 "smarty_internal_templateparser.y"
-    function yy_r110(){
-    $this->_retvalue = $this->yystack[$this->yyidx + -2]->minor.'.'.$this->yystack[$this->yyidx + 0]->minor;
-    }
-#line 2648 "smarty_internal_templateparser.php"
-#line 712 "smarty_internal_templateparser.y"
-    function yy_r111(){
-    $this->_retvalue = $this->yystack[$this->yyidx + -1]->minor.'.';
-    }
-#line 2653 "smarty_internal_templateparser.php"
-#line 716 "smarty_internal_templateparser.y"
-    function yy_r112(){
-    $this->_retvalue = '.'.$this->yystack[$this->yyidx + 0]->minor;
-    }
-#line 2658 "smarty_internal_templateparser.php"
-#line 721 "smarty_internal_templateparser.y"
-    function yy_r113(){
-    if (preg_match('~^true$~i', $this->yystack[$this->yyidx + 0]->minor)) {
-        $this->_retvalue = 'true';
-    } elseif (preg_match('~^false$~i', $this->yystack[$this->yyidx + 0]->minor)) {
-        $this->_retvalue = 'false';
-    } elseif (preg_match('~^null$~i', $this->yystack[$this->yyidx + 0]->minor)) {
-        $this->_retvalue = 'null';
-    } else {
-        $this->_retvalue = "'".$this->yystack[$this->yyidx + 0]->minor."'";
-    }
-    }
-#line 2671 "smarty_internal_templateparser.php"
-#line 739 "smarty_internal_templateparser.y"
-    function yy_r115(){
-    $this->_retvalue = "(". $this->yystack[$this->yyidx + -1]->minor .")";
-    }
-#line 2676 "smarty_internal_templateparser.php"
-#line 754 "smarty_internal_templateparser.y"
-    function yy_r118(){
-    if (!$this->security || isset($this->smarty->registered_classes[$this->yystack[$this->yyidx + -2]->minor]) || $this->smarty->security_policy->isTrustedStaticClass($this->yystack[$this->yyidx + -2]->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;
+
+    #line 588 "../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 594 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r62()
+    {
+        $this->_retvalue = array($this->yystack[$this->yyidx + 0]->minor);
+    }
+
+    #line 599 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r63()
+    {
+        $this->_retvalue = array();
+    }
+
+    #line 604 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r64()
+    {
+        if (defined($this->yystack[$this->yyidx + 0]->minor)) {
+            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 = $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 .
+                    '\'');
         }
-    } else {
-        $this->compiler->trigger_template_error ("static class '".$this->yystack[$this->yyidx + -2]->minor."' is undefined or not allowed by security setting");
-    }
-    }
-#line 2689 "smarty_internal_templateparser.php"
-#line 766 "smarty_internal_templateparser.y"
-    function yy_r119(){
-    if ($this->yystack[$this->yyidx + -2]->minor['var'] == '\'smarty\'') {
-        $this->_retvalue =  $this->compiler->compileTag('private_special_variable',array(),$this->yystack[$this->yyidx + -2]->minor['smarty_internal_index']).'::'.$this->yystack[$this->yyidx + 0]->minor;
-    } else {
-        $this->_retvalue = $this->compileVariable($this->yystack[$this->yyidx + -2]->minor['var']).$this->yystack[$this->yyidx + -2]->minor['smarty_internal_index'].'::'.$this->yystack[$this->yyidx + 0]->minor;
-    }
-    }
-#line 2698 "smarty_internal_templateparser.php"
-#line 775 "smarty_internal_templateparser.y"
-    function yy_r120(){
-    $this->prefix_number++;
-    $this->compiler->prefix_code[] = '<?php ob_start();?>'.$this->yystack[$this->yyidx + 0]->minor.'<?php $_tmp'.$this->prefix_number.'=ob_get_clean();?>';
-    $this->_retvalue = '$_tmp'.$this->prefix_number;
-    }
-#line 2705 "smarty_internal_templateparser.php"
-#line 790 "smarty_internal_templateparser.y"
-    function yy_r122(){
-    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']);
-        $this->_retvalue = $smarty_var;
-    } else {
-        // used for array reset,next,prev,end,current
-        $this->last_variable = $this->yystack[$this->yyidx + 0]->minor['var'];
-        $this->last_index = $this->yystack[$this->yyidx + 0]->minor['smarty_internal_index'];
-        $this->_retvalue = $this->compileVariable($this->yystack[$this->yyidx + 0]->minor['var']).$this->yystack[$this->yyidx + 0]->minor['smarty_internal_index'];
-    }
-    }
-#line 2718 "smarty_internal_templateparser.php"
-#line 803 "smarty_internal_templateparser.y"
-    function yy_r123(){
-    $this->_retvalue = '$_smarty_tpl->tpl_vars['. $this->yystack[$this->yyidx + -2]->minor .']->'.$this->yystack[$this->yyidx + 0]->minor;
-    }
-#line 2723 "smarty_internal_templateparser.php"
-#line 813 "smarty_internal_templateparser.y"
-    function yy_r125(){
-    $this->_retvalue = '$_smarty_tpl->getConfigVariable(\''. $this->yystack[$this->yyidx + -1]->minor .'\')';
-    }
-#line 2728 "smarty_internal_templateparser.php"
-#line 817 "smarty_internal_templateparser.y"
-    function yy_r126(){
-    $this->_retvalue = '(is_array($tmp = $_smarty_tpl->getConfigVariable(\''. $this->yystack[$this->yyidx + -2]->minor .'\')) ? $tmp'.$this->yystack[$this->yyidx + 0]->minor.' :null)';
-    }
-#line 2733 "smarty_internal_templateparser.php"
-#line 821 "smarty_internal_templateparser.y"
-    function yy_r127(){
-    $this->_retvalue = '$_smarty_tpl->getConfigVariable('. $this->yystack[$this->yyidx + -1]->minor .')';
-    }
-#line 2738 "smarty_internal_templateparser.php"
-#line 825 "smarty_internal_templateparser.y"
-    function yy_r128(){
-    $this->_retvalue = '(is_array($tmp = $_smarty_tpl->getConfigVariable('. $this->yystack[$this->yyidx + -2]->minor .')) ? $tmp'.$this->yystack[$this->yyidx + 0]->minor.' : null)';
-    }
-#line 2743 "smarty_internal_templateparser.php"
-#line 829 "smarty_internal_templateparser.y"
-    function yy_r129(){
-    $this->_retvalue = array('var'=>$this->yystack[$this->yyidx + -1]->minor, 'smarty_internal_index'=>$this->yystack[$this->yyidx + 0]->minor);
-    }
-#line 2748 "smarty_internal_templateparser.php"
-#line 842 "smarty_internal_templateparser.y"
-    function yy_r131(){
-    return;
-    }
-#line 2753 "smarty_internal_templateparser.php"
-#line 848 "smarty_internal_templateparser.y"
-    function yy_r132(){
-    $this->_retvalue = '['.$this->compileVariable($this->yystack[$this->yyidx + 0]->minor).']';
-    }
-#line 2758 "smarty_internal_templateparser.php"
-#line 852 "smarty_internal_templateparser.y"
-    function yy_r133(){
-    $this->_retvalue = '['.$this->compileVariable($this->yystack[$this->yyidx + -2]->minor).'->'.$this->yystack[$this->yyidx + 0]->minor.']';
-    }
-#line 2763 "smarty_internal_templateparser.php"
-#line 856 "smarty_internal_templateparser.y"
-    function yy_r134(){
-    $this->_retvalue = "['". $this->yystack[$this->yyidx + 0]->minor ."']";
-    }
-#line 2768 "smarty_internal_templateparser.php"
-#line 860 "smarty_internal_templateparser.y"
-    function yy_r135(){
-    $this->_retvalue = "[". $this->yystack[$this->yyidx + 0]->minor ."]";
-    }
-#line 2773 "smarty_internal_templateparser.php"
-#line 864 "smarty_internal_templateparser.y"
-    function yy_r136(){
-    $this->_retvalue = "[". $this->yystack[$this->yyidx + -1]->minor ."]";
-    }
-#line 2778 "smarty_internal_templateparser.php"
-#line 869 "smarty_internal_templateparser.y"
-    function yy_r137(){
-    $this->_retvalue = '['.$this->compiler->compileTag('private_special_variable',array(),'[\'section\'][\''.$this->yystack[$this->yyidx + -1]->minor.'\'][\'index\']').']';
-    }
-#line 2783 "smarty_internal_templateparser.php"
-#line 873 "smarty_internal_templateparser.y"
-    function yy_r138(){
-    $this->_retvalue = '['.$this->compiler->compileTag('private_special_variable',array(),'[\'section\'][\''.$this->yystack[$this->yyidx + -3]->minor.'\'][\''.$this->yystack[$this->yyidx + -1]->minor.'\']').']';
-    }
-#line 2788 "smarty_internal_templateparser.php"
-#line 883 "smarty_internal_templateparser.y"
-    function yy_r140(){
-    $this->_retvalue = '[]';
-    }
-#line 2793 "smarty_internal_templateparser.php"
-#line 896 "smarty_internal_templateparser.y"
-    function yy_r142(){
-    $this->_retvalue = $this->yystack[$this->yyidx + -1]->minor.'.'.$this->yystack[$this->yyidx + 0]->minor;
-    }
-#line 2798 "smarty_internal_templateparser.php"
-#line 901 "smarty_internal_templateparser.y"
-    function yy_r143(){
-    $this->_retvalue = '\''.$this->yystack[$this->yyidx + 0]->minor.'\'';
-    }
-#line 2803 "smarty_internal_templateparser.php"
-#line 906 "smarty_internal_templateparser.y"
-    function yy_r144(){
-    $this->_retvalue = '('.$this->yystack[$this->yyidx + -1]->minor.')';
-    }
-#line 2808 "smarty_internal_templateparser.php"
-#line 913 "smarty_internal_templateparser.y"
-    function yy_r145(){
-    if ($this->yystack[$this->yyidx + -1]->minor['var'] == '\'smarty\'') {
-        $this->_retvalue =  $this->compiler->compileTag('private_special_variable',array(),$this->yystack[$this->yyidx + -1]->minor['smarty_internal_index']).$this->yystack[$this->yyidx + 0]->minor;
-    } else {
-        $this->_retvalue = $this->compileVariable($this->yystack[$this->yyidx + -1]->minor['var']).$this->yystack[$this->yyidx + -1]->minor['smarty_internal_index'].$this->yystack[$this->yyidx + 0]->minor;
-    }
-    }
-#line 2817 "smarty_internal_templateparser.php"
-#line 922 "smarty_internal_templateparser.y"
-    function yy_r146(){
-    $this->_retvalue  = $this->yystack[$this->yyidx + 0]->minor;
-    }
-#line 2822 "smarty_internal_templateparser.php"
-#line 927 "smarty_internal_templateparser.y"
-    function yy_r147(){
-    $this->_retvalue  = $this->yystack[$this->yyidx + -1]->minor.$this->yystack[$this->yyidx + 0]->minor;
-    }
-#line 2827 "smarty_internal_templateparser.php"
-#line 932 "smarty_internal_templateparser.y"
-    function yy_r148(){
-    if ($this->security && substr($this->yystack[$this->yyidx + -1]->minor,0,1) == '_') {
-        $this->compiler->trigger_template_error (self::Err1);
-    }
-    $this->_retvalue = '->'.$this->yystack[$this->yyidx + -1]->minor.$this->yystack[$this->yyidx + 0]->minor;
-    }
-#line 2835 "smarty_internal_templateparser.php"
-#line 939 "smarty_internal_templateparser.y"
-    function yy_r149(){
-    if ($this->security) {
-        $this->compiler->trigger_template_error (self::Err2);
-    }
-    $this->_retvalue = '->{'.$this->compileVariable($this->yystack[$this->yyidx + -1]->minor).$this->yystack[$this->yyidx + 0]->minor.'}';
-    }
-#line 2843 "smarty_internal_templateparser.php"
-#line 946 "smarty_internal_templateparser.y"
-    function yy_r150(){
-    if ($this->security) {
-        $this->compiler->trigger_template_error (self::Err2);
-    }
-    $this->_retvalue = '->{'.$this->yystack[$this->yyidx + -2]->minor.$this->yystack[$this->yyidx + 0]->minor.'}';
-    }
-#line 2851 "smarty_internal_templateparser.php"
-#line 953 "smarty_internal_templateparser.y"
-    function yy_r151(){
-    if ($this->security) {
-        $this->compiler->trigger_template_error (self::Err2);
-    }
-    $this->_retvalue = '->{\''.$this->yystack[$this->yyidx + -4]->minor.'\'.'.$this->yystack[$this->yyidx + -2]->minor.$this->yystack[$this->yyidx + 0]->minor.'}';
-    }
-#line 2859 "smarty_internal_templateparser.php"
-#line 961 "smarty_internal_templateparser.y"
-    function yy_r152(){
-    $this->_retvalue = '->'.$this->yystack[$this->yyidx + 0]->minor;
-    }
-#line 2864 "smarty_internal_templateparser.php"
-#line 969 "smarty_internal_templateparser.y"
-    function yy_r153(){
-    if (!$this->security || $this->smarty->security_policy->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') {
-                if (count($this->yystack[$this->yyidx + -1]->minor) == 0) {
-                    $this->compiler->trigger_template_error ('Illegal number of paramer in "isset()"');
-                }
-                $par = implode(',',$this->yystack[$this->yyidx + -1]->minor);
-                if (strncasecmp($par,'$_smarty_tpl->getConfigVariable',strlen('$_smarty_tpl->getConfigVariable')) === 0) {
-                    $this->prefix_number++;
-                    $this->compiler->prefix_code[] = '<?php $_tmp'.$this->prefix_number.'='.str_replace(')',', false)',$par).';?>';
-                    $isset_par = '$_tmp'.$this->prefix_number;
-                } else {
-                    $isset_par=str_replace("')->value","',null,true,false)->value",$par);
-                }
-                $this->_retvalue = $this->yystack[$this->yyidx + -3]->minor . "(". $isset_par .")";
-            } elseif (in_array($func_name,array('empty','reset','current','end','prev','next'))){
-                if (count($this->yystack[$this->yyidx + -1]->minor) != 1) {
-                    $this->compiler->trigger_template_error ('Illegal number of paramer in "empty()"');
-                }
-                if ($func_name == 'empty') {
-                    $this->_retvalue = $func_name.'('.str_replace("')->value","',null,true,false)->value",$this->yystack[$this->yyidx + -1]->minor[0]).')';
+    }
+
+    #line 615 "../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 623 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r67()
+    {
+        $this->_retvalue = '\'' . $this->yystack[$this->yyidx + 0]->minor . '\'';
+    }
+
+    #line 635 "../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 648 "../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 653 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r73()
+    {
+        $this->_retvalue = array('var'   => '\'' . substr($this->yystack[$this->yyidx + - 2]->minor, 1) . '\'',
+                                 'value' => $this->yystack[$this->yyidx + 0]->minor);
+    }
+
+    #line 660 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r75()
+    {
+        $this->_retvalue = array('var'   => $this->yystack[$this->yyidx + - 2]->minor,
+                                 'value' => $this->yystack[$this->yyidx + 0]->minor);
+    }
+
+    #line 684 "../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 689 "../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 703 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r83()
+    {
+        $this->_retvalue = $this->compiler->compileTag('private_modifier', array(),
+                                                       array('value' => $this->yystack[$this->yyidx + - 1]->minor,
+                                                             'modifierlist' => $this->yystack[$this->yyidx +
+                                                             0]->minor));
+    }
+
+    #line 709 "../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 712 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r85()
+    {
+        $this->_retvalue = $this->yystack[$this->yyidx + 0]->minor . $this->yystack[$this->yyidx + - 1]->minor . ')';
+    }
+
+    #line 716 "../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 720 "../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 724 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r88()
+    {
+        $this->_retvalue = $this->yystack[$this->yyidx + - 2]->minor . $this->yystack[$this->yyidx + - 1]->minor .
+            $this->yystack[$this->yyidx + 0]->minor;
+    }
+
+    #line 736 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r90()
+    {
+        $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 740 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r91()
+    {
+        $this->_retvalue =
+            $this->yystack[$this->yyidx + - 5]->minor . ' ? ' . $this->yystack[$this->yyidx + - 2]->minor . ' : ' .
+            $this->yystack[$this->yyidx + 0]->minor;
+    }
+
+    #line 755 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r94()
+    {
+        $this->_retvalue = '!' . $this->yystack[$this->yyidx + 0]->minor;
+    }
+
+    #line 776 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r99()
+    {
+        $this->_retvalue = $this->yystack[$this->yyidx + - 2]->minor . '.' . $this->yystack[$this->yyidx + 0]->minor;
+    }
+
+    #line 780 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r100()
+    {
+        $this->_retvalue = $this->yystack[$this->yyidx + - 1]->minor . '.';
+    }
+
+    #line 784 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r101()
+    {
+        $this->_retvalue = '.' . $this->yystack[$this->yyidx + 0]->minor;
+    }
+
+    #line 789 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r102()
+    {
+        if (defined($this->yystack[$this->yyidx + 0]->minor)) {
+            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 . '\'';
+        }
+    }
+
+    #line 806 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r104()
+    {
+        $this->_retvalue = "(" . $this->yystack[$this->yyidx + - 1]->minor . ")";
+    }
+
+    #line 821 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r107()
+    {
+        self::$prefix_number ++;
+        if ($this->yystack[$this->yyidx + - 2]->minor['var'] == '\'smarty\'') {
+            $this->compiler->prefix_code[] = '<?php $_tmp' . self::$prefix_number . ' = ' .
+                $this->compiler->compileTag('private_special_variable', array(),
+                                            $this->yystack[$this->yyidx + - 2]->minor['smarty_internal_index']) . ';?>';
+        } else {
+            $this->compiler->prefix_code[] = '<?php $_tmp' . self::$prefix_number . ' = ' .
+                $this->compiler->compileVariable($this->yystack[$this->yyidx + - 2]->minor['var']) .
+                $this->yystack[$this->yyidx + - 2]->minor['smarty_internal_index'] . ';?>';
+        }
+        $this->_retvalue = '$_tmp' . self::$prefix_number . '::' . $this->yystack[$this->yyidx + 0]->minor[0] .
+            $this->yystack[$this->yyidx + 0]->minor[1];
+    }
+
+    #line 832 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r108()
+    {
+        self::$prefix_number ++;
+        $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 849 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r111()
+    {
+        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 {
+                $this->_retvalue =
+                    $this->yystack[$this->yyidx + - 2]->minor . '::' . $this->yystack[$this->yyidx + 0]->minor[0] .
+                    $this->yystack[$this->yyidx + 0]->minor[1];
+            }
+        } else {
+            $this->compiler->trigger_template_error("static class '" . $this->yystack[$this->yyidx + - 2]->minor .
+                                                    "' is undefined or not allowed by security setting");
+        }
+    }
+
+    #line 868 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r113()
+    {
+        $this->_retvalue = $this->yystack[$this->yyidx + 0]->minor;
+    }
+
+    #line 879 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r114()
+    {
+        $this->_retvalue =
+            $this->compiler->compileVariable('\'' . substr($this->yystack[$this->yyidx + 0]->minor, 1) . '\'');
+    }
+
+    #line 882 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r115()
+    {
+        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']);
+            $this->_retvalue = $smarty_var;
+        } else {
+            // used for array reset,next,prev,end,current
+            $this->last_variable = $this->yystack[$this->yyidx + 0]->minor['var'];
+            $this->last_index = $this->yystack[$this->yyidx + 0]->minor['smarty_internal_index'];
+            $this->_retvalue = $this->compiler->compileVariable($this->yystack[$this->yyidx + 0]->minor['var']) .
+                $this->yystack[$this->yyidx + 0]->minor['smarty_internal_index'];
+        }
+    }
+
+    #line 895 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r116()
+    {
+        $this->_retvalue = '$_smarty_tpl->tpl_vars[' . $this->yystack[$this->yyidx + - 2]->minor . ']->' .
+            $this->yystack[$this->yyidx + 0]->minor;
+    }
+
+    #line 905 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r118()
+    {
+        $this->_retvalue =
+            $this->compiler->compileConfigVariable("'" . $this->yystack[$this->yyidx + - 1]->minor . "'");
+    }
+
+    #line 909 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r119()
+    {
+        $this->_retvalue = '(is_array($tmp = ' .
+            $this->compiler->compileConfigVariable("'" . $this->yystack[$this->yyidx + - 2]->minor . "'") . ') ? $tmp' .
+            $this->yystack[$this->yyidx + 0]->minor . ' :null)';
+    }
+
+    #line 913 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r120()
+    {
+        $this->_retvalue = $this->compiler->compileConfigVariable($this->yystack[$this->yyidx + - 1]->minor);
+    }
+
+    #line 917 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r121()
+    {
+        $this->_retvalue =
+            '(is_array($tmp = ' . $this->compiler->compileConfigVariable($this->yystack[$this->yyidx + - 2]->minor) .
+            ') ? $tmp' . $this->yystack[$this->yyidx + 0]->minor . ' : null)';
+    }
+
+    #line 921 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r122()
+    {
+        $this->_retvalue = array('var' => '\'' . substr($this->yystack[$this->yyidx + - 1]->minor, 1) . '\'',
+                                 'smarty_internal_index' => $this->yystack[$this->yyidx + 0]->minor);
+    }
+
+    #line 924 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r123()
+    {
+        $this->_retvalue = array('var'                   => $this->yystack[$this->yyidx + - 1]->minor,
+                                 'smarty_internal_index' => $this->yystack[$this->yyidx + 0]->minor);
+    }
+
+    #line 937 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r125()
+    {
+        return;
+    }
+
+    #line 943 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r126()
+    {
+        $this->_retvalue =
+            '[' . $this->compiler->compileVariable('\'' . substr($this->yystack[$this->yyidx + 0]->minor, 1) . '\'') .
+            ']';
+    }
+
+    #line 946 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r127()
+    {
+        $this->_retvalue = '[' . $this->compiler->compileVariable($this->yystack[$this->yyidx + 0]->minor) . ']';
+    }
+
+    #line 950 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r128()
+    {
+        $this->_retvalue = '[' . $this->compiler->compileVariable($this->yystack[$this->yyidx + - 2]->minor) . '->' .
+            $this->yystack[$this->yyidx + 0]->minor . ']';
+    }
+
+    #line 954 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r129()
+    {
+        if (defined($this->yystack[$this->yyidx + 0]->minor)) {
+            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 . "']";
+        }
+    }
+
+    #line 965 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r130()
+    {
+        $this->_retvalue = '[' . $this->yystack[$this->yyidx + 0]->minor . ']';
+    }
+
+    #line 970 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r131()
+    {
+        $this->_retvalue = '[' . $this->yystack[$this->yyidx + - 1]->minor . ']';
+    }
+
+    #line 975 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r132()
+    {
+        $this->_retvalue = '[' . $this->compiler->compileTag('private_special_variable', array(), '[\'section\'][\'' .
+                                                                                       $this->yystack[$this->yyidx +
+                                                                                       - 1]->minor . '\'][\'index\']') .
+            ']';
+    }
+
+    #line 979 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r133()
+    {
+        $this->_retvalue = '[' . $this->compiler->compileTag('private_special_variable', array(), '[\'section\'][\'' .
+                                                                                       $this->yystack[$this->yyidx +
+                                                                                       - 3]->minor . '\'][\'' .
+                                                                                       $this->yystack[$this->yyidx +
+                                                                                       - 1]->minor . '\']') . ']';
+    }
+
+    #line 982 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r134()
+    {
+        $this->_retvalue = '[' . $this->yystack[$this->yyidx + - 1]->minor . ']';
+    }
+
+    #line 988 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r136()
+    {
+        $this->_retvalue =
+            '[' . $this->compiler->compileVariable('\'' . substr($this->yystack[$this->yyidx + - 1]->minor, 1) . '\'') .
+            ']';;
+    }
+
+    #line 1004 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r140()
+    {
+        $this->_retvalue = '[]';
+    }
+
+    #line 1014 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r141()
+    {
+        $this->_retvalue = '\'' . substr($this->yystack[$this->yyidx + 0]->minor, 1) . '\'';
+    }
+
+    #line 1018 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r142()
+    {
+        $this->_retvalue = "''";
+    }
+
+    #line 1023 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r143()
+    {
+        $this->_retvalue = $this->yystack[$this->yyidx + - 1]->minor . '.' . $this->yystack[$this->yyidx + 0]->minor;
+    }
+
+    #line 1031 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r145()
+    {
+        $var = trim(substr($this->yystack[$this->yyidx + 0]->minor, $this->lex->ldel_length, - $this->lex->rdel_length),
+                    ' $');
+        $this->_retvalue = $this->compiler->compileVariable('\'' . $var . '\'');
+    }
+
+    #line 1037 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r146()
+    {
+        $this->_retvalue = '(' . $this->yystack[$this->yyidx + - 1]->minor . ')';
+    }
+
+    #line 1044 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r147()
+    {
+        if ($this->yystack[$this->yyidx + - 1]->minor['var'] == '\'smarty\'') {
+            $this->_retvalue = $this->compiler->compileTag('private_special_variable', array(),
+                                                           $this->yystack[$this->yyidx +
+                                                           - 1]->minor['smarty_internal_index']) .
+                $this->yystack[$this->yyidx + 0]->minor;
+        } else {
+            $this->_retvalue = $this->compiler->compileVariable($this->yystack[$this->yyidx + - 1]->minor['var']) .
+                $this->yystack[$this->yyidx + - 1]->minor['smarty_internal_index'] .
+                $this->yystack[$this->yyidx + 0]->minor;
+        }
+    }
+
+    #line 1053 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r148()
+    {
+        $this->_retvalue = $this->yystack[$this->yyidx + 0]->minor;
+    }
+
+    #line 1058 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r149()
+    {
+        $this->_retvalue = $this->yystack[$this->yyidx + - 1]->minor . $this->yystack[$this->yyidx + 0]->minor;
+    }
+
+    #line 1063 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r150()
+    {
+        if ($this->security && substr($this->yystack[$this->yyidx + - 1]->minor, 0, 1) == '_') {
+            $this->compiler->trigger_template_error(self::Err1);
+        }
+        $this->_retvalue = '->' . $this->yystack[$this->yyidx + - 1]->minor . $this->yystack[$this->yyidx + 0]->minor;
+    }
+
+    #line 1070 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r151()
+    {
+        if ($this->security) {
+            $this->compiler->trigger_template_error(self::Err2);
+        }
+        $this->_retvalue = '->{' . $this->compiler->compileVariable($this->yystack[$this->yyidx + - 1]->minor) .
+            $this->yystack[$this->yyidx + 0]->minor . '}';
+    }
+
+    #line 1077 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r152()
+    {
+        if ($this->security) {
+            $this->compiler->trigger_template_error(self::Err2);
+        }
+        $this->_retvalue =
+            '->{' . $this->yystack[$this->yyidx + - 2]->minor . $this->yystack[$this->yyidx + 0]->minor . '}';
+    }
+
+    #line 1084 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r153()
+    {
+        if ($this->security) {
+            $this->compiler->trigger_template_error(self::Err2);
+        }
+        $this->_retvalue =
+            '->{\'' . $this->yystack[$this->yyidx + - 4]->minor . '\'.' . $this->yystack[$this->yyidx + - 2]->minor .
+            $this->yystack[$this->yyidx + 0]->minor . '}';
+    }
+
+    #line 1092 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r154()
+    {
+        $this->_retvalue = '->' . $this->yystack[$this->yyidx + 0]->minor;
+    }
+
+    #line 1100 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r155()
+    {
+        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') {
+                    if (count($this->yystack[$this->yyidx + - 1]->minor) == 0) {
+                        $this->compiler->trigger_template_error('Illegal number of paramer in "isset()"');
+                    }
+                    $par = implode(',', $this->yystack[$this->yyidx + - 1]->minor);
+                    if (strncasecmp($par, '$_smarty_tpl->smarty->ext->_config->_getConfigVariable',
+                                    strlen('$_smarty_tpl->smarty->ext->_config->_getConfigVariable')) === 0
+                    ) {
+                        self::$prefix_number ++;
+                        $this->compiler->prefix_code[] =
+                            '<?php $_tmp' . self::$prefix_number . '=' . str_replace(')', ', false)', $par) . ';?>';
+                        $isset_par = '$_tmp' . self::$prefix_number;
+                    } else {
+                        $isset_par = str_replace("')->value", "',null,true,false)->value", $par);
+                    }
+                    $this->_retvalue = $this->yystack[$this->yyidx + - 3]->minor . "(" . $isset_par . ")";
+                } elseif (in_array($func_name, array('empty', 'reset', 'current', 'end', 'prev', 'next'))) {
+                    if (count($this->yystack[$this->yyidx + - 1]->minor) != 1) {
+                        $this->compiler->trigger_template_error('Illegal number of paramer in "empty()"');
+                    }
+                    if ($func_name == 'empty') {
+                        $this->_retvalue = $func_name . '(' . str_replace("')->value", "',null,true,false)->value",
+                                                                          $this->yystack[$this->yyidx +
+                                                                          - 1]->minor[0]) . ')';
+                    } else {
+                        $this->_retvalue = $func_name . '(' . $this->yystack[$this->yyidx + - 1]->minor[0] . ')';
+                    }
                 } else {
-                    $this->_retvalue = $func_name.'('.$this->yystack[$this->yyidx + -1]->minor[0].')';
+                    $this->_retvalue = $this->yystack[$this->yyidx + - 3]->minor . "(" .
+                        implode(',', $this->yystack[$this->yyidx + - 1]->minor) . ")";
                 }
             } else {
-                $this->_retvalue = $this->yystack[$this->yyidx + -3]->minor . "(". implode(',',$this->yystack[$this->yyidx + -1]->minor) .")";
+                $this->compiler->trigger_template_error("unknown function \"" .
+                                                        $this->yystack[$this->yyidx + - 3]->minor . "\"");
             }
-        } else {
-            $this->compiler->trigger_template_error ("unknown function \"" . $this->yystack[$this->yyidx + -3]->minor . "\"");
         }
     }
+
+    #line 1139 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r156()
+    {
+        if ($this->security && substr($this->yystack[$this->yyidx + - 3]->minor, 0, 1) == '_') {
+            $this->compiler->trigger_template_error(self::Err1);
+        }
+        $this->_retvalue =
+            $this->yystack[$this->yyidx + - 3]->minor . "(" . implode(',', $this->yystack[$this->yyidx + - 1]->minor) .
+            ")";
+    }
+
+    #line 1146 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r157()
+    {
+        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('\'' . substr($this->yystack[$this->yyidx + - 3]->minor, 1) . '\'') .
+            ';?>';
+        $this->_retvalue =
+            '$_tmp' . self::$prefix_number . '(' . implode(',', $this->yystack[$this->yyidx + - 1]->minor) . ')';
+    }
+
+    #line 1157 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r158()
+    {
+        $this->_retvalue =
+            array_merge($this->yystack[$this->yyidx + - 2]->minor, array($this->yystack[$this->yyidx + 0]->minor));
+    }
+
+    #line 1174 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r161()
+    {
+        $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 1178 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r162()
+    {
+        $this->_retvalue =
+            array(array_merge($this->yystack[$this->yyidx + - 1]->minor, $this->yystack[$this->yyidx + 0]->minor));
+    }
+
+    #line 1186 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r164()
+    {
+        $this->_retvalue = array($this->yystack[$this->yyidx + 0]->minor);
+    }
+
+    #line 1194 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r165()
+    {
+        $this->_retvalue =
+            array_merge($this->yystack[$this->yyidx + - 1]->minor, $this->yystack[$this->yyidx + 0]->minor);
+    }
+
+    #line 1213 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r169()
+    {
+        $this->_retvalue = array($this->yystack[$this->yyidx + 0]->minor, '', 'method');
+    }
+
+    #line 1218 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r170()
+    {
+        $this->_retvalue =
+            array($this->yystack[$this->yyidx + - 1]->minor, $this->yystack[$this->yyidx + 0]->minor, 'method');
+    }
+
+    #line 1223 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r171()
+    {
+        $this->_retvalue = array($this->yystack[$this->yyidx + 0]->minor, '');
+    }
+
+    #line 1228 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r172()
+    {
+        $this->_retvalue =
+            array($this->yystack[$this->yyidx + - 1]->minor, $this->yystack[$this->yyidx + 0]->minor, 'property');
+    }
+
+    #line 1233 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r173()
+    {
+        $this->_retvalue = array($this->yystack[$this->yyidx + - 2]->minor,
+                                 $this->yystack[$this->yyidx + - 1]->minor . $this->yystack[$this->yyidx + 0]->minor,
+                                 'property');
+    }
+
+    #line 1239 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r174()
+    {
+        $this->_retvalue['op'] = ' ' . trim($this->yystack[$this->yyidx + 0]->minor) . ' ';
+    }
+
+    #line 1243 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r175()
+    {
+        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(preg_replace('/\s*/', '', $this->yystack[$this->yyidx + 0]->minor));
+        $this->_retvalue = $lops[$op];
+    }
+
+    #line 1269 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r176()
+    {
+        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 1283 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r177()
+    {
+        $this->_retvalue = 'array(' . $this->yystack[$this->yyidx + - 1]->minor . ')';
+    }
+
+    #line 1291 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r179()
+    {
+        $this->_retvalue = $this->yystack[$this->yyidx + - 2]->minor . ',' . $this->yystack[$this->yyidx + 0]->minor;
+    }
+
+    #line 1299 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r181()
+    {
+        $this->_retvalue = $this->yystack[$this->yyidx + - 2]->minor . '=>' . $this->yystack[$this->yyidx + 0]->minor;
+    }
+
+    #line 1303 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r182()
+    {
+        $this->_retvalue =
+            '\'' . $this->yystack[$this->yyidx + - 2]->minor . '\'=>' . $this->yystack[$this->yyidx + 0]->minor;
+    }
+
+    #line 1319 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r185()
+    {
+        $this->_retvalue = $this->yystack[$this->yyidx + - 1]->minor->to_smarty_php($this);
+    }
+
+    #line 1324 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r186()
+    {
+        $this->yystack[$this->yyidx + - 1]->minor->append_subtree($this, $this->yystack[$this->yyidx + 0]->minor);
+        $this->_retvalue = $this->yystack[$this->yyidx + - 1]->minor;
+    }
+
+    #line 1329 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r187()
+    {
+        $this->_retvalue = new Smarty_Internal_ParseTree_Dq($this, $this->yystack[$this->yyidx + 0]->minor);
+    }
+
+    #line 1333 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r188()
+    {
+        $this->_retvalue = new Smarty_Internal_ParseTree_Code('(string)' . $this->yystack[$this->yyidx + - 1]->minor);
+    }
+
+    #line 1341 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r190()
+    {
+        $this->_retvalue = new Smarty_Internal_ParseTree_Code('(string)$_smarty_tpl->tpl_vars[\'' .
+                                                              substr($this->yystack[$this->yyidx + 0]->minor, 1) .
+                                                              '\']->value');
+    }
+
+    #line 1349 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r192()
+    {
+        $this->_retvalue =
+            new Smarty_Internal_ParseTree_Code('(string)(' . $this->yystack[$this->yyidx + - 1]->minor . ')');
+    }
+
+    #line 1353 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r193()
+    {
+        $this->_retvalue = new Smarty_Internal_ParseTree_Tag($this, $this->yystack[$this->yyidx + 0]->minor);
+    }
+
+    #line 1357 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r194()
+    {
+        $this->_retvalue = new Smarty_Internal_ParseTree_DqContent($this->yystack[$this->yyidx + 0]->minor);
     }
-#line 2900 "smarty_internal_templateparser.php"
-#line 1007 "smarty_internal_templateparser.y"
-    function yy_r154(){
-    if ($this->security && substr($this->yystack[$this->yyidx + -3]->minor,0,1) == '_') {
-        $this->compiler->trigger_template_error (self::Err1);
-    }
-    $this->_retvalue = $this->yystack[$this->yyidx + -3]->minor . "(". implode(',',$this->yystack[$this->yyidx + -1]->minor) .")";
-    }
-#line 2908 "smarty_internal_templateparser.php"
-#line 1014 "smarty_internal_templateparser.y"
-    function yy_r155(){
-    if ($this->security) {
-        $this->compiler->trigger_template_error (self::Err2);
-    }
-    $this->prefix_number++;
-    $this->compiler->prefix_code[] = '<?php $_tmp'.$this->prefix_number.'='.$this->compileVariable("'".$this->yystack[$this->yyidx + -3]->minor."'").';?>';
-    $this->_retvalue = '$_tmp'.$this->prefix_number.'('. implode(',',$this->yystack[$this->yyidx + -1]->minor) .')';
-    }
-#line 2918 "smarty_internal_templateparser.php"
-#line 1025 "smarty_internal_templateparser.y"
-    function yy_r156(){
-    $this->_retvalue = array_merge($this->yystack[$this->yyidx + -2]->minor,array($this->yystack[$this->yyidx + 0]->minor));
-    }
-#line 2923 "smarty_internal_templateparser.php"
-#line 1042 "smarty_internal_templateparser.y"
-    function yy_r159(){
-    $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 2928 "smarty_internal_templateparser.php"
-#line 1046 "smarty_internal_templateparser.y"
-    function yy_r160(){
-    $this->_retvalue = array(array_merge($this->yystack[$this->yyidx + -1]->minor,$this->yystack[$this->yyidx + 0]->minor));
-    }
-#line 2933 "smarty_internal_templateparser.php"
-#line 1054 "smarty_internal_templateparser.y"
-    function yy_r162(){
-    $this->_retvalue =  array($this->yystack[$this->yyidx + 0]->minor);
-    }
-#line 2938 "smarty_internal_templateparser.php"
-#line 1062 "smarty_internal_templateparser.y"
-    function yy_r163(){
-    $this->_retvalue = array_merge($this->yystack[$this->yyidx + -1]->minor,$this->yystack[$this->yyidx + 0]->minor);
-    }
-#line 2943 "smarty_internal_templateparser.php"
-#line 1096 "smarty_internal_templateparser.y"
-    function yy_r170(){
-    $this->_retvalue = '$'.$this->yystack[$this->yyidx + -1]->minor.$this->yystack[$this->yyidx + 0]->minor;
-    }
-#line 2948 "smarty_internal_templateparser.php"
-#line 1101 "smarty_internal_templateparser.y"
-    function yy_r171(){
-    $this->_retvalue = '$'.$this->yystack[$this->yyidx + -2]->minor.$this->yystack[$this->yyidx + -1]->minor.$this->yystack[$this->yyidx + 0]->minor;
-    }
-#line 2953 "smarty_internal_templateparser.php"
-#line 1107 "smarty_internal_templateparser.y"
-    function yy_r172(){
-    $this->_retvalue = '==';
-    }
-#line 2958 "smarty_internal_templateparser.php"
-#line 1111 "smarty_internal_templateparser.y"
-    function yy_r173(){
-    $this->_retvalue = '!=';
-    }
-#line 2963 "smarty_internal_templateparser.php"
-#line 1115 "smarty_internal_templateparser.y"
-    function yy_r174(){
-    $this->_retvalue = '>';
-    }
-#line 2968 "smarty_internal_templateparser.php"
-#line 1119 "smarty_internal_templateparser.y"
-    function yy_r175(){
-    $this->_retvalue = '<';
-    }
-#line 2973 "smarty_internal_templateparser.php"
-#line 1123 "smarty_internal_templateparser.y"
-    function yy_r176(){
-    $this->_retvalue = '>=';
-    }
-#line 2978 "smarty_internal_templateparser.php"
-#line 1127 "smarty_internal_templateparser.y"
-    function yy_r177(){
-    $this->_retvalue = '<=';
-    }
-#line 2983 "smarty_internal_templateparser.php"
-#line 1131 "smarty_internal_templateparser.y"
-    function yy_r178(){
-    $this->_retvalue = '===';
-    }
-#line 2988 "smarty_internal_templateparser.php"
-#line 1135 "smarty_internal_templateparser.y"
-    function yy_r179(){
-    $this->_retvalue = '!==';
-    }
-#line 2993 "smarty_internal_templateparser.php"
-#line 1139 "smarty_internal_templateparser.y"
-    function yy_r180(){
-    $this->_retvalue = '%';
-    }
-#line 2998 "smarty_internal_templateparser.php"
-#line 1143 "smarty_internal_templateparser.y"
-    function yy_r181(){
-    $this->_retvalue = '&&';
-    }
-#line 3003 "smarty_internal_templateparser.php"
-#line 1147 "smarty_internal_templateparser.y"
-    function yy_r182(){
-    $this->_retvalue = '||';
-    }
-#line 3008 "smarty_internal_templateparser.php"
-#line 1151 "smarty_internal_templateparser.y"
-    function yy_r183(){
-    $this->_retvalue = ' XOR ';
-    }
-#line 3013 "smarty_internal_templateparser.php"
-#line 1158 "smarty_internal_templateparser.y"
-    function yy_r184(){
-    $this->_retvalue = 'array('.$this->yystack[$this->yyidx + -1]->minor.')';
-    }
-#line 3018 "smarty_internal_templateparser.php"
-#line 1166 "smarty_internal_templateparser.y"
-    function yy_r186(){
-    $this->_retvalue = $this->yystack[$this->yyidx + -2]->minor.','.$this->yystack[$this->yyidx + 0]->minor;
-    }
-#line 3023 "smarty_internal_templateparser.php"
-#line 1174 "smarty_internal_templateparser.y"
-    function yy_r188(){
-    $this->_retvalue = $this->yystack[$this->yyidx + -2]->minor.'=>'.$this->yystack[$this->yyidx + 0]->minor;
-    }
-#line 3028 "smarty_internal_templateparser.php"
-#line 1178 "smarty_internal_templateparser.y"
-    function yy_r189(){
-    $this->_retvalue = '\''.$this->yystack[$this->yyidx + -2]->minor.'\'=>'.$this->yystack[$this->yyidx + 0]->minor;
-    }
-#line 3033 "smarty_internal_templateparser.php"
-#line 1190 "smarty_internal_templateparser.y"
-    function yy_r191(){
-    $this->_retvalue = "''";
-    }
-#line 3038 "smarty_internal_templateparser.php"
-#line 1194 "smarty_internal_templateparser.y"
-    function yy_r192(){
-    $this->_retvalue = $this->yystack[$this->yyidx + -1]->minor->to_smarty_php();
-    }
-#line 3043 "smarty_internal_templateparser.php"
-#line 1199 "smarty_internal_templateparser.y"
-    function yy_r193(){
-    $this->yystack[$this->yyidx + -1]->minor->append_subtree($this->yystack[$this->yyidx + 0]->minor);
-    $this->_retvalue = $this->yystack[$this->yyidx + -1]->minor;
-    }
-#line 3049 "smarty_internal_templateparser.php"
-#line 1204 "smarty_internal_templateparser.y"
-    function yy_r194(){
-    $this->_retvalue = new _smarty_doublequoted($this, $this->yystack[$this->yyidx + 0]->minor);
-    }
-#line 3054 "smarty_internal_templateparser.php"
-#line 1208 "smarty_internal_templateparser.y"
-    function yy_r195(){
-    $this->_retvalue = new _smarty_code($this, '(string)'.$this->yystack[$this->yyidx + -1]->minor);
-    }
-#line 3059 "smarty_internal_templateparser.php"
-#line 1216 "smarty_internal_templateparser.y"
-    function yy_r197(){
-    $this->_retvalue = new _smarty_code($this, '(string)$_smarty_tpl->tpl_vars[\''. substr($this->yystack[$this->yyidx + 0]->minor,1) .'\']->value');
-    }
-#line 3064 "smarty_internal_templateparser.php"
-#line 1224 "smarty_internal_templateparser.y"
-    function yy_r199(){
-    $this->_retvalue = new _smarty_code($this, '(string)('.$this->yystack[$this->yyidx + -1]->minor.')');
-    }
-#line 3069 "smarty_internal_templateparser.php"
-#line 1228 "smarty_internal_templateparser.y"
-    function yy_r200(){
-    $this->_retvalue = new _smarty_tag($this, $this->yystack[$this->yyidx + 0]->minor);
-    }
-#line 3074 "smarty_internal_templateparser.php"
-#line 1232 "smarty_internal_templateparser.y"
-    function yy_r201(){
-    $this->_retvalue = new _smarty_dq_content($this, $this->yystack[$this->yyidx + 0]->minor);
-    }
-#line 3079 "smarty_internal_templateparser.php"
 
     private $_retvalue;
 
-    function yy_reduce($yyruleno)
+    public function yy_reduce($yyruleno)
     {
-        $yymsp = $this->yystack[$this->yyidx];
-        if (self::$yyTraceFILE && $yyruleno >= 0
-              && $yyruleno < count(self::$yyRuleName)) {
-            fprintf(self::$yyTraceFILE, "%sReduce (%d) [%s].\n",
-                self::$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]}();
             $yy_lefthand_side = $this->_retvalue;
         }
-        $yygoto = self::$yyRuleInfo[$yyruleno]['lhs'];
-        $yysize = self::$yyRuleInfo[$yyruleno]['rhs'];
+        $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 (!self::$yyTraceFILE && $yysize) {
-                $this->yyidx++;
+            if (!$this->yyTraceFILE && $yysize) {
+                $this->yyidx ++;
                 $x = new TP_yyStackEntry;
                 $x->stateno = $yyact;
                 $x->major = $yygoto;
@@ -3125,73 +2735,68 @@ static public $yy_action = array(
         }
     }
 
-    function yy_parse_failed()
+    public function yy_parse_failed()
     {
-        if (self::$yyTraceFILE) {
-            fprintf(self::$yyTraceFILE, "%sFail!\n", self::$yyTracePrompt);
+        if ($this->yyTraceFILE) {
+            fprintf($this->yyTraceFILE, "%sFail!\n", $this->yyTracePrompt);
         }
         while ($this->yyidx >= 0) {
             $this->yy_pop_parser_stack();
         }
     }
 
-    function yy_syntax_error($yymajor, $TOKEN)
+    public function yy_syntax_error($yymajor, $TOKEN)
     {
-#line 77 "smarty_internal_templateparser.y"
+        #line 207 "../smarty/lexer/smarty_internal_templateparser.y"
 
-    $this->internalError = true;
-    $this->yymajor = $yymajor;
-    $this->compiler->trigger_template_error();
-#line 3142 "smarty_internal_templateparser.php"
+        $this->internalError = true;
+        $this->yymajor = $yymajor;
+        $this->compiler->trigger_template_error();
     }
 
-    function yy_accept()
+    public function yy_accept()
     {
-        if (self::$yyTraceFILE) {
-            fprintf(self::$yyTraceFILE, "%sAccept!\n", self::$yyTracePrompt);
+        if ($this->yyTraceFILE) {
+            fprintf($this->yyTraceFILE, "%sAccept!\n", $this->yyTracePrompt);
         }
         while ($this->yyidx >= 0) {
-            $stack = $this->yy_pop_parser_stack();
+            $this->yy_pop_parser_stack();
         }
-#line 69 "smarty_internal_templateparser.y"
+        #line 200 "../smarty/lexer/smarty_internal_templateparser.y"
 
-    $this->successful = !$this->internalError;
-    $this->internalError = false;
-    $this->retvalue = $this->_retvalue;
-    //echo $this->retvalue."\n\n";
-#line 3160 "smarty_internal_templateparser.php"
+        $this->successful = !$this->internalError;
+        $this->internalError = false;
+        $this->retvalue = $this->_retvalue;
     }
 
-    function doParse($yymajor, $yytokenvalue)
+    public function doParse($yymajor, $yytokenvalue)
     {
         $yyerrorhit = 0;   /* True if yymajor has invoked an error */
 
         if ($this->yyidx === null || $this->yyidx < 0) {
             $this->yyidx = 0;
-            $this->yyerrcnt = -1;
+            $this->yyerrcnt = - 1;
             $x = new TP_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 (self::$yyTraceFILE) {
-            fprintf(self::$yyTraceFILE, "%sInput %s\n",
-                self::$yyTracePrompt, $this->yyTokenName[$yymajor]);
+        if ($this->yyTraceFILE) {
+            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 {
@@ -3200,30 +2805,27 @@ static public $yy_action = array(
             } elseif ($yyact < self::YYNSTATE + self::YYNRULE) {
                 $this->yy_reduce($yyact - self::YYNSTATE);
             } elseif ($yyact == self::YY_ERROR_ACTION) {
-                if (self::$yyTraceFILE) {
-                    fprintf(self::$yyTraceFILE, "%sSyntax Error!\n",
-                        self::$yyTracePrompt);
+                if ($this->yyTraceFILE) {
+                    fprintf($this->yyTraceFILE, "%sSyntax Error!\n", $this->yyTracePrompt);
                 }
                 if (self::YYERRORSYMBOL) {
                     if ($this->yyerrcnt < 0) {
                         $this->yy_syntax_error($yymajor, $yytokenvalue);
                     }
                     $yymx = $this->yystack[$this->yyidx]->major;
-                    if ($yymx == self::YYERRORSYMBOL || $yyerrorhit ){
-                        if (self::$yyTraceFILE) {
-                            fprintf(self::$yyTraceFILE, "%sDiscard input token %s\n",
-                                self::$yyTracePrompt, $this->yyTokenName[$yymajor]);
+                    if ($yymx == self::YYERRORSYMBOL || $yyerrorhit) {
+                        if ($this->yyTraceFILE) {
+                            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;
@@ -3252,3 +2854,4 @@ static public $yy_action = array(
         } while ($yymajor != self::YYNOCODE && $this->yyidx >= 0);
     }
 }
+
diff --git a/include/smarty/libs/sysplugins/smarty_internal_testinstall.php b/include/smarty/libs/sysplugins/smarty_internal_testinstall.php
new file mode 100644
index 000000000..72d9a5211
--- /dev/null
+++ b/include/smarty/libs/sysplugins/smarty_internal_testinstall.php
@@ -0,0 +1,604 @@
+<?php
+/**
+ * Smarty Internal TestInstall
+ * Test Smarty installation
+ *
+ * @package    Smarty
+ * @subpackage Utilities
+ * @author     Uwe Tews
+ */
+
+/**
+ * TestInstall class
+ *
+ * @package    Smarty
+ * @subpackage Utilities
+ */
+class Smarty_Internal_TestInstall
+{
+    /**
+     * diagnose Smarty setup
+     * If $errors is secified, the diagnostic report will be appended to the array, rather than being output.
+     *
+     * @param  array $errors array to push results into rather than outputting them
+     *
+     * @return bool   status, true if everything is fine, false else
+     */
+    public static function testInstall(Smarty $smarty, &$errors = null)
+    {
+        $status = true;
+
+        if ($errors === null) {
+            echo "<PRE>\n";
+            echo "Smarty Installation test...\n";
+            echo "Testing template directory...\n";
+        }
+
+        $_stream_resolve_include_path = function_exists('stream_resolve_include_path');
+
+        // test if all registered template_dir are accessible
+        foreach ($smarty->getTemplateDir() as $template_dir) {
+            $_template_dir = $template_dir;
+            $template_dir = realpath($template_dir);
+            // resolve include_path or fail existence
+            if (!$template_dir) {
+                if ($smarty->use_include_path && !preg_match('/^([\/\\\\]|[a-zA-Z]:[\/\\\\])/', $_template_dir)) {
+                    // try PHP include_path
+                    if ($_stream_resolve_include_path) {
+                        $template_dir = stream_resolve_include_path($_template_dir);
+                    } else {
+                        $template_dir = $smarty->ext->_getIncludePath->getIncludePath($_template_dir, null, $smarty);
+                    }
+
+                    if ($template_dir !== false) {
+                        if ($errors === null) {
+                            echo "$template_dir is OK.\n";
+                        }
+
+                        continue;
+                    } else {
+                        $status = false;
+                        $message =
+                            "FAILED: $_template_dir does not exist (and couldn't be found in include_path either)";
+                        if ($errors === null) {
+                            echo $message . ".\n";
+                        } else {
+                            $errors[ 'template_dir' ] = $message;
+                        }
+
+                        continue;
+                    }
+                } else {
+                    $status = false;
+                    $message = "FAILED: $_template_dir does not exist";
+                    if ($errors === null) {
+                        echo $message . ".\n";
+                    } else {
+                        $errors[ 'template_dir' ] = $message;
+                    }
+
+                    continue;
+                }
+            }
+
+            if (!is_dir($template_dir)) {
+                $status = false;
+                $message = "FAILED: $template_dir is not a directory";
+                if ($errors === null) {
+                    echo $message . ".\n";
+                } else {
+                    $errors[ 'template_dir' ] = $message;
+                }
+            } elseif (!is_readable($template_dir)) {
+                $status = false;
+                $message = "FAILED: $template_dir is not readable";
+                if ($errors === null) {
+                    echo $message . ".\n";
+                } else {
+                    $errors[ 'template_dir' ] = $message;
+                }
+            } else {
+                if ($errors === null) {
+                    echo "$template_dir is OK.\n";
+                }
+            }
+        }
+
+        if ($errors === null) {
+            echo "Testing compile directory...\n";
+        }
+
+        // test if registered compile_dir is accessible
+        $__compile_dir = $smarty->getCompileDir();
+        $_compile_dir = realpath($__compile_dir);
+        if (!$_compile_dir) {
+            $status = false;
+            $message = "FAILED: {$__compile_dir} does not exist";
+            if ($errors === null) {
+                echo $message . ".\n";
+            } else {
+                $errors[ 'compile_dir' ] = $message;
+            }
+        } elseif (!is_dir($_compile_dir)) {
+            $status = false;
+            $message = "FAILED: {$_compile_dir} is not a directory";
+            if ($errors === null) {
+                echo $message . ".\n";
+            } else {
+                $errors[ 'compile_dir' ] = $message;
+            }
+        } elseif (!is_readable($_compile_dir)) {
+            $status = false;
+            $message = "FAILED: {$_compile_dir} is not readable";
+            if ($errors === null) {
+                echo $message . ".\n";
+            } else {
+                $errors[ 'compile_dir' ] = $message;
+            }
+        } elseif (!is_writable($_compile_dir)) {
+            $status = false;
+            $message = "FAILED: {$_compile_dir} is not writable";
+            if ($errors === null) {
+                echo $message . ".\n";
+            } else {
+                $errors[ 'compile_dir' ] = $message;
+            }
+        } else {
+            if ($errors === null) {
+                echo "{$_compile_dir} is OK.\n";
+            }
+        }
+
+        if ($errors === null) {
+            echo "Testing plugins directory...\n";
+        }
+
+        // test if all registered plugins_dir are accessible
+        // and if core plugins directory is still registered
+        $_core_plugins_dir = realpath(dirname(__FILE__) . '/../plugins');
+        $_core_plugins_available = false;
+        foreach ($smarty->getPluginsDir() as $plugin_dir) {
+            $_plugin_dir = $plugin_dir;
+            $plugin_dir = realpath($plugin_dir);
+            // resolve include_path or fail existence
+            if (!$plugin_dir) {
+                if ($smarty->use_include_path && !preg_match('/^([\/\\\\]|[a-zA-Z]:[\/\\\\])/', $_plugin_dir)) {
+                    // try PHP include_path
+                    if ($_stream_resolve_include_path) {
+                        $plugin_dir = stream_resolve_include_path($_plugin_dir);
+                    } else {
+                        $plugin_dir = $smarty->ext->_getIncludePath->getIncludePath($_plugin_dir, null, $smarty);
+                    }
+
+                    if ($plugin_dir !== false) {
+                        if ($errors === null) {
+                            echo "$plugin_dir is OK.\n";
+                        }
+
+                        continue;
+                    } else {
+                        $status = false;
+                        $message = "FAILED: $_plugin_dir does not exist (and couldn't be found in include_path either)";
+                        if ($errors === null) {
+                            echo $message . ".\n";
+                        } else {
+                            $errors[ 'plugins_dir' ] = $message;
+                        }
+
+                        continue;
+                    }
+                } else {
+                    $status = false;
+                    $message = "FAILED: $_plugin_dir does not exist";
+                    if ($errors === null) {
+                        echo $message . ".\n";
+                    } else {
+                        $errors[ 'plugins_dir' ] = $message;
+                    }
+
+                    continue;
+                }
+            }
+
+            if (!is_dir($plugin_dir)) {
+                $status = false;
+                $message = "FAILED: $plugin_dir is not a directory";
+                if ($errors === null) {
+                    echo $message . ".\n";
+                } else {
+                    $errors[ 'plugins_dir' ] = $message;
+                }
+            } elseif (!is_readable($plugin_dir)) {
+                $status = false;
+                $message = "FAILED: $plugin_dir is not readable";
+                if ($errors === null) {
+                    echo $message . ".\n";
+                } else {
+                    $errors[ 'plugins_dir' ] = $message;
+                }
+            } elseif ($_core_plugins_dir && $_core_plugins_dir == realpath($plugin_dir)) {
+                $_core_plugins_available = true;
+                if ($errors === null) {
+                    echo "$plugin_dir is OK.\n";
+                }
+            } else {
+                if ($errors === null) {
+                    echo "$plugin_dir is OK.\n";
+                }
+            }
+        }
+        if (!$_core_plugins_available) {
+            $status = false;
+            $message = "WARNING: Smarty's own libs/plugins is not available";
+            if ($errors === null) {
+                echo $message . ".\n";
+            } elseif (!isset($errors[ 'plugins_dir' ])) {
+                $errors[ 'plugins_dir' ] = $message;
+            }
+        }
+
+        if ($errors === null) {
+            echo "Testing cache directory...\n";
+        }
+
+        // test if all registered cache_dir is accessible
+        $__cache_dir = $smarty->getCacheDir();
+        $_cache_dir = realpath($__cache_dir);
+        if (!$_cache_dir) {
+            $status = false;
+            $message = "FAILED: {$__cache_dir} does not exist";
+            if ($errors === null) {
+                echo $message . ".\n";
+            } else {
+                $errors[ 'cache_dir' ] = $message;
+            }
+        } elseif (!is_dir($_cache_dir)) {
+            $status = false;
+            $message = "FAILED: {$_cache_dir} is not a directory";
+            if ($errors === null) {
+                echo $message . ".\n";
+            } else {
+                $errors[ 'cache_dir' ] = $message;
+            }
+        } elseif (!is_readable($_cache_dir)) {
+            $status = false;
+            $message = "FAILED: {$_cache_dir} is not readable";
+            if ($errors === null) {
+                echo $message . ".\n";
+            } else {
+                $errors[ 'cache_dir' ] = $message;
+            }
+        } elseif (!is_writable($_cache_dir)) {
+            $status = false;
+            $message = "FAILED: {$_cache_dir} is not writable";
+            if ($errors === null) {
+                echo $message . ".\n";
+            } else {
+                $errors[ 'cache_dir' ] = $message;
+            }
+        } else {
+            if ($errors === null) {
+                echo "{$_cache_dir} is OK.\n";
+            }
+        }
+
+        if ($errors === null) {
+            echo "Testing configs directory...\n";
+        }
+
+        // test if all registered config_dir are accessible
+        foreach ($smarty->getConfigDir() as $config_dir) {
+            $_config_dir = $config_dir;
+            // resolve include_path or fail existence
+            if (!$config_dir) {
+                if ($smarty->use_include_path && !preg_match('/^([\/\\\\]|[a-zA-Z]:[\/\\\\])/', $_config_dir)) {
+                    // try PHP include_path
+                    if ($_stream_resolve_include_path) {
+                        $config_dir = stream_resolve_include_path($_config_dir);
+                    } else {
+                        $config_dir = $smarty->ext->_getIncludePath->getIncludePath($_config_dir, null, $smarty);
+                    }
+
+                    if ($config_dir !== false) {
+                        if ($errors === null) {
+                            echo "$config_dir is OK.\n";
+                        }
+
+                        continue;
+                    } else {
+                        $status = false;
+                        $message = "FAILED: $_config_dir does not exist (and couldn't be found in include_path either)";
+                        if ($errors === null) {
+                            echo $message . ".\n";
+                        } else {
+                            $errors[ 'config_dir' ] = $message;
+                        }
+
+                        continue;
+                    }
+                } else {
+                    $status = false;
+                    $message = "FAILED: $_config_dir does not exist";
+                    if ($errors === null) {
+                        echo $message . ".\n";
+                    } else {
+                        $errors[ 'config_dir' ] = $message;
+                    }
+
+                    continue;
+                }
+            }
+
+            if (!is_dir($config_dir)) {
+                $status = false;
+                $message = "FAILED: $config_dir is not a directory";
+                if ($errors === null) {
+                    echo $message . ".\n";
+                } else {
+                    $errors[ 'config_dir' ] = $message;
+                }
+            } elseif (!is_readable($config_dir)) {
+                $status = false;
+                $message = "FAILED: $config_dir is not readable";
+                if ($errors === null) {
+                    echo $message . ".\n";
+                } else {
+                    $errors[ 'config_dir' ] = $message;
+                }
+            } else {
+                if ($errors === null) {
+                    echo "$config_dir is OK.\n";
+                }
+            }
+        }
+
+        if ($errors === null) {
+            echo "Testing sysplugin files...\n";
+        }
+        // test if sysplugins are available
+        $source = SMARTY_SYSPLUGINS_DIR;
+        if (is_dir($source)) {
+            $expectedSysplugins = array('smartycompilerexception.php'                               => true,
+                                        'smartyexception.php'                                       => true,
+                                        'smarty_cacheresource.php'                                  => true,
+                                        'smarty_cacheresource_custom.php'                           => true,
+                                        'smarty_cacheresource_keyvaluestore.php'                    => true,
+                                        'smarty_data.php'                                           => true,
+                                        'smarty_internal_cacheresource_file.php'                    => true,
+                                        'smarty_internal_compilebase.php'                           => true,
+                                        'smarty_internal_compile_append.php'                        => true,
+                                        'smarty_internal_compile_assign.php'                        => true,
+                                        'smarty_internal_compile_block.php'                         => true,
+                                        'smarty_internal_compile_break.php'                         => true,
+                                        'smarty_internal_compile_call.php'                          => true,
+                                        'smarty_internal_compile_capture.php'                       => true,
+                                        'smarty_internal_compile_config_load.php'                   => true,
+                                        'smarty_internal_compile_continue.php'                      => true,
+                                        'smarty_internal_compile_debug.php'                         => true,
+                                        'smarty_internal_compile_eval.php'                          => true,
+                                        'smarty_internal_compile_extends.php'                       => true,
+                                        'smarty_internal_compile_for.php'                           => true,
+                                        'smarty_internal_compile_foreach.php'                       => true,
+                                        'smarty_internal_compile_function.php'                      => true,
+                                        'smarty_internal_compile_if.php'                            => true,
+                                        'smarty_internal_compile_include.php'                       => true,
+                                        'smarty_internal_compile_include_php.php'                   => true,
+                                        'smarty_internal_compile_insert.php'                        => true,
+                                        'smarty_internal_compile_ldelim.php'                        => true,
+                                        'smarty_internal_compile_nocache.php'                       => true,
+                                        'smarty_internal_compile_private_block_plugin.php'          => true,
+                                        'smarty_internal_compile_private_foreachsection.php'        => true,
+                                        'smarty_internal_compile_private_function_plugin.php'       => true,
+                                        'smarty_internal_compile_private_modifier.php'              => true,
+                                        'smarty_internal_compile_private_object_block_function.php' => true,
+                                        'smarty_internal_compile_private_object_function.php'       => true,
+                                        'smarty_internal_compile_private_php.php'                   => true,
+                                        'smarty_internal_compile_private_print_expression.php'      => true,
+                                        'smarty_internal_compile_private_registered_block.php'      => true,
+                                        'smarty_internal_compile_private_registered_function.php'   => true,
+                                        'smarty_internal_compile_private_special_variable.php'      => true,
+                                        'smarty_internal_compile_rdelim.php'                        => true,
+                                        'smarty_internal_compile_section.php'                       => true,
+                                        'smarty_internal_compile_setfilter.php'                     => true,
+                                        'smarty_internal_compile_shared_inheritance.php'            => true,
+                                        'smarty_internal_compile_while.php'                         => true,
+                                        'smarty_internal_configfilelexer.php'                       => true,
+                                        'smarty_internal_configfileparser.php'                      => true,
+                                        'smarty_internal_config_file_compiler.php'                  => true,
+                                        'smarty_internal_data.php'                                  => true,
+                                        'smarty_internal_debug.php'                                 => true,
+                                        'smarty_internal_extension_clear.php'                       => true,
+                                        'smarty_internal_extension_handler.php'                     => true,
+                                        'smarty_internal_method_addautoloadfilters.php'             => true,
+                                        'smarty_internal_method_adddefaultmodifiers.php'            => true,
+                                        'smarty_internal_method_append.php'                         => true,
+                                        'smarty_internal_method_appendbyref.php'                    => true,
+                                        'smarty_internal_method_assignbyref.php'                    => true,
+                                        'smarty_internal_method_assignglobal.php'                   => true,
+                                        'smarty_internal_method_clearallassign.php'                 => true,
+                                        'smarty_internal_method_clearallcache.php'                  => true,
+                                        'smarty_internal_method_clearassign.php'                    => true,
+                                        'smarty_internal_method_clearcache.php'                     => true,
+                                        'smarty_internal_method_clearcompiledtemplate.php'          => true,
+                                        'smarty_internal_method_clearconfig.php'                    => true,
+                                        'smarty_internal_method_compileallconfig.php'               => true,
+                                        'smarty_internal_method_compilealltemplates.php'            => true,
+                                        'smarty_internal_method_configload.php'                     => true,
+                                        'smarty_internal_method_createdata.php'                     => true,
+                                        'smarty_internal_method_getautoloadfilters.php'             => true,
+                                        'smarty_internal_method_getconfigvars.php'                  => true,
+                                        'smarty_internal_method_getdebugtemplate.php'               => true,
+                                        'smarty_internal_method_getdefaultmodifiers.php'            => true,
+                                        'smarty_internal_method_getregisteredobject.php'            => true,
+                                        'smarty_internal_method_getstreamvariable.php'              => true,
+                                        'smarty_internal_method_gettags.php'                        => true,
+                                        'smarty_internal_method_gettemplatevars.php'                => true,
+                                        'smarty_internal_method_loadfilter.php'                     => true,
+                                        'smarty_internal_method_loadplugin.php'                     => true,
+                                        'smarty_internal_method_mustcompile.php'                    => true,
+                                        'smarty_internal_method_registercacheresource.php'          => true,
+                                        'smarty_internal_method_registerclass.php'                  => true,
+                                        'smarty_internal_method_registerdefaultconfighandler.php'   => true,
+                                        'smarty_internal_method_registerdefaultpluginhandler.php'   => true,
+                                        'smarty_internal_method_registerdefaulttemplatehandler.php' => true,
+                                        'smarty_internal_method_registerfilter.php'                 => true,
+                                        'smarty_internal_method_registerobject.php'                 => true,
+                                        'smarty_internal_method_registerplugin.php'                 => true,
+                                        'smarty_internal_method_registerresource.php'               => true,
+                                        'smarty_internal_method_setautoloadfilters.php'             => true,
+                                        'smarty_internal_method_setdebugtemplate.php'               => true,
+                                        'smarty_internal_method_setdefaultmodifiers.php'            => true,
+                                        'smarty_internal_method_unloadfilter.php'                   => true,
+                                        'smarty_internal_method_unregistercacheresource.php'        => true,
+                                        'smarty_internal_method_unregisterfilter.php'               => true,
+                                        'smarty_internal_method_unregisterobject.php'               => true,
+                                        'smarty_internal_method_unregisterplugin.php'               => true,
+                                        'smarty_internal_method_unregisterresource.php'             => true,
+                                        'smarty_internal_nocache_insert.php'                        => true,
+                                        'smarty_internal_parsetree.php'                             => true,
+                                        'smarty_internal_parsetree_code.php'                        => true,
+                                        'smarty_internal_parsetree_dq.php'                          => true,
+                                        'smarty_internal_parsetree_dqcontent.php'                   => true,
+                                        'smarty_internal_parsetree_tag.php'                         => true,
+                                        'smarty_internal_parsetree_template.php'                    => true,
+                                        'smarty_internal_parsetree_text.php'                        => true,
+                                        'smarty_internal_resource_eval.php'                         => true,
+                                        'smarty_internal_resource_extends.php'                      => true,
+                                        'smarty_internal_resource_file.php'                         => true,
+                                        'smarty_internal_resource_php.php'                          => true,
+                                        'smarty_internal_resource_registered.php'                   => true,
+                                        'smarty_internal_resource_stream.php'                       => true,
+                                        'smarty_internal_resource_string.php'                       => true,
+                                        'smarty_internal_runtime_cachemodify.php'                   => true,
+                                        'smarty_internal_runtime_codeframe.php'                     => true,
+                                        'smarty_internal_runtime_filterhandler.php'                 => true,
+                                        'smarty_internal_runtime_foreach.php'                       => true,
+                                        'smarty_internal_runtime_getincludepath.php'                => true,
+                                        'smarty_internal_runtime_hhvm.php'                          => true,
+                                        'smarty_internal_runtime_inheritance.php'                   => true,
+                                        'smarty_internal_runtime_subtemplate.php'                   => true,
+                                        'smarty_internal_runtime_tplfunction.php'                   => true,
+                                        'smarty_internal_runtime_updatecache.php'                   => true,
+                                        'smarty_internal_runtime_updatescope.php'                   => true,
+                                        'smarty_internal_runtime_validatecompiled.php'              => true,
+                                        'smarty_internal_runtime_var.php'                           => true,
+                                        'smarty_internal_runtime_writefile.php'                     => true,
+                                        'smarty_internal_smartytemplatecompiler.php'                => true,
+                                        'smarty_internal_template.php'                              => true,
+                                        'smarty_internal_templatebase.php'                          => true,
+                                        'smarty_internal_templatecompilerbase.php'                  => true,
+                                        'smarty_internal_templatelexer.php'                         => true,
+                                        'smarty_internal_templateparser.php'                        => true,
+                                        'smarty_internal_testinstall.php'                           => true,
+                                        'smarty_internal_undefined.php'                             => true,
+                                        'smarty_resource.php'                                       => true,
+                                        'smarty_resource_custom.php'                                => true,
+                                        'smarty_resource_recompiled.php'                            => true,
+                                        'smarty_resource_uncompiled.php'                            => true,
+                                        'smarty_security.php'                                       => true,
+                                        'smarty_template_cached.php'                                => true,
+                                        'smarty_template_compiled.php'                              => true,
+                                        'smarty_template_config.php'                                => true,
+                                        'smarty_template_resource_base.php'                         => true,
+                                        'smarty_template_source.php'                                => true,
+                                        'smarty_undefined_variable.php'                             => true,
+                                        'smarty_variable.php'                                       => true,);
+            $iterator = new DirectoryIterator($source);
+            foreach ($iterator as $file) {
+                if (!$file->isDot()) {
+                    $filename = $file->getFilename();
+                    if (isset($expectedSysplugins[ $filename ])) {
+                        unset($expectedSysplugins[ $filename ]);
+                    }
+                }
+            }
+            if ($expectedSysplugins) {
+                $status = false;
+                $message = "FAILED: files missing from libs/sysplugins: " . join(', ', array_keys($expectedSysplugins));
+                if ($errors === null) {
+                    echo $message . ".\n";
+                } else {
+                    $errors[ 'sysplugins' ] = $message;
+                }
+            } elseif ($errors === null) {
+                echo "... OK\n";
+            }
+        } else {
+            $status = false;
+            $message = "FAILED: " . SMARTY_SYSPLUGINS_DIR . ' is not a directory';
+            if ($errors === null) {
+                echo $message . ".\n";
+            } else {
+                $errors[ 'sysplugins_dir_constant' ] = $message;
+            }
+        }
+
+        if ($errors === null) {
+            echo "Testing plugin files...\n";
+        }
+        // test if core plugins are available
+        $source = SMARTY_PLUGINS_DIR;
+        if (is_dir($source)) {
+            $expectedPlugins =
+                array('block.textformat.php'                  => true, 'function.counter.php' => true,
+                      'function.cycle.php'                    => true, 'function.fetch.php' => true,
+                      'function.html_checkboxes.php'          => true, 'function.html_image.php' => true,
+                      'function.html_options.php'             => true, 'function.html_radios.php' => true,
+                      'function.html_select_date.php'         => true, 'function.html_select_time.php' => true,
+                      'function.html_table.php'               => true, 'function.mailto.php' => true,
+                      'function.math.php'                     => true, 'modifier.capitalize.php' => true,
+                      'modifier.date_format.php'              => true, 'modifier.debug_print_var.php' => true,
+                      'modifier.escape.php'                   => true, 'modifier.regex_replace.php' => true,
+                      'modifier.replace.php'                  => true, 'modifier.spacify.php' => true,
+                      'modifier.truncate.php'                 => true, 'modifiercompiler.cat.php' => true,
+                      'modifiercompiler.count_characters.php' => true, 'modifiercompiler.count_paragraphs.php' => true,
+                      'modifiercompiler.count_sentences.php'  => true, 'modifiercompiler.count_words.php' => true,
+                      'modifiercompiler.default.php'          => true, 'modifiercompiler.escape.php' => true,
+                      'modifiercompiler.from_charset.php'     => true, 'modifiercompiler.indent.php' => true,
+                      'modifiercompiler.lower.php'            => true, 'modifiercompiler.noprint.php' => true,
+                      'modifiercompiler.string_format.php'    => true, 'modifiercompiler.strip.php' => true,
+                      'modifiercompiler.strip_tags.php'       => true, 'modifiercompiler.to_charset.php' => true,
+                      'modifiercompiler.unescape.php'         => true, 'modifiercompiler.upper.php' => true,
+                      'modifiercompiler.wordwrap.php'         => true, 'outputfilter.trimwhitespace.php' => true,
+                      'shared.escape_special_chars.php'       => true, 'shared.literal_compiler_param.php' => true,
+                      'shared.make_timestamp.php'             => true, 'shared.mb_str_replace.php' => true,
+                      'shared.mb_unicode.php'                 => true, 'shared.mb_wordwrap.php' => true,
+                      'variablefilter.htmlspecialchars.php'   => true,);
+            $iterator = new DirectoryIterator($source);
+            foreach ($iterator as $file) {
+                if (!$file->isDot()) {
+                    $filename = $file->getFilename();
+                    if (isset($expectedPlugins[ $filename ])) {
+                        unset($expectedPlugins[ $filename ]);
+                    }
+                }
+            }
+            if ($expectedPlugins) {
+                $status = false;
+                $message = "FAILED: files missing from libs/plugins: " . join(', ', array_keys($expectedPlugins));
+                if ($errors === null) {
+                    echo $message . ".\n";
+                } else {
+                    $errors[ 'plugins' ] = $message;
+                }
+            } elseif ($errors === null) {
+                echo "... OK\n";
+            }
+        } else {
+            $status = false;
+            $message = "FAILED: " . SMARTY_PLUGINS_DIR . ' is not a directory';
+            if ($errors === null) {
+                echo $message . ".\n";
+            } else {
+                $errors[ 'plugins_dir_constant' ] = $message;
+            }
+        }
+
+        if ($errors === null) {
+            echo "Tests complete.\n";
+            echo "</PRE>\n";
+        }
+
+        return $status;
+    }
+}
diff --git a/include/smarty/libs/sysplugins/smarty_internal_undefined.php b/include/smarty/libs/sysplugins/smarty_internal_undefined.php
new file mode 100644
index 000000000..93fca8ec1
--- /dev/null
+++ b/include/smarty/libs/sysplugins/smarty_internal_undefined.php
@@ -0,0 +1,48 @@
+<?php
+
+/**
+ * Smarty Method AppendByRef
+ *
+ * Smarty::appendByRef() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Undefined
+{
+
+    /**
+     * This function is executed automatically when a compiled or cached template file is included
+     * - Decode saved properties from compiled template and cache files
+     * - Check if compiled or cache file is valid
+     *
+     * @param  array $properties special template properties
+     * @param  bool  $cache      flag if called from cache file
+     *
+     * @return bool  flag if compiled or cache file is valid
+     */
+    public function decodeProperties($tpl, $properties, $cache = false)
+    {
+        if ($cache) {
+            $tpl->cached->valid = false;
+        } else {
+            $tpl->mustCompile = true;
+        }
+        return false;
+    }
+
+    /**
+     * Call error handler for undefined method
+     *
+     * @param string $name unknown method-name
+     * @param array  $args argument array
+     *
+     * @return mixed
+     * @throws SmartyException
+     */
+    public function __call($name, $args)
+    {
+        throw new SmartyException(get_class($args[0]) . "->{$name}() undefined method");
+    }
+}
\ No newline at end of file
diff --git a/include/smarty/libs/sysplugins/smarty_internal_utility.php b/include/smarty/libs/sysplugins/smarty_internal_utility.php
deleted file mode 100644
index f19ca01f8..000000000
--- a/include/smarty/libs/sysplugins/smarty_internal_utility.php
+++ /dev/null
@@ -1,830 +0,0 @@
-<?php
-/**
- * Project:     Smarty: the PHP compiling template engine
- * File:        smarty_internal_utility.php
- * SVN:         $Id: $
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- * For questions, help, comments, discussion, etc., please join the
- * Smarty mailing list. Send a blank e-mail to
- * smarty-discussion-subscribe@googlegroups.com
- *
- * @link http://www.smarty.net/
- * @copyright 2008 New Digital Group, Inc.
- * @author Monte Ohrt <monte at ohrt dot com>
- * @author Uwe Tews
- * @package Smarty
- * @subpackage PluginsInternal
- * @version 3-SVN$Rev: 3286 $
- */
-
-
-/**
- * Utility class
- *
- * @package Smarty
- * @subpackage Security
- */
-class Smarty_Internal_Utility {
-
-    /**
-     * private constructor to prevent calls creation of new instances
-     */
-    private final function __construct()
-    {
-        // intentionally left blank
-    }
-
-    /**
-     * Compile all template files
-     *
-     * @param string $extension     template file name extension
-     * @param bool   $force_compile force all to recompile
-     * @param int    $time_limit    set maximum execution time
-     * @param int    $max_errors    set maximum allowed errors
-     * @param Smarty $smarty        Smarty instance
-     * @return integer number of template files compiled
-     */
-    public static function compileAllTemplates($extention, $force_compile, $time_limit, $max_errors, Smarty $smarty)
-    {
-        // switch off time limit
-        if (function_exists('set_time_limit')) {
-            @set_time_limit($time_limit);
-        }
-        $smarty->force_compile = $force_compile;
-        $_count = 0;
-        $_error_count = 0;
-        // loop over array of template directories
-        foreach($smarty->getTemplateDir() as $_dir) {
-            $_compileDirs = new RecursiveDirectoryIterator($_dir);
-            $_compile = new RecursiveIteratorIterator($_compileDirs);
-            foreach ($_compile as $_fileinfo) {
-                $_file = $_fileinfo->getFilename();
-                if (substr(basename($_fileinfo->getPathname()),0,1) == '.' || strpos($_file, '.svn') !== false) continue;
-                if (!substr_compare($_file, $extention, - strlen($extention)) == 0) continue;
-                if ($_fileinfo->getPath() == substr($_dir, 0, -1)) {
-                   $_template_file = $_file;
-                } else {
-                   $_template_file = substr($_fileinfo->getPath(), strlen($_dir)) . DS . $_file;
-                }
-                echo '<br>', $_dir, '---', $_template_file;
-                flush();
-                $_start_time = microtime(true);
-                try {
-                    $_tpl = $smarty->createTemplate($_template_file,null,null,null,false);
-                    if ($_tpl->mustCompile()) {
-                        $_tpl->compileTemplateSource();
-                        $_count++;
-                        echo ' compiled in  ', microtime(true) - $_start_time, ' seconds';
-                        flush();
-                    } else {
-                        echo ' is up to date';
-                        flush();
-                    }
-                }
-                catch (Exception $e) {
-                    echo 'Error: ', $e->getMessage(), "<br><br>";
-                    $_error_count++;
-                }
-                // free memory
-                $smarty->template_objects = array();
-                $_tpl->smarty->template_objects = array();
-                $_tpl = null;
-                if ($max_errors !== null && $_error_count == $max_errors) {
-                    echo '<br><br>too many errors';
-                    exit();
-                }
-            }
-        }
-        return $_count;
-    }
-
-    /**
-     * Compile all config files
-     *
-     * @param string $extension     config file name extension
-     * @param bool   $force_compile force all to recompile
-     * @param int    $time_limit    set maximum execution time
-     * @param int    $max_errors    set maximum allowed errors
-     * @param Smarty $smarty        Smarty instance
-     * @return integer number of config files compiled
-     */
-    public static function compileAllConfig($extention, $force_compile, $time_limit, $max_errors, Smarty $smarty)
-    {
-        // switch off time limit
-        if (function_exists('set_time_limit')) {
-            @set_time_limit($time_limit);
-        }
-        $smarty->force_compile = $force_compile;
-        $_count = 0;
-        $_error_count = 0;
-        // loop over array of template directories
-        foreach($smarty->getConfigDir() as $_dir) {
-            $_compileDirs = new RecursiveDirectoryIterator($_dir);
-            $_compile = new RecursiveIteratorIterator($_compileDirs);
-            foreach ($_compile as $_fileinfo) {
-                $_file = $_fileinfo->getFilename();
-                if (substr(basename($_fileinfo->getPathname()),0,1) == '.' || strpos($_file, '.svn') !== false) continue;
-                if (!substr_compare($_file, $extention, - strlen($extention)) == 0) continue;
-                if ($_fileinfo->getPath() == substr($_dir, 0, -1)) {
-                    $_config_file = $_file;
-                } else {
-                    $_config_file = substr($_fileinfo->getPath(), strlen($_dir)) . DS . $_file;
-                }
-                echo '<br>', $_dir, '---', $_config_file;
-                flush();
-                $_start_time = microtime(true);
-                try {
-                    $_config = new Smarty_Internal_Config($_config_file, $smarty);
-                    if ($_config->mustCompile()) {
-                        $_config->compileConfigSource();
-                        $_count++;
-                        echo ' compiled in  ', microtime(true) - $_start_time, ' seconds';
-                        flush();
-                    } else {
-                        echo ' is up to date';
-                        flush();
-                    }
-                }
-                catch (Exception $e) {
-                    echo 'Error: ', $e->getMessage(), "<br><br>";
-                    $_error_count++;
-                }
-                if ($max_errors !== null && $_error_count == $max_errors) {
-                    echo '<br><br>too many errors';
-                    exit();
-                }
-            }
-        }
-        return $_count;
-    }
-
-    /**
-     * Delete compiled template file
-     *
-     * @param string  $resource_name template name
-     * @param string  $compile_id    compile id
-     * @param integer $exp_time      expiration time
-     * @param Smarty  $smarty        Smarty instance
-     * @return integer number of template files deleted
-     */
-    public static function clearCompiledTemplate($resource_name, $compile_id, $exp_time, Smarty $smarty)
-    {
-        $_compile_dir = $smarty->getCompileDir();
-        $_compile_id = isset($compile_id) ? preg_replace('![^\w\|]+!', '_', $compile_id) : null;
-        $_dir_sep = $smarty->use_sub_dirs ? DS : '^';
-        if (isset($resource_name)) {
-            $_save_stat = $smarty->caching;
-            $smarty->caching = false;
-            $tpl = new $smarty->template_class($resource_name, $smarty);
-            $smarty->caching = $_save_stat;
-
-            // remove from template cache
-            $tpl->source; // have the template registered before unset()
-            if ($smarty->allow_ambiguous_resources) {
-                $_templateId = $tpl->source->unique_resource . $tpl->cache_id . $tpl->compile_id;
-            } else {
-                $_templateId = $smarty->joined_template_dir . '#' . $resource_name . $tpl->cache_id . $tpl->compile_id;
-            }
-            if (isset($_templateId[150])) {
-                $_templateId = sha1($_templateId);
-            }
-            unset($smarty->template_objects[$_templateId]);
-
-            if ($tpl->source->exists) {
-                 $_resource_part_1 = basename(str_replace('^', '/', $tpl->compiled->filepath));
-                 $_resource_part_1_length = strlen($_resource_part_1);
-            } else {
-                return 0;
-            }
-
-            $_resource_part_2 = str_replace('.php','.cache.php',$_resource_part_1);
-            $_resource_part_2_length = strlen($_resource_part_2);
-        }
-        $_dir = $_compile_dir;
-        if ($smarty->use_sub_dirs && isset($_compile_id)) {
-            $_dir .= $_compile_id . $_dir_sep;
-        }
-        if (isset($_compile_id)) {
-            $_compile_id_part = $_compile_dir . $_compile_id . $_dir_sep;
-            $_compile_id_part_length = strlen($_compile_id_part);
-        }
-        $_count = 0;
-        try {
-            $_compileDirs = new RecursiveDirectoryIterator($_dir);
-        // NOTE: UnexpectedValueException thrown for PHP >= 5.3
-        } catch (Exception $e) {
-            return 0;
-        }
-        $_compile = new RecursiveIteratorIterator($_compileDirs, RecursiveIteratorIterator::CHILD_FIRST);
-        foreach ($_compile as $_file) {
-            if (substr(basename($_file->getPathname()), 0, 1) == '.' || strpos($_file, '.svn') !== false)
-                continue;
-
-            $_filepath = (string) $_file;
-
-            if ($_file->isDir()) {
-                if (!$_compile->isDot()) {
-                    // delete folder if empty
-                    @rmdir($_file->getPathname());
-                }
-            } else {
-                $unlink = false;
-                if ((!isset($_compile_id) || (isset($_filepath[$_compile_id_part_length]) && !strncmp($_filepath, $_compile_id_part, $_compile_id_part_length)))
-                    && (!isset($resource_name)
-                        || (isset($_filepath[$_resource_part_1_length])
-                            && substr_compare($_filepath, $_resource_part_1, -$_resource_part_1_length, $_resource_part_1_length) == 0)
-                        || (isset($_filepath[$_resource_part_2_length])
-                            && substr_compare($_filepath, $_resource_part_2, -$_resource_part_2_length, $_resource_part_2_length) == 0))) {
-                    if (isset($exp_time)) {
-                        if (time() - @filemtime($_filepath) >= $exp_time) {
-                            $unlink = true;
-                        }
-                    } else {
-                        $unlink = true;
-                    }
-                }
-
-                if ($unlink && @unlink($_filepath)) {
-                    $_count++;
-                }
-            }
-        }
-        // clear compiled cache
-        Smarty_Resource::$sources = array();
-        Smarty_Resource::$compileds = array();
-        return $_count;
-    }
-
-    /**
-     * Return array of tag/attributes of all tags used by an template
-     *
-     * @param Smarty_Internal_Template $templae template object
-     * @return array of tag/attributes
-     */
-    public static function getTags(Smarty_Internal_Template $template)
-    {
-        $template->smarty->get_used_tags = true;
-        $template->compileTemplateSource();
-        return $template->used_tags;
-    }
-
-
-    /**
-     * diagnose Smarty setup
-     *
-     * If $errors is secified, the diagnostic report will be appended to the array, rather than being output.
-     *
-     * @param Smarty $smarty  Smarty instance to test
-     * @param array  $errors array to push results into rather than outputting them
-     * @return bool status, true if everything is fine, false else
-     */
-    public static function testInstall(Smarty $smarty, &$errors=null)
-    {
-        $status = true;
-
-        if ($errors === null) {
-            echo "<PRE>\n";
-            echo "Smarty Installation test...\n";
-            echo "Testing template directory...\n";
-        }
-
-        $_stream_resolve_include_path = function_exists('stream_resolve_include_path');
-
-        // test if all registered template_dir are accessible
-        foreach($smarty->getTemplateDir() as $template_dir) {
-            $_template_dir = $template_dir;
-            $template_dir = realpath($template_dir);
-            // resolve include_path or fail existance
-            if (!$template_dir) {
-                if ($smarty->use_include_path && !preg_match('/^([\/\\\\]|[a-zA-Z]:[\/\\\\])/', $_template_dir)) {
-                    // try PHP include_path
-                    if ($_stream_resolve_include_path) {
-                        $template_dir = stream_resolve_include_path($_template_dir);
-                    } else {
-                        $template_dir = Smarty_Internal_Get_Include_Path::getIncludePath($_template_dir);
-                    }
-
-                    if ($template_dir !== false) {
-                        if ($errors === null) {
-                            echo "$template_dir is OK.\n";
-                        }
-
-                        continue;
-                    } else {
-                        $status = false;
-                        $message = "FAILED: $_template_dir does not exist (and couldn't be found in include_path either)";
-                        if ($errors === null) {
-                            echo $message . ".\n";
-                        } else {
-                            $errors['template_dir'] = $message;
-                        }
-
-                        continue;
-                    }
-                } else {
-                    $status = false;
-                    $message = "FAILED: $_template_dir does not exist";
-                    if ($errors === null) {
-                        echo $message . ".\n";
-                    } else {
-                        $errors['template_dir'] = $message;
-                    }
-
-                    continue;
-                }
-            }
-
-            if (!is_dir($template_dir)) {
-                $status = false;
-                $message = "FAILED: $template_dir is not a directory";
-                if ($errors === null) {
-                    echo $message . ".\n";
-                } else {
-                    $errors['template_dir'] = $message;
-                }
-            } elseif (!is_readable($template_dir)) {
-                $status = false;
-                $message = "FAILED: $template_dir is not readable";
-                if ($errors === null) {
-                    echo $message . ".\n";
-                } else {
-                    $errors['template_dir'] = $message;
-                }
-            } else {
-                if ($errors === null) {
-                    echo "$template_dir is OK.\n";
-                }
-            }
-        }
-
-
-        if ($errors === null) {
-            echo "Testing compile directory...\n";
-        }
-
-        // test if registered compile_dir is accessible
-        $__compile_dir = $smarty->getCompileDir();
-        $_compile_dir = realpath($__compile_dir);
-        if (!$_compile_dir) {
-            $status = false;
-            $message = "FAILED: {$__compile_dir} does not exist";
-            if ($errors === null) {
-                echo $message . ".\n";
-            } else {
-                $errors['compile_dir'] = $message;
-            }
-        } elseif (!is_dir($_compile_dir)) {
-            $status = false;
-            $message = "FAILED: {$_compile_dir} is not a directory";
-            if ($errors === null) {
-                echo $message . ".\n";
-            } else {
-                $errors['compile_dir'] = $message;
-            }
-        } elseif (!is_readable($_compile_dir)) {
-            $status = false;
-            $message = "FAILED: {$_compile_dir} is not readable";
-            if ($errors === null) {
-                echo $message . ".\n";
-            } else {
-                $errors['compile_dir'] = $message;
-            }
-        } elseif (!is_writable($_compile_dir)) {
-            $status = false;
-            $message = "FAILED: {$_compile_dir} is not writable";
-            if ($errors === null) {
-                echo $message . ".\n";
-            } else {
-                $errors['compile_dir'] = $message;
-            }
-        } else {
-            if ($errors === null) {
-                echo "{$_compile_dir} is OK.\n";
-            }
-        }
-
-
-        if ($errors === null) {
-            echo "Testing plugins directory...\n";
-        }
-
-        // test if all registered plugins_dir are accessible
-        // and if core plugins directory is still registered
-        $_core_plugins_dir = realpath(dirname(__FILE__) .'/../plugins');
-        $_core_plugins_available = false;
-        foreach($smarty->getPluginsDir() as $plugin_dir) {
-            $_plugin_dir = $plugin_dir;
-            $plugin_dir = realpath($plugin_dir);
-            // resolve include_path or fail existance
-            if (!$plugin_dir) {
-                if ($smarty->use_include_path && !preg_match('/^([\/\\\\]|[a-zA-Z]:[\/\\\\])/', $_plugin_dir)) {
-                    // try PHP include_path
-                    if ($_stream_resolve_include_path) {
-                        $plugin_dir = stream_resolve_include_path($_plugin_dir);
-                    } else {
-                        $plugin_dir = Smarty_Internal_Get_Include_Path::getIncludePath($_plugin_dir);
-                    }
-
-                    if ($plugin_dir !== false) {
-                        if ($errors === null) {
-                            echo "$plugin_dir is OK.\n";
-                        }
-
-                        continue;
-                    } else {
-                        $status = false;
-                        $message = "FAILED: $_plugin_dir does not exist (and couldn't be found in include_path either)";
-                        if ($errors === null) {
-                            echo $message . ".\n";
-                        } else {
-                            $errors['plugins_dir'] = $message;
-                        }
-
-                        continue;
-                    }
-                } else {
-                    $status = false;
-                    $message = "FAILED: $_plugin_dir does not exist";
-                    if ($errors === null) {
-                        echo $message . ".\n";
-                    } else {
-                        $errors['plugins_dir'] = $message;
-                    }
-
-                    continue;
-                }
-            }
-
-            if (!is_dir($plugin_dir)) {
-                $status = false;
-                $message = "FAILED: $plugin_dir is not a directory";
-                if ($errors === null) {
-                    echo $message . ".\n";
-                } else {
-                    $errors['plugins_dir'] = $message;
-                }
-            } elseif (!is_readable($plugin_dir)) {
-                $status = false;
-                $message = "FAILED: $plugin_dir is not readable";
-                if ($errors === null) {
-                    echo $message . ".\n";
-                } else {
-                    $errors['plugins_dir'] = $message;
-                }
-            } elseif ($_core_plugins_dir && $_core_plugins_dir == realpath($plugin_dir)) {
-                $_core_plugins_available = true;
-                if ($errors === null) {
-                    echo "$plugin_dir is OK.\n";
-                }
-            } else {
-                if ($errors === null) {
-                    echo "$plugin_dir is OK.\n";
-                }
-            }
-        }
-        if (!$_core_plugins_available) {
-            $status = false;
-            $message = "WARNING: Smarty's own libs/plugins is not available";
-            if ($errors === null) {
-                echo $message . ".\n";
-            } elseif (!isset($errors['plugins_dir'])) {
-                $errors['plugins_dir'] = $message;
-            }
-        }
-
-        if ($errors === null) {
-            echo "Testing cache directory...\n";
-        }
-
-
-        // test if all registered cache_dir is accessible
-        $__cache_dir = $smarty->getCacheDir();
-        $_cache_dir = realpath($__cache_dir);
-        if (!$_cache_dir) {
-            $status = false;
-            $message = "FAILED: {$__cache_dir} does not exist";
-            if ($errors === null) {
-                echo $message . ".\n";
-            } else {
-                $errors['cache_dir'] = $message;
-            }
-        } elseif (!is_dir($_cache_dir)) {
-            $status = false;
-            $message = "FAILED: {$_cache_dir} is not a directory";
-            if ($errors === null) {
-                echo $message . ".\n";
-            } else {
-                $errors['cache_dir'] = $message;
-            }
-        } elseif (!is_readable($_cache_dir)) {
-            $status = false;
-            $message = "FAILED: {$_cache_dir} is not readable";
-            if ($errors === null) {
-                echo $message . ".\n";
-            } else {
-                $errors['cache_dir'] = $message;
-            }
-        } elseif (!is_writable($_cache_dir)) {
-            $status = false;
-            $message = "FAILED: {$_cache_dir} is not writable";
-            if ($errors === null) {
-                echo $message . ".\n";
-            } else {
-                $errors['cache_dir'] = $message;
-            }
-        } else {
-            if ($errors === null) {
-                echo "{$_cache_dir} is OK.\n";
-            }
-        }
-
-
-        if ($errors === null) {
-            echo "Testing configs directory...\n";
-        }
-
-        // test if all registered config_dir are accessible
-        foreach($smarty->getConfigDir() as $config_dir) {
-            $_config_dir = $config_dir;
-            $config_dir = realpath($config_dir);
-            // resolve include_path or fail existance
-            if (!$config_dir) {
-                if ($smarty->use_include_path && !preg_match('/^([\/\\\\]|[a-zA-Z]:[\/\\\\])/', $_config_dir)) {
-                    // try PHP include_path
-                    if ($_stream_resolve_include_path) {
-                        $config_dir = stream_resolve_include_path($_config_dir);
-                    } else {
-                        $config_dir = Smarty_Internal_Get_Include_Path::getIncludePath($_config_dir);
-                    }
-
-                    if ($config_dir !== false) {
-                        if ($errors === null) {
-                            echo "$config_dir is OK.\n";
-                        }
-
-                        continue;
-                    } else {
-                        $status = false;
-                        $message = "FAILED: $_config_dir does not exist (and couldn't be found in include_path either)";
-                        if ($errors === null) {
-                            echo $message . ".\n";
-                        } else {
-                            $errors['config_dir'] = $message;
-                        }
-
-                        continue;
-                    }
-                } else {
-                    $status = false;
-                    $message = "FAILED: $_config_dir does not exist";
-                    if ($errors === null) {
-                        echo $message . ".\n";
-                    } else {
-                        $errors['config_dir'] = $message;
-                    }
-
-                    continue;
-                }
-            }
-
-            if (!is_dir($config_dir)) {
-                $status = false;
-                $message = "FAILED: $config_dir is not a directory";
-                if ($errors === null) {
-                    echo $message . ".\n";
-                } else {
-                    $errors['config_dir'] = $message;
-                }
-            } elseif (!is_readable($config_dir)) {
-                $status = false;
-                $message = "FAILED: $config_dir is not readable";
-                if ($errors === null) {
-                    echo $message . ".\n";
-                } else {
-                    $errors['config_dir'] = $message;
-                }
-            } else {
-                if ($errors === null) {
-                    echo "$config_dir is OK.\n";
-                }
-            }
-        }
-
-
-        if ($errors === null) {
-            echo "Testing sysplugin files...\n";
-        }
-        // test if sysplugins are available
-        $source = SMARTY_SYSPLUGINS_DIR;
-        if (is_dir($source)) {
-            $expected = array(
-                "smarty_cacheresource.php" => true,
-                "smarty_cacheresource_custom.php" => true,
-                "smarty_cacheresource_keyvaluestore.php" => true,
-                "smarty_config_source.php" => true,
-                "smarty_internal_cacheresource_file.php" => true,
-                "smarty_internal_compile_append.php" => true,
-                "smarty_internal_compile_assign.php" => true,
-                "smarty_internal_compile_block.php" => true,
-                "smarty_internal_compile_break.php" => true,
-                "smarty_internal_compile_call.php" => true,
-                "smarty_internal_compile_capture.php" => true,
-                "smarty_internal_compile_config_load.php" => true,
-                "smarty_internal_compile_continue.php" => true,
-                "smarty_internal_compile_debug.php" => true,
-                "smarty_internal_compile_eval.php" => true,
-                "smarty_internal_compile_extends.php" => true,
-                "smarty_internal_compile_for.php" => true,
-                "smarty_internal_compile_foreach.php" => true,
-                "smarty_internal_compile_function.php" => true,
-                "smarty_internal_compile_if.php" => true,
-                "smarty_internal_compile_include.php" => true,
-                "smarty_internal_compile_include_php.php" => true,
-                "smarty_internal_compile_insert.php" => true,
-                "smarty_internal_compile_ldelim.php" => true,
-                "smarty_internal_compile_nocache.php" => true,
-                "smarty_internal_compile_private_block_plugin.php" => true,
-                "smarty_internal_compile_private_function_plugin.php" => true,
-                "smarty_internal_compile_private_modifier.php" => true,
-                "smarty_internal_compile_private_object_block_function.php" => true,
-                "smarty_internal_compile_private_object_function.php" => true,
-                "smarty_internal_compile_private_print_expression.php" => true,
-                "smarty_internal_compile_private_registered_block.php" => true,
-                "smarty_internal_compile_private_registered_function.php" => true,
-                "smarty_internal_compile_private_special_variable.php" => true,
-                "smarty_internal_compile_rdelim.php" => true,
-                "smarty_internal_compile_section.php" => true,
-                "smarty_internal_compile_setfilter.php" => true,
-                "smarty_internal_compile_while.php" => true,
-                "smarty_internal_compilebase.php" => true,
-                "smarty_internal_config.php" => true,
-                "smarty_internal_config_file_compiler.php" => true,
-                "smarty_internal_configfilelexer.php" => true,
-                "smarty_internal_configfileparser.php" => true,
-                "smarty_internal_data.php" => true,
-                "smarty_internal_debug.php" => true,
-                "smarty_internal_filter_handler.php" => true,
-                "smarty_internal_function_call_handler.php" => true,
-                "smarty_internal_get_include_path.php" => true,
-                "smarty_internal_nocache_insert.php" => true,
-                "smarty_internal_parsetree.php" => true,
-                "smarty_internal_resource_eval.php" => true,
-                "smarty_internal_resource_extends.php" => true,
-                "smarty_internal_resource_file.php" => true,
-                "smarty_internal_resource_registered.php" => true,
-                "smarty_internal_resource_stream.php" => true,
-                "smarty_internal_resource_string.php" => true,
-                "smarty_internal_smartytemplatecompiler.php" => true,
-                "smarty_internal_template.php" => true,
-                "smarty_internal_templatebase.php" => true,
-                "smarty_internal_templatecompilerbase.php" => true,
-                "smarty_internal_templatelexer.php" => true,
-                "smarty_internal_templateparser.php" => true,
-                "smarty_internal_utility.php" => true,
-                "smarty_internal_write_file.php" => true,
-                "smarty_resource.php" => true,
-                "smarty_resource_custom.php" => true,
-                "smarty_resource_recompiled.php" => true,
-                "smarty_resource_uncompiled.php" => true,
-                "smarty_security.php" => true,
-            );
-            $iterator = new DirectoryIterator($source);
-            foreach ($iterator as $file) {
-                if (!$file->isDot()) {
-                    $filename = $file->getFilename();
-                    if (isset($expected[$filename])) {
-                        unset($expected[$filename]);
-                    }
-                }
-            }
-            if ($expected) {
-                $status = false;
-                $message = "FAILED: files missing from libs/sysplugins: ". join(', ', array_keys($expected));
-                if ($errors === null) {
-                    echo $message . ".\n";
-                } else {
-                    $errors['sysplugins'] = $message;
-                }
-            } elseif ($errors === null) {
-                echo "... OK\n";
-            }
-        } else {
-            $status = false;
-            $message = "FAILED: ". SMARTY_SYSPLUGINS_DIR .' is not a directory';
-            if ($errors === null) {
-                echo $message . ".\n";
-            } else {
-                $errors['sysplugins_dir_constant'] = $message;
-            }
-        }
-
-        if ($errors === null) {
-            echo "Testing plugin files...\n";
-        }
-        // test if core plugins are available
-        $source = SMARTY_PLUGINS_DIR;
-        if (is_dir($source)) {
-            $expected = array(
-                "block.textformat.php" => true,
-                "function.counter.php" => true,
-                "function.cycle.php" => true,
-                "function.fetch.php" => true,
-                "function.html_checkboxes.php" => true,
-                "function.html_image.php" => true,
-                "function.html_options.php" => true,
-                "function.html_radios.php" => true,
-                "function.html_select_date.php" => true,
-                "function.html_select_time.php" => true,
-                "function.html_table.php" => true,
-                "function.mailto.php" => true,
-                "function.math.php" => true,
-                "modifier.capitalize.php" => true,
-                "modifier.date_format.php" => true,
-                "modifier.debug_print_var.php" => true,
-                "modifier.escape.php" => true,
-                "modifier.regex_replace.php" => true,
-                "modifier.replace.php" => true,
-                "modifier.spacify.php" => true,
-                "modifier.truncate.php" => true,
-                "modifiercompiler.cat.php" => true,
-                "modifiercompiler.count_characters.php" => true,
-                "modifiercompiler.count_paragraphs.php" => true,
-                "modifiercompiler.count_sentences.php" => true,
-                "modifiercompiler.count_words.php" => true,
-                "modifiercompiler.default.php" => true,
-                "modifiercompiler.escape.php" => true,
-                "modifiercompiler.from_charset.php" => true,
-                "modifiercompiler.indent.php" => true,
-                "modifiercompiler.lower.php" => true,
-                "modifiercompiler.noprint.php" => true,
-                "modifiercompiler.string_format.php" => true,
-                "modifiercompiler.strip.php" => true,
-                "modifiercompiler.strip_tags.php" => true,
-                "modifiercompiler.to_charset.php" => true,
-                "modifiercompiler.unescape.php" => true,
-                "modifiercompiler.upper.php" => true,
-                "modifiercompiler.wordwrap.php" => true,
-                "outputfilter.trimwhitespace.php" => true,
-                "shared.escape_special_chars.php" => true,
-                "shared.literal_compiler_param.php" => true,
-                "shared.make_timestamp.php" => true,
-                "shared.mb_str_replace.php" => true,
-                "shared.mb_unicode.php" => true,
-                "shared.mb_wordwrap.php" => true,
-                "variablefilter.htmlspecialchars.php" => true,
-            );
-            $iterator = new DirectoryIterator($source);
-            foreach ($iterator as $file) {
-                if (!$file->isDot()) {
-                    $filename = $file->getFilename();
-                    if (isset($expected[$filename])) {
-                        unset($expected[$filename]);
-                    }
-                }
-            }
-            if ($expected) {
-                $status = false;
-                $message = "FAILED: files missing from libs/plugins: ". join(', ', array_keys($expected));
-                if ($errors === null) {
-                    echo $message . ".\n";
-                } else {
-                    $errors['plugins'] = $message;
-                }
-            } elseif ($errors === null) {
-                echo "... OK\n";
-            }
-        } else {
-            $status = false;
-            $message = "FAILED: ". SMARTY_PLUGINS_DIR .' is not a directory';
-            if ($errors === null) {
-                echo $message . ".\n";
-            } else {
-                $errors['plugins_dir_constant'] = $message;
-            }
-        }
-
-        if ($errors === null) {
-            echo "Tests complete.\n";
-            echo "</PRE>\n";
-        }
-
-        return $status;
-    }
-
-}
-
-?>
\ No newline at end of file
diff --git a/include/smarty/libs/sysplugins/smarty_resource.php b/include/smarty/libs/sysplugins/smarty_resource.php
index 55f1497fb..72611255e 100644
--- a/include/smarty/libs/sysplugins/smarty_resource.php
+++ b/include/smarty/libs/sysplugins/smarty_resource.php
@@ -2,62 +2,70 @@
 /**
  * Smarty Resource Plugin
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage TemplateResources
- * @author Rodney Rehm
+ * @author     Rodney Rehm
  */
 
 /**
  * Smarty Resource Plugin
- *
  * Base implementation for resource plugins
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage TemplateResources
  */
-abstract class Smarty_Resource {
+abstract class Smarty_Resource
+{
     /**
-     * cache for Smarty_Template_Source instances
-     * @var array
+     * Source is bypassing compiler
+     *
+     * @var boolean
      */
-    public static $sources = array();
+    public $uncompiled = false;
+
     /**
-     * cache for Smarty_Template_Compiled instances
-     * @var array
+     * Source must be recompiled on every occasion
+     *
+     * @var boolean
      */
-    public static $compileds = array();
+    public $recompiled = false;
+
     /**
-     * cache for Smarty_Resource instances
+     * resource types provided by the core
+     *
      * @var array
      */
-    public static $resources = array();
+    public static $sysplugins = array('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');
+
     /**
-     * resource types provided by the core
-     * @var array
+     * Flag if resource does implement populateCompiledFilepath() method
+     *
+     * @var bool
      */
-    protected static $sysplugins = array(
-        'file' => true,
-        'string' => true,
-        'extends' => true,
-        'stream' => true,
-        'eval' => true,
-        'php' => true
-    );
+    public $hasCompiledHandler = false;
 
     /**
      * Name of the Class to compile this resource's contents with
+     *
      * @var string
      */
     public $compiler_class = 'Smarty_Internal_SmartyTemplateCompiler';
 
     /**
      * Name of the Class to tokenize this resource's contents with
+     *
      * @var string
      */
     public $template_lexer_class = 'Smarty_Internal_Templatelexer';
 
     /**
      * Name of the Class to parse this resource's contents with
+     *
      * @var string
      */
     public $template_parser_class = 'Smarty_Internal_Templateparser';
@@ -65,21 +73,20 @@ abstract class Smarty_Resource {
     /**
      * Load template's source into current template object
      *
-     * {@internal The loaded source is assigned to $_template->source->content directly.}}
+     * @param  Smarty_Template_Source $source source object
      *
-     * @param Smarty_Template_Source $source source object
-     * @return string template source
-     * @throws SmartyException if source cannot be loaded
+     * @return string                 template source
+     * @throws SmartyException        if source cannot be loaded
      */
-    public abstract function getContent(Smarty_Template_Source $source);
+    abstract public function getContent(Smarty_Template_Source $source);
 
     /**
      * populate Source Object with meta data from Resource
      *
-     * @param Smarty_Template_Source   $source source object
-     * @param Smarty_Internal_Template $_template     template object
+     * @param Smarty_Template_Source   $source    source object
+     * @param Smarty_Internal_Template $_template template object
      */
-    public abstract function populate(Smarty_Template_Source $source, Smarty_Internal_Template $_template=null);
+    abstract public function populate(Smarty_Template_Source $source, Smarty_Internal_Template $_template = null);
 
     /**
      * populate Source Object with timestamp and exists from Resource
@@ -91,273 +98,38 @@ abstract class Smarty_Resource {
         // intentionally left blank
     }
 
-
     /**
      * modify resource_name according to resource handlers specifications
      *
-     * @param Smarty $smarty        Smarty instance
-     * @param string $resource_name resource_name to make unique
-     * @return string unique resource name
-     */
-    protected function buildUniqueResourceName(Smarty $smarty, $resource_name)
-    {
-        return get_class($this) . '#' . $smarty->joined_template_dir . '#' . $resource_name;
-    }
-
-    /**
-     * populate Compiled Object with compiled filepath
+     * @param  Smarty  $smarty        Smarty instance
+     * @param  string  $resource_name resource_name to make unique
+     * @param  boolean $isConfig      flag for config resource
      *
-     * @param Smarty_Template_Compiled $compiled  compiled object
-     * @param Smarty_Internal_Template $_template template object
-     */
-    public function populateCompiledFilepath(Smarty_Template_Compiled $compiled, Smarty_Internal_Template $_template)
-    {
-        $_compile_id = isset($_template->compile_id) ? preg_replace('![^\w\|]+!', '_', $_template->compile_id) : null;
-        $_filepath = $compiled->source->uid;
-        // if use_sub_dirs, break file into directories
-        if ($_template->smarty->use_sub_dirs) {
-            $_filepath = substr($_filepath, 0, 2) . DS
-             . substr($_filepath, 2, 2) . DS
-             . substr($_filepath, 4, 2) . DS
-             . $_filepath;
-        }
-        $_compile_dir_sep = $_template->smarty->use_sub_dirs ? DS : '^';
-        if (isset($_compile_id)) {
-            $_filepath = $_compile_id . $_compile_dir_sep . $_filepath;
-        }
-        // caching token
-        if ($_template->caching) {
-            $_cache = '.cache';
-        } else {
-            $_cache = '';
-        }
-        $_compile_dir = $_template->smarty->getCompileDir();
-        // set basename if not specified
-        $_basename = $this->getBasename($compiled->source);
-        if ($_basename === null) {
-            $_basename = basename( preg_replace('![^\w\/]+!', '_', $compiled->source->name) );
-        }
-        // separate (optional) basename by dot
-        if ($_basename) {
-            $_basename = '.' . $_basename;
-        }
-
-        $compiled->filepath = $_compile_dir . $_filepath . '.' . $compiled->source->type . $_basename . $_cache . '.php';
-    }
-    
-    /**
-     * Normalize Paths "foo/../bar" to "bar" 
-     *
-     * @param string $_path path to normalize
-     * @param boolean $ds respect windows directory separator
-     * @return string normalized path
+     * @return string unique resource name
      */
-    protected function normalizePath($_path, $ds=true)
+    public function buildUniqueResourceName(Smarty $smarty, $resource_name, $isConfig = false)
     {
-        if ($ds) {
-            // don't we all just love windows?
-            $_path = str_replace('\\', '/', $_path);
-        }
-        
-        $offset = 0;
-        
-        // resolve simples
-        $_path = preg_replace('#(/\./(\./)*)|/{2,}#', '/', $_path);
-        // resolve parents
-        while (true) {
-            $_parent = strpos($_path, '/../', $offset);
-            if (!$_parent) {
-                break;
-            } else if ($_path[$_parent - 1] === '.') {
-                $offset = $_parent + 3;
-                continue;
-            }
-            
-            $_pos = strrpos($_path, '/', $_parent - strlen($_path) - 1);
-            if ($_pos === false) {
-                // don't we all just love windows?
-                $_pos = $_parent;
+        if ($isConfig) {
+            if (!isset($smarty->_joined_config_dir)) {
+                $smarty->getTemplateDir(null, true);
             }
-            
-            $_path = substr_replace($_path, '', $_pos, $_parent + 3 - $_pos);
-        }
-        
-        if ($ds && DS != '/') {
-            // don't we all just love windows?
-            $_path = str_replace('/', '\\', $_path);
-        }
-        
-        return $_path;
-    }
-    
-    /**
-     * build template filepath by traversing the template_dir array
-     *
-     * @param Smarty_Template_Source   $source    source object
-     * @param Smarty_Internal_Template $_template template object
-     * @return string fully qualified filepath
-     * @throws SmartyException if default template handler is registered but not callable
-     */
-    protected function buildFilepath(Smarty_Template_Source $source, Smarty_Internal_Template $_template=null)
-    {
-        $file = $source->name;
-        if ($source instanceof Smarty_Config_Source) {
-            $_directories = $source->smarty->getConfigDir();
-            $_default_handler = $source->smarty->default_config_handler_func;
+            return get_class($this) . '#' . $smarty->_joined_config_dir . '#' . $resource_name;
         } else {
-            $_directories = $source->smarty->getTemplateDir();
-            $_default_handler = $source->smarty->default_template_handler_func;
-        }
-
-        // go relative to a given template?
-        $_file_is_dotted = $file[0] == '.' && ($file[1] == '.' || $file[1] == '/' || $file[1] == "\\");
-        if ($_template && $_template->parent instanceof Smarty_Internal_Template && $_file_is_dotted) {
-            if ($_template->parent->source->type != 'file' && $_template->parent->source->type != 'extends' && !$_template->parent->allow_relative_path) {
-                throw new SmartyException("Template '{$file}' cannot be relative to template of resource type '{$_template->parent->source->type}'");
-            }
-            $file = dirname($_template->parent->source->filepath) . DS . $file;
-            $_file_exact_match = true;
-            if (!preg_match('/^([\/\\\\]|[a-zA-Z]:[\/\\\\])/', $file)) {
-                // the path gained from the parent template is relative to the current working directory
-                // as expansions (like include_path) have already been done
-                $file = getcwd() . DS . $file;
-            }
-        }
-
-        // resolve relative path
-        if (!preg_match('/^([\/\\\\]|[a-zA-Z]:[\/\\\\])/', $file)) {
-            // don't we all just love windows?
-            $_path = str_replace('\\', '/', $file);
-            $_path = DS . trim($file, '/');
-            $_was_relative = true;
-        } else {
-            // don't we all just love windows?
-            $_path = str_replace('\\', '/', $file);
-        }
-        $_path = $this->normalizePath($_path, false);
-        if (DS != '/') {
-            // don't we all just love windows?
-            $_path = str_replace('/', '\\', $_path);
-        }
-        // revert to relative
-        if (isset($_was_relative)) {
-            $_path = substr($_path, 1);
-        }
-
-        // this is only required for directories
-        $file = rtrim($_path, '/\\');
-
-        // files relative to a template only get one shot
-        if (isset($_file_exact_match)) {
-            return $this->fileExists($source, $file) ? $file : false;
-        }
-
-        // template_dir index?
-        if (preg_match('#^\[(?P<key>[^\]]+)\](?P<file>.+)$#', $file, $match)) {
-            $_directory = null;
-            // try string indexes
-            if (isset($_directories[$match['key']])) {
-                $_directory = $_directories[$match['key']];
-            } else if (is_numeric($match['key'])) {
-                // try numeric index
-                $match['key'] = (int) $match['key'];
-                if (isset($_directories[$match['key']])) {
-                    $_directory = $_directories[$match['key']];
-                } else {
-                    // try at location index
-                    $keys = array_keys($_directories);
-                    $_directory = $_directories[$keys[$match['key']]];
-                }
-            }
-
-            if ($_directory) {
-                $_file = substr($file, strpos($file, ']') + 1);
-                $_filepath = $_directory . $_file;
-                if ($this->fileExists($source, $_filepath)) {
-                    return $_filepath;
-                }
+            if (!isset($smarty->_joined_template_dir)) {
+                $smarty->getTemplateDir();
             }
+            return get_class($this) . '#' . $smarty->_joined_template_dir . '#' . $resource_name;
         }
-
-        $_stream_resolve_include_path = function_exists('stream_resolve_include_path');
-
-        // relative file name?
-        if (!preg_match('/^([\/\\\\]|[a-zA-Z]:[\/\\\\])/', $file)) {
-            foreach ($_directories as $_directory) {
-                $_filepath = $_directory . $file;
-                if ($this->fileExists($source, $_filepath)) {
-                    return $this->normalizePath($_filepath);
-                }
-                if ($source->smarty->use_include_path && !preg_match('/^([\/\\\\]|[a-zA-Z]:[\/\\\\])/', $_directory)) {
-                    // try PHP include_path
-                    if ($_stream_resolve_include_path) {
-                        $_filepath = stream_resolve_include_path($_filepath);
-                    } else {
-                        $_filepath = Smarty_Internal_Get_Include_Path::getIncludePath($_filepath);
-                    }
-
-                    if ($_filepath !== false) {
-                        if ($this->fileExists($source, $_filepath)) {
-                            return $this->normalizePath($_filepath);
-                        }
-                    }
-                }
-            }
-        }
-
-        // try absolute filepath
-        if ($this->fileExists($source, $file)) {
-            return $file;
-        }
-
-        // no tpl file found
-        if ($_default_handler) {
-            if (!is_callable($_default_handler)) {
-                if ($source instanceof Smarty_Config_Source) {
-                    throw new SmartyException("Default config handler not callable");
-                } else {
-                    throw new SmartyException("Default template handler not callable");
-                }
-            }
-            $_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;
-                return $_return;
-            } elseif ($_return === true) {
-                $source->content = $_content;
-                $source->timestamp = $_timestamp;
-                $source->exists = true;
-                return $_filepath;
-            }
-        }
-
-        // give up
-        return false;
-    }
-
-    /**
-     * test is file exists and save timestamp
-     *
-     * @param Smarty_Template_Source   $source    source object
-     * @param string $file file name
-     * @return bool  true if file exists
-     */
-    protected function fileExists(Smarty_Template_Source $source, $file)
-    {
-        $source->timestamp = @filemtime($file);
-        return $source->exists = !!$source->timestamp;
-
     }
 
     /**
      * Determine basename for compiled filename
      *
-     * @param Smarty_Template_Source $source source object
-     * @return string resource's basename
+     * @param  Smarty_Template_Source $source source object
+     *
+     * @return string                 resource's basename
      */
-    protected function getBasename(Smarty_Template_Source $source)
+    public function getBasename(Smarty_Template_Source $source)
     {
         return null;
     }
@@ -365,62 +137,41 @@ abstract class Smarty_Resource {
     /**
      * Load Resource Handler
      *
-     * @param Smarty $smarty    smarty object
-     * @param string $type      name of the resource
+     * @param  Smarty $smarty smarty object
+     * @param  string $type   name of the resource
+     *
+     * @throws SmartyException
      * @return Smarty_Resource Resource Handler
      */
     public static function load(Smarty $smarty, $type)
     {
         // try smarty's cache
-        if (isset($smarty->_resource_handlers[$type])) {
-            return $smarty->_resource_handlers[$type];
+        if (isset($smarty->_cache['resource_handlers'][$type])) {
+            return $smarty->_cache['resource_handlers'][$type];
         }
 
         // try registered resource
         if (isset($smarty->registered_resources[$type])) {
-            if ($smarty->registered_resources[$type] instanceof Smarty_Resource) {
-                $smarty->_resource_handlers[$type] = $smarty->registered_resources[$type];
-                // note registered to smarty is not kept unique!
-                return $smarty->_resource_handlers[$type];
-            }
-
-            if (!isset(self::$resources['registered'])) {
-                self::$resources['registered'] = new Smarty_Internal_Resource_Registered();
-            }
-            if (!isset($smarty->_resource_handlers[$type])) {
-                $smarty->_resource_handlers[$type] = self::$resources['registered'];
-            }
-
-            return $smarty->_resource_handlers[$type];
+            return $smarty->_cache['resource_handlers'][$type] =
+                $smarty->registered_resources[$type] instanceof Smarty_Resource ? $smarty->registered_resources[$type] :
+                    new Smarty_Internal_Resource_Registered();
         }
 
         // try sysplugins dir
         if (isset(self::$sysplugins[$type])) {
-            if (!isset(self::$resources[$type])) {
-                $_resource_class = 'Smarty_Internal_Resource_' . ucfirst($type);
-                self::$resources[$type] = new $_resource_class();
-            }
-            return $smarty->_resource_handlers[$type] = self::$resources[$type];
+            $_resource_class = 'Smarty_Internal_Resource_' . ucfirst($type);
+            return $smarty->_cache['resource_handlers'][$type] = new $_resource_class();
         }
 
         // try plugins dir
         $_resource_class = 'Smarty_Resource_' . ucfirst($type);
         if ($smarty->loadPlugin($_resource_class)) {
-            if (isset(self::$resources[$type])) {
-                return $smarty->_resource_handlers[$type] = self::$resources[$type];
-            }
-
             if (class_exists($_resource_class, false)) {
-                self::$resources[$type] = new $_resource_class();
-                return $smarty->_resource_handlers[$type] = self::$resources[$type];
+                return $smarty->_cache['resource_handlers'][$type] = new $_resource_class();
             } else {
-                $smarty->registerResource($type, array(
-                    "smarty_resource_{$type}_source",
-                    "smarty_resource_{$type}_timestamp",
-                    "smarty_resource_{$type}_secure",
-                    "smarty_resource_{$type}_trusted"
-                ));
-
+                $smarty->registerResource($type,
+                                          array("smarty_resource_{$type}_source", "smarty_resource_{$type}_timestamp",
+                                                "smarty_resource_{$type}_secure", "smarty_resource_{$type}_trusted"));
                 // give it another try, now that the resource is registered properly
                 return self::load($smarty, $type);
             }
@@ -433,425 +184,77 @@ abstract class Smarty_Resource {
             if (is_object($smarty->security_policy)) {
                 $smarty->security_policy->isTrustedStream($type);
             }
-            if (!isset(self::$resources['stream'])) {
-                self::$resources['stream'] = new Smarty_Internal_Resource_Stream();
-            }
-            return $smarty->_resource_handlers[$type] = self::$resources['stream'];
+            return $smarty->_cache['resource_handlers'][$type] = new Smarty_Internal_Resource_Stream();
         }
 
         // TODO: try default_(template|config)_handler
 
         // give up
-        throw new SmartyException("Unkown resource type '{$type}'");
+        throw new SmartyException("Unknown resource type '{$type}'");
     }
 
     /**
      * extract resource_type and resource_name from template_resource and config_resource
-     *
      * @note "C:/foo.tpl" was forced to file resource up till Smarty 3.1.3 (including).
-     * @param string  $resource_name    template_resource or config_resource to parse
-     * @param string  $default_resource the default resource_type defined in $smarty
-     * @param string &$name             the parsed resource name
-     * @param string &$type             the parsed resource type
-     * @return void
+     *
+     * @param  string $resource_name    template_resource or config_resource to parse
+     * @param  string $default_resource the default resource_type defined in $smarty
+     *
+     * @return array with parsed resource name and type
      */
-    protected static function parseResourceName($resource_name, $default_resource, &$name, &$type)
+    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);
     }
 
-
-    /**
-     * modify resource_name according to resource handlers specifications
-     *
-     * @param Smarty $smarty        Smarty instance
-     * @param string $resource_name resource_name to make unique
-     * @return string unique resource name
-     */
-
     /**
      * modify template_resource according to resource handlers specifications
      *
-     * @param string $smarty            Smarty instance
-     * @param string $template_resource template_resource to extracate resource handler and name of
+     * @param  \Smarty_Internal_Template|\Smarty $obj               Smarty instance
+     * @param  string                            $template_resource template_resource to extract resource handler and name of
+     *
      * @return string unique resource name
      */
-    public static function getUniqueTemplateName($smarty, $template_resource)
+    public static function getUniqueTemplateName($obj, $template_resource)
     {
-        self::parseResourceName($template_resource, $smarty->default_resource_type, $name, $type);
+        $smarty = $obj->_objType == 2 ? $obj->smarty : $obj;
+        list($name, $type) = self::parseResourceName($template_resource, $smarty->default_resource_type);
         // TODO: optimize for Smarty's internal resource types
         $resource = Smarty_Resource::load($smarty, $type);
+        // go relative to a given template?
+        $_file_is_dotted = $name[0] == '.' && ($name[1] == '.' || $name[1] == '/');
+        if ($obj->_objType == 2 && $_file_is_dotted &&
+            ($obj->source->type == 'file' || $obj->parent->source->type == 'extends')
+        ) {
+            $name = dirname($obj->source->filepath) . DS . $name;
+        }
         return $resource->buildUniqueResourceName($smarty, $name);
     }
 
     /**
      * initialize Source Object for given resource
-     *
+     * wrapper for backward compatibility to versions < 3.1.22
      * Either [$_template] or [$smarty, $template_resource] must be specified
      *
-     * @param Smarty_Internal_Template $_template         template object
-     * @param Smarty                   $smarty            smarty object
-     * @param string                   $template_resource resource identifier
-     * @return Smarty_Template_Source Source Object
-     */
-    public static function source(Smarty_Internal_Template $_template=null, Smarty $smarty=null, $template_resource=null)
-    {
-        if ($_template) {
-            $smarty = $_template->smarty;
-            $template_resource = $_template->template_resource;
-        }
-
-        // parse resource_name, load resource handler, identify unique resource name
-        self::parseResourceName($template_resource, $smarty->default_resource_type, $name, $type);
-        $resource = Smarty_Resource::load($smarty, $type);
-        $unique_resource_name = $resource->buildUniqueResourceName($smarty, $name);
-
-        // check runtime cache
-        $_cache_key = 'template|' . $unique_resource_name;
-        if ($smarty->compile_id) {
-            $_cache_key .= '|'.$smarty->compile_id;
-        }
-        if (isset(self::$sources[$_cache_key])) {
-            return self::$sources[$_cache_key];
-        }
-
-        // create source
-        $source = new Smarty_Template_Source($resource, $smarty, $template_resource, $type, $name, $unique_resource_name);
-        $resource->populate($source, $_template);
-
-        // runtime cache
-        self::$sources[$_cache_key] = $source;
-        return $source;
-    }
-
-    /**
-     * initialize Config Source Object for given resource
+     * @param  Smarty_Internal_Template $_template         template object
+     * @param  Smarty                   $smarty            smarty object
+     * @param  string                   $template_resource resource identifier
      *
-     * @param Smarty_Internal_Config $_config config object
-     * @return Smarty_Config_Source Source Object
+     * @return Smarty_Template_Source   Source Object
      */
-    public static function config(Smarty_Internal_Config $_config)
+    public static function source(Smarty_Internal_Template $_template = null, Smarty $smarty = null,
+                                  $template_resource = null)
     {
-        static $_incompatible_resources = array('eval' => true, 'string' => true, 'extends' => true, 'php' => true);
-        $config_resource = $_config->config_resource;
-        $smarty = $_config->smarty;
-
-        // parse resource_name
-        self::parseResourceName($config_resource, $smarty->default_config_type, $name, $type);
-
-        // make sure configs are not loaded via anything smarty can't handle
-        if (isset($_incompatible_resources[$type])) {
-            throw new SmartyException ("Unable to use resource '{$type}' for config");
-        }
-
-        // load resource handler, identify unique resource name
-        $resource = Smarty_Resource::load($smarty, $type);
-        $unique_resource_name = $resource->buildUniqueResourceName($smarty, $name);
-
-        // check runtime cache
-        $_cache_key = 'config|' . $unique_resource_name;
-        if (isset(self::$sources[$_cache_key])) {
-            return self::$sources[$_cache_key];
-        }
-
-        // create source
-        $source = new Smarty_Config_Source($resource, $smarty, $config_resource, $type, $name, $unique_resource_name);
-        $resource->populate($source, null);
-
-        // runtime cache
-        self::$sources[$_cache_key] = $source;
-        return $source;
+        return Smarty_Template_Source::load($_template, $smarty, $template_resource);
     }
-
-}
-
-/**
- * Smarty Resource Data Object
- *
- * Meta Data Container for Template Files
- *
- * @package Smarty
- * @subpackage TemplateResources
- * @author Rodney Rehm
- *
- * @property integer $timestamp Source Timestamp
- * @property boolean $exists    Source Existance
- * @property boolean $template  Extended Template reference
- * @property string  $content   Source Content
- */
-class Smarty_Template_Source {
-
-    /**
-     * Name of the Class to compile this resource's contents with
-     * @var string
-     */
-    public $compiler_class = null;
-
-    /**
-     * Name of the Class to tokenize this resource's contents with
-     * @var string
-     */
-    public $template_lexer_class = null;
-
-    /**
-     * Name of the Class to parse this resource's contents with
-     * @var string
-     */
-    public $template_parser_class = null;
-
-    /**
-     * Unique Template ID
-     * @var string
-     */
-    public $uid = null;
-
-    /**
-     * Template Resource (Smarty_Internal_Template::$template_resource)
-     * @var string
-     */
-    public $resource = null;
-
-    /**
-     * Resource Type
-     * @var string
-     */
-    public $type = null;
-
-    /**
-     * Resource Name
-     * @var string
-     */
-    public $name = null;
-
-    /**
-     * Unique Resource Name
-     * @var string
-     */
-    public $unique_resource = null;
-
-    /**
-     * Source Filepath
-     * @var string
-     */
-    public $filepath = null;
-
-    /**
-     * Source is bypassing compiler
-     * @var boolean
-     */
-    public $uncompiled = null;
-
-    /**
-     * Source must be recompiled on every occasion
-     * @var boolean
-     */
-    public $recompiled = null;
-
-    /**
-     * The Components an extended template is made of
-     * @var array
-     */
-    public $components = null;
-
-    /**
-     * Resource Handler
-     * @var Smarty_Resource
-     */
-    public $handler = null;
-
-    /**
-     * Smarty instance
-     * @var Smarty
-     */
-    public $smarty = null;
-
-    /**
-     * create Source Object container
-     *
-     * @param Smarty_Resource $handler          Resource Handler this source object communicates with
-     * @param Smarty          $smarty           Smarty instance this source object belongs to
-     * @param string          $resource         full template_resource
-     * @param string          $type             type of resource
-     * @param string          $name             resource name
-     * @param string          $unique_resource  unqiue resource name
-     */
-    public function __construct(Smarty_Resource $handler, Smarty $smarty, $resource, $type, $name, $unique_resource)
-    {
-        $this->handler = $handler; // Note: prone to circular references
-
-        $this->compiler_class = $handler->compiler_class;
-        $this->template_lexer_class = $handler->template_lexer_class;
-        $this->template_parser_class = $handler->template_parser_class;
-        $this->uncompiled = $this->handler instanceof Smarty_Resource_Uncompiled;
-        $this->recompiled = $this->handler instanceof Smarty_Resource_Recompiled;
-
-        $this->smarty = $smarty;
-        $this->resource = $resource;
-        $this->type = $type;
-        $this->name = $name;
-        $this->unique_resource = $unique_resource;
-    }
-
-    /**
-     * get a Compiled Object of this source
-     *
-     * @param Smarty_Internal_Template $_template template objet
-     * @return Smarty_Template_Compiled compiled object
-     */
-    public function getCompiled(Smarty_Internal_Template $_template)
-    {
-        // check runtime cache
-        $_cache_key = $this->unique_resource . '#' . $_template->compile_id;
-        if (isset(Smarty_Resource::$compileds[$_cache_key])) {
-            return Smarty_Resource::$compileds[$_cache_key];
-        }
-
-        $compiled = new Smarty_Template_Compiled($this);
-        $this->handler->populateCompiledFilepath($compiled, $_template);
-        $compiled->timestamp = @filemtime($compiled->filepath);
-        $compiled->exists = !!$compiled->timestamp;
-
-        // runtime cache
-        Smarty_Resource::$compileds[$_cache_key] = $compiled;
-
-        return $compiled;
-    }
-
-    /**
-     * render the uncompiled source
-     *
-     * @param Smarty_Internal_Template $_template template object
-     */
-    public function renderUncompiled(Smarty_Internal_Template $_template)
-    {
-        return $this->handler->renderUncompiled($this, $_template);
-    }
-
-    /**
-     * <<magic>> Generic Setter.
-     *
-     * @param string $property_name valid: timestamp, exists, content, template
-     * @param mixed  $value        new value (is not checked)
-     * @throws SmartyException if $property_name is not valid
-     */
-    public function __set($property_name, $value)
-    {
-        switch ($property_name) {
-            // regular attributes
-            case 'timestamp':
-            case 'exists':
-            case 'content':
-            // required for extends: only
-            case 'template':
-                $this->$property_name = $value;
-                break;
-
-            default:
-                throw new SmartyException("invalid source property '$property_name'.");
-        }
-    }
-
-    /**
-     * <<magic>> Generic getter.
-     *
-     * @param string $property_name valid: timestamp, exists, content
-     * @return mixed
-     * @throws SmartyException if $property_name is not valid
-     */
-    public function __get($property_name)
-    {
-        switch ($property_name) {
-            case 'timestamp':
-            case 'exists':
-                $this->handler->populateTimestamp($this);
-                return $this->$property_name;
-
-            case 'content':
-                return $this->content = $this->handler->getContent($this);
-
-            default:
-                throw new SmartyException("source property '$property_name' does not exist.");
-        }
-    }
-
-}
-
-/**
- * Smarty Resource Data Object
- *
- * Meta Data Container for Template Files
- *
- * @package Smarty
- * @subpackage TemplateResources
- * @author Rodney Rehm
- *
- * @property string $content compiled content
- */
-class Smarty_Template_Compiled {
-
-    /**
-     * Compiled Filepath
-     * @var string
-     */
-    public $filepath = null;
-
-    /**
-     * Compiled Timestamp
-     * @var integer
-     */
-    public $timestamp = null;
-
-    /**
-     * Compiled Existance
-     * @var boolean
-     */
-    public $exists = false;
-
-    /**
-     * Compiled Content Loaded
-     * @var boolean
-     */
-    public $loaded = false;
-
-    /**
-     * Template was compiled
-     * @var boolean
-     */
-    public $isCompiled = false;
-
-    /**
-     * Source Object
-     * @var Smarty_Template_Source
-     */
-    public $source = null;
-
-    /**
-     * Metadata properties
-     *
-     * populated by Smarty_Internal_Template::decodeProperties()
-     * @var array
-     */
-    public $_properties = null;
-
-    /**
-     * create Compiled Object container
-     *
-     * @param Smarty_Template_Source $source source object this compiled object belongs to
-     */
-    public function __construct(Smarty_Template_Source $source)
-    {
-        $this->source = $source;
-    }
-
 }
 
-?>
\ No newline at end of file
diff --git a/include/smarty/libs/sysplugins/smarty_resource_custom.php b/include/smarty/libs/sysplugins/smarty_resource_custom.php
index 9ec1f356b..619f2d6f0 100644
--- a/include/smarty/libs/sysplugins/smarty_resource_custom.php
+++ b/include/smarty/libs/sysplugins/smarty_resource_custom.php
@@ -2,21 +2,20 @@
 /**
  * Smarty Resource Plugin
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage TemplateResources
- * @author Rodney Rehm
+ * @author     Rodney Rehm
  */
 
 /**
  * Smarty Resource Plugin
- *
  * Wrapper Implementation for custom resource plugins
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage TemplateResources
  */
-abstract class Smarty_Resource_Custom extends Smarty_Resource {
-
+abstract class Smarty_Resource_Custom extends Smarty_Resource
+{
     /**
      * fetch template and its modification time from data source
      *
@@ -24,15 +23,15 @@ abstract class Smarty_Resource_Custom extends Smarty_Resource {
      * @param string  &$source template source
      * @param integer &$mtime  template modification timestamp (epoch)
      */
-    protected abstract function fetch($name, &$source, &$mtime);
+    abstract protected function fetch($name, &$source, &$mtime);
 
     /**
      * Fetch template's modification timestamp from data source
-     *
      * {@internal implementing this method is optional.
      *  Only implement it if modification times can be accessed faster than loading the complete template source.}}
      *
-     * @param string $name template name
+     * @param  string $name template name
+     *
      * @return integer|boolean timestamp (epoch) the template was modified, or false if not found
      */
     protected function fetchTimestamp($name)
@@ -46,9 +45,9 @@ abstract class Smarty_Resource_Custom extends Smarty_Resource {
      * @param Smarty_Template_Source   $source    source object
      * @param Smarty_Internal_Template $_template template object
      */
-    public function populate(Smarty_Template_Source $source, Smarty_Internal_Template $_template=null)
+    public function populate(Smarty_Template_Source $source, Smarty_Internal_Template $_template = null)
     {
-        $source->filepath = strtolower($source->type . ':' . $source->name);
+        $source->filepath = $source->type . ':' . $source->name;
         $source->uid = sha1($source->type . ':' . $source->name);
 
         $mtime = $this->fetchTimestamp($source->name);
@@ -57,8 +56,9 @@ abstract class Smarty_Resource_Custom extends Smarty_Resource {
         } else {
             $this->fetch($source->name, $content, $timestamp);
             $source->timestamp = isset($timestamp) ? $timestamp : false;
-            if( isset($content) )
+            if (isset($content)) {
                 $source->content = $content;
+            }
         }
         $source->exists = !!$source->timestamp;
     }
@@ -66,9 +66,10 @@ abstract class Smarty_Resource_Custom extends Smarty_Resource {
     /**
      * Load template's source into current template object
      *
-     * @param Smarty_Template_Source $source source object
-     * @return string template source
-     * @throws SmartyException if source cannot be loaded
+     * @param  Smarty_Template_Source $source source object
+     *
+     * @return string                 template source
+     * @throws SmartyException        if source cannot be loaded
      */
     public function getContent(Smarty_Template_Source $source)
     {
@@ -83,14 +84,12 @@ abstract class Smarty_Resource_Custom extends Smarty_Resource {
     /**
      * Determine basename for compiled filename
      *
-     * @param Smarty_Template_Source $source source object
-     * @return string resource's basename
+     * @param  Smarty_Template_Source $source source object
+     *
+     * @return string                 resource's basename
      */
-    protected function getBasename(Smarty_Template_Source $source)
+    public function getBasename(Smarty_Template_Source $source)
     {
         return basename($source->name);
     }
-
 }
-
-?>
\ No newline at end of file
diff --git a/include/smarty/libs/sysplugins/smarty_resource_recompiled.php b/include/smarty/libs/sysplugins/smarty_resource_recompiled.php
index ab55b93a6..cfd73401b 100644
--- a/include/smarty/libs/sysplugins/smarty_resource_recompiled.php
+++ b/include/smarty/libs/sysplugins/smarty_resource_recompiled.php
@@ -2,26 +2,40 @@
 /**
  * Smarty Resource Plugin
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage TemplateResources
- * @author Rodney Rehm
+ * @author     Rodney Rehm
  */
 
 /**
  * Smarty Resource Plugin
- *
  * Base implementation for resource plugins that don't compile cache
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage TemplateResources
  */
-abstract class Smarty_Resource_Recompiled extends Smarty_Resource {
+abstract class Smarty_Resource_Recompiled extends Smarty_Resource
+{
+    /**
+     * Flag that it's an recompiled resource
+     *
+     * @var bool
+     */
+    public $recompiled = true;
+
+    /**
+     * Resource does implement populateCompiledFilepath() method
+     *
+     * @var bool
+     */
+    public $hasCompiledHandler = true;
 
     /**
      * populate Compiled Object with compiled filepath
      *
-     * @param Smarty_Template_Compiled $compiled compiled object
-     * @param Smarty_Internal_Template $_template template object
+     * @param  Smarty_Template_Compiled $compiled  compiled object
+     * @param  Smarty_Internal_Template $_template template object
+     *
      * @return void
      */
     public function populateCompiledFilepath(Smarty_Template_Compiled $compiled, Smarty_Internal_Template $_template)
@@ -30,7 +44,4 @@ abstract class Smarty_Resource_Recompiled extends Smarty_Resource {
         $compiled->timestamp = false;
         $compiled->exists = false;
     }
-
 }
-
-?>
\ No newline at end of file
diff --git a/include/smarty/libs/sysplugins/smarty_resource_uncompiled.php b/include/smarty/libs/sysplugins/smarty_resource_uncompiled.php
index ea8023507..88d2bba81 100644
--- a/include/smarty/libs/sysplugins/smarty_resource_uncompiled.php
+++ b/include/smarty/libs/sysplugins/smarty_resource_uncompiled.php
@@ -2,29 +2,43 @@
 /**
  * Smarty Resource Plugin
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage TemplateResources
- * @author Rodney Rehm
+ * @author     Rodney Rehm
  */
 
 /**
  * Smarty Resource Plugin
- *
  * Base implementation for resource plugins that don't use the compiler
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage TemplateResources
  */
-abstract class Smarty_Resource_Uncompiled extends Smarty_Resource {
+abstract class Smarty_Resource_Uncompiled extends Smarty_Resource
+{
+    /**
+     * Flag that it's an uncompiled resource
+     *
+     * @var bool
+     */
+    public $uncompiled = true;
+
+    /**
+     * Resource does implement populateCompiledFilepath() method
+     *
+     * @var bool
+     */
+    public $hasCompiledHandler = true;
 
     /**
      * Render and output the template (without using the compiler)
      *
-     * @param Smarty_Template_Source   $source    source object
-     * @param Smarty_Internal_Template $_template template object
-     * @throws SmartyException on failure
+     * @param  Smarty_Template_Source   $source    source object
+     * @param  Smarty_Internal_Template $_template template object
+     *
+     * @throws SmartyException          on failure
      */
-    public abstract function renderUncompiled(Smarty_Template_Source $source, Smarty_Internal_Template $_template);
+    abstract public function renderUncompiled(Smarty_Template_Source $source, Smarty_Internal_Template $_template);
 
     /**
      * populate compiled object with compiled filepath
@@ -39,6 +53,27 @@ abstract class Smarty_Resource_Uncompiled extends Smarty_Resource {
         $compiled->exists = false;
     }
 
+    /**
+     * render compiled template code
+     *
+     * @param Smarty_Internal_Template $_template
+     *
+     * @return string
+     * @throws Exception
+     */
+    public function render($_template)
+    {
+        $level = ob_get_level();
+        ob_start();
+        try {
+            $this->renderUncompiled($_template->source, $_template);
+            return ob_get_clean();
+        }
+        catch (Exception $e) {
+            while (ob_get_level() > $level) {
+                ob_end_clean();
+            }
+            throw $e;
+        }
+    }
 }
-
-?>
\ No newline at end of file
diff --git a/include/smarty/libs/sysplugins/smarty_security.php b/include/smarty/libs/sysplugins/smarty_security.php
index f8b31d963..9d48bcb21 100644
--- a/include/smarty/libs/sysplugins/smarty_security.php
+++ b/include/smarty/libs/sysplugins/smarty_security.php
@@ -2,25 +2,25 @@
 /**
  * Smarty plugin
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage Security
- * @author Uwe Tews
+ * @author     Uwe Tews
  */
- 
+
 /*
  * FIXME: Smarty_Security API
  *      - getter and setter instead of public properties would allow cultivating an internal cache properly
  *      - current implementation of isTrustedResourceDir() assumes that Smarty::$template_dir and Smarty::$config_dir are immutable
  *        the cache is killed every time either of the variables change. That means that two distinct Smarty objects with differing
- *        $template_dir or $config_dir should NOT share the same Smarty_Security instance, 
- *        as this would lead to (severe) performance penalty! how should this be handled? 
+ *        $template_dir or $config_dir should NOT share the same Smarty_Security instance,
+ *        as this would lead to (severe) performance penalty! how should this be handled?
  */
 
 /**
  * This class does contain the security settings
  */
-class Smarty_Security {
-
+class Smarty_Security
+{
     /**
      * This determines how Smarty handles "<?php ... ?>" tags in templates.
      * possible values:
@@ -34,6 +34,7 @@ class Smarty_Security {
      * @var integer
      */
     public $php_handling = Smarty::PHP_PASSTHRU;
+
     /**
      * This is the list of template directories that are considered secure.
      * $template_dir is in this list implicitly.
@@ -41,6 +42,7 @@ class Smarty_Security {
      * @var array
      */
     public $secure_dir = array();
+
     /**
      * This is an array of directories where trusted php scripts reside.
      * {@link $security} is disabled during their inclusion/execution.
@@ -48,124 +50,208 @@ class Smarty_Security {
      * @var array
      */
     public $trusted_dir = array();
+
     /**
      * List of regular expressions (PCRE) that include trusted URIs
      *
      * @var array
      */
     public $trusted_uri = array();
+
     /**
-     * This is an array of trusted static classes.
+     * List of trusted constants names
      *
+     * @var array
+     */
+    public $trusted_constants = array();
+
+    /**
+     * This is an array of trusted static classes.
      * If empty access to all static classes is allowed.
      * If set to 'none' none is allowed.
+     *
      * @var array
      */
     public $static_classes = array();
+
     /**
-     * This is an array of trusted PHP functions.
+     * This is an nested array of trusted classes and static methods.
+     * If empty access to all static classes and methods is allowed.
+     * Format:
+     * array (
+     *         'class_1' => array('method_1', 'method_2'), // allowed methods listed
+     *         'class_2' => array(),                       // all methods of class allowed
+     *       )
+     * If set to null none is allowed.
      *
+     * @var array
+     */
+    public $trusted_static_methods = array();
+
+    /**
+     * This is an array of trusted static properties.
+     * If empty access to all static classes and properties is allowed.
+     * Format:
+     * array (
+     *         'class_1' => array('prop_1', 'prop_2'), // allowed properties listed
+     *         'class_2' => array(),                   // all properties of class allowed
+     *       )
+     * If set to null none is allowed.
+     *
+     * @var array
+     */
+    public $trusted_static_properties = array();
+
+    /**
+     * This is an array of trusted PHP functions.
      * If empty all functions are allowed.
      * To disable all PHP functions set $php_functions = null.
+     *
      * @var array
      */
-    public $php_functions = array(
-        'isset', 'empty',
-        'count', 'sizeof',
-        'in_array', 'is_array',
-        'time',
-        'nl2br',
-    );
+    public $php_functions = array('isset', 'empty', 'count', 'sizeof', 'in_array', 'is_array', 'time',);
+
     /**
-     * This is an array of trusted PHP modifers.
-     *
+     * This is an array of trusted PHP modifiers.
      * If empty all modifiers are allowed.
-     * To disable all modifier set $modifiers = null.
+     * To disable all modifier set $php_modifiers = null.
+     *
      * @var array
      */
-    public $php_modifiers = array(
-        'escape',
-        'count'
-    );
+    public $php_modifiers = array('escape', 'count', 'nl2br',);
+
     /**
      * This is an array of allowed tags.
-     *
      * If empty no restriction by allowed_tags.
+     *
      * @var array
      */
     public $allowed_tags = array();
+
     /**
      * This is an array of disabled tags.
-     *
      * If empty no restriction by disabled_tags.
+     *
      * @var array
      */
     public $disabled_tags = array();
+
     /**
      * This is an array of allowed modifier plugins.
-     *
      * If empty no restriction by allowed_modifiers.
+     *
      * @var array
      */
     public $allowed_modifiers = array();
+
     /**
      * This is an array of disabled modifier plugins.
-     *
      * If empty no restriction by disabled_modifiers.
+     *
      * @var array
      */
     public $disabled_modifiers = array();
+
     /**
-     * This is an array of trusted streams.
+     * This is an array of disabled special $smarty variables.
      *
+     * @var array
+     */
+    public $disabled_special_smarty_vars = array();
+
+    /**
+     * This is an array of trusted streams.
      * If empty all streams are allowed.
      * To disable all streams set $streams = null.
+     *
      * @var array
      */
     public $streams = array('file');
+
     /**
      * + flag if constants can be accessed from template
+     *
      * @var boolean
      */
     public $allow_constants = true;
+
     /**
      * + flag if super globals can be accessed from template
+     *
      * @var boolean
      */
     public $allow_super_globals = true;
 
     /**
-     * Cache for $resource_dir lookups
+     * max template nesting level
+     *
+     * @var int
+     */
+    public $max_template_nesting = 0;
+
+    /**
+     * current template nesting level
+     *
+     * @var int
+     */
+    private $_current_template_nesting = 0;
+
+    /**
+     * Cache for $resource_dir lookup
+     *
      * @var array
      */
-    protected $_resource_dir = null;
+    protected $_resource_dir = array();
+
     /**
-     * Cache for $template_dir lookups
+     * Cache for $template_dir lookup
+     *
      * @var array
      */
-    protected $_template_dir = null;
+    protected $_template_dir = array();
+
     /**
-     * Cache for $config_dir lookups
+     * Cache for $config_dir lookup
+     *
      * @var array
      */
-    protected $_config_dir = null;
+    protected $_config_dir = array();
+
     /**
-     * Cache for $secure_dir lookups
+     * Cache for $secure_dir lookup
+     *
      * @var array
      */
-    protected $_secure_dir = null;
+    protected $_secure_dir = array();
+
     /**
-     * Cache for $php_resource_dir lookups
+     * Cache for $php_resource_dir lookup
+     *
      * @var array
      */
     protected $_php_resource_dir = null;
+
     /**
-     * Cache for $trusted_dir lookups
+     * Cache for $trusted_dir lookup
+     *
      * @var array
      */
     protected $_trusted_dir = null;
-    
-    
+
+    /**
+     * Cache for include path status
+     *
+     * @var bool
+     */
+    protected $_include_path_status = false;
+
+    /**
+     * Cache for $_include_array lookup
+     *
+     * @var array
+     */
+    protected $_include_dir = array();
+
     /**
      * @param Smarty $smarty
      */
@@ -173,74 +259,129 @@ class Smarty_Security {
     {
         $this->smarty = $smarty;
     }
-    
+
     /**
      * Check if PHP function is trusted.
      *
-     * @param string $function_name
-     * @param object $compiler compiler object
-     * @return boolean true if function is trusted
+     * @param  string $function_name
+     * @param  object $compiler compiler object
+     *
+     * @return boolean                 true if function is trusted
      * @throws SmartyCompilerException if php function is not trusted
      */
     public function isTrustedPhpFunction($function_name, $compiler)
     {
-        if (isset($this->php_functions) && (empty($this->php_functions) || in_array($function_name, $this->php_functions))) {
+        if (isset($this->php_functions) &&
+            (empty($this->php_functions) || in_array($function_name, $this->php_functions))
+        ) {
             return true;
         }
 
         $compiler->trigger_template_error("PHP function '{$function_name}' not allowed by security setting");
+
         return false; // should not, but who knows what happens to the compiler in the future?
     }
 
     /**
      * Check if static class is trusted.
      *
-     * @param string $class_name
-     * @param object $compiler compiler object
-     * @return boolean true if class is trusted
+     * @param  string $class_name
+     * @param  object $compiler compiler object
+     *
+     * @return boolean                 true if class is trusted
      * @throws SmartyCompilerException if static class is not trusted
      */
     public function isTrustedStaticClass($class_name, $compiler)
     {
-        if (isset($this->static_classes) && (empty($this->static_classes) || in_array($class_name, $this->static_classes))) {
+        if (isset($this->static_classes) &&
+            (empty($this->static_classes) || in_array($class_name, $this->static_classes))
+        ) {
             return true;
         }
 
         $compiler->trigger_template_error("access to static class '{$class_name}' not allowed by security setting");
+
+        return false; // should not, but who knows what happens to the compiler in the future?
+    }
+
+    /**
+     * Check if static class method/property is trusted.
+     *
+     * @param  string $class_name
+     * @param  string $params
+     * @param  object $compiler compiler object
+     *
+     * @return boolean                 true if class method is trusted
+     * @throws SmartyCompilerException if static class method is not trusted
+     */
+    public function isTrustedStaticClassAccess($class_name, $params, $compiler)
+    {
+        if (!isset($params[2])) {
+            // fall back
+            return $this->isTrustedStaticClass($class_name, $compiler);
+        }
+        if ($params[2] == 'method') {
+            $allowed = $this->trusted_static_methods;
+            $name = substr($params[0], 0, strpos($params[0], '('));
+        } else {
+            $allowed = $this->trusted_static_properties;
+            // strip '$'
+            $name = substr($params[0], 1);
+        }
+        if (isset($allowed)) {
+            if (empty($allowed)) {
+                // fall back
+                return $this->isTrustedStaticClass($class_name, $compiler);
+            }
+            if (isset($allowed[$class_name]) &&
+                (empty($allowed[$class_name]) || in_array($name, $allowed[$class_name]))
+            ) {
+                return true;
+            }
+        }
+        $compiler->trigger_template_error("access to static class '{$class_name}' {$params[2]} '{$name}' not allowed by security setting");
         return false; // should not, but who knows what happens to the compiler in the future?
     }
 
     /**
      * Check if PHP modifier is trusted.
      *
-     * @param string $modifier_name
-     * @param object $compiler compiler object
-     * @return boolean true if modifier is trusted
+     * @param  string $modifier_name
+     * @param  object $compiler compiler object
+     *
+     * @return boolean                 true if modifier is trusted
      * @throws SmartyCompilerException if modifier is not trusted
      */
     public function isTrustedPhpModifier($modifier_name, $compiler)
     {
-        if (isset($this->php_modifiers) && (empty($this->php_modifiers) || in_array($modifier_name, $this->php_modifiers))) {
+        if (isset($this->php_modifiers) &&
+            (empty($this->php_modifiers) || in_array($modifier_name, $this->php_modifiers))
+        ) {
             return true;
         }
 
         $compiler->trigger_template_error("modifier '{$modifier_name}' not allowed by security setting");
+
         return false; // should not, but who knows what happens to the compiler in the future?
     }
 
     /**
      * Check if tag is trusted.
      *
-     * @param string $tag_name
-     * @param object $compiler compiler object
-     * @return boolean true if tag is trusted
+     * @param  string $tag_name
+     * @param  object $compiler compiler object
+     *
+     * @return boolean                 true if tag is trusted
      * @throws SmartyCompilerException if modifier is not trusted
      */
     public function isTrustedTag($tag_name, $compiler)
     {
         // check for internal always required tags
-        if (in_array($tag_name, array('assign', 'call', 'private_filter', 'private_block_plugin', 'private_function_plugin', 'private_object_block_function',
-                    'private_object_function', 'private_registered_function', 'private_registered_block', 'private_special_variable', 'private_print_expression', 'private_modifier'))) {
+        if (in_array($tag_name, array('assign', 'call', 'private_filter', 'private_block_plugin',
+                                      'private_function_plugin', 'private_object_block_function',
+                                      'private_object_function', 'private_registered_function',
+                                      'private_registered_block', 'private_special_variable',
+                                      'private_print_expression', 'private_modifier'))) {
             return true;
         }
         // check security settings
@@ -248,22 +389,44 @@ class Smarty_Security {
             if (empty($this->disabled_tags) || !in_array($tag_name, $this->disabled_tags)) {
                 return true;
             } else {
-                $compiler->trigger_template_error("tag '{$tag_name}' disabled by security setting", $compiler->lex->taglineno);
+                $compiler->trigger_template_error("tag '{$tag_name}' disabled by security setting", null, true);
             }
-        } else if (in_array($tag_name, $this->allowed_tags) && !in_array($tag_name, $this->disabled_tags)) {
+        } elseif (in_array($tag_name, $this->allowed_tags) && !in_array($tag_name, $this->disabled_tags)) {
+            return true;
+        } else {
+            $compiler->trigger_template_error("tag '{$tag_name}' not allowed by security setting", null, true);
+        }
+
+        return false; // should not, but who knows what happens to the compiler in the future?
+    }
+
+    /**
+     * Check if special $smarty variable is trusted.
+     *
+     * @param  string $var_name
+     * @param  object $compiler compiler object
+     *
+     * @return boolean                 true if tag is trusted
+     * @throws SmartyCompilerException if modifier is not trusted
+     */
+    public function isTrustedSpecialSmartyVar($var_name, $compiler)
+    {
+        if (!in_array($var_name, $this->disabled_special_smarty_vars)) {
             return true;
         } else {
-            $compiler->trigger_template_error("tag '{$tag_name}' not allowed by security setting", $compiler->lex->taglineno);
+            $compiler->trigger_template_error("special variable '\$smarty.{$var_name}' not allowed by security setting", null, true);
         }
+
         return false; // should not, but who knows what happens to the compiler in the future?
     }
 
     /**
      * Check if modifier plugin is trusted.
      *
-     * @param string $modifier_name
-     * @param object $compiler compiler object
-     * @return boolean true if tag is trusted
+     * @param  string $modifier_name
+     * @param  object $compiler compiler object
+     *
+     * @return boolean                 true if tag is trusted
      * @throws SmartyCompilerException if modifier is not trusted
      */
     public function isTrustedModifier($modifier_name, $compiler)
@@ -277,21 +440,52 @@ class Smarty_Security {
             if (empty($this->disabled_modifiers) || !in_array($modifier_name, $this->disabled_modifiers)) {
                 return true;
             } else {
-                $compiler->trigger_template_error("modifier '{$modifier_name}' disabled by security setting", $compiler->lex->taglineno);
+                $compiler->trigger_template_error("modifier '{$modifier_name}' disabled by security setting", null, true);
             }
-        } else if (in_array($modifier_name, $this->allowed_modifiers) && !in_array($modifier_name, $this->disabled_modifiers)) {
+        } elseif (in_array($modifier_name, $this->allowed_modifiers) &&
+            !in_array($modifier_name, $this->disabled_modifiers)
+        ) {
             return true;
         } else {
-            $compiler->trigger_template_error("modifier '{$modifier_name}' not allowed by security setting", $compiler->lex->taglineno);
+            $compiler->trigger_template_error("modifier '{$modifier_name}' not allowed by security setting", null, true);
         }
+
         return false; // should not, but who knows what happens to the compiler in the future?
     }
 
     /**
+     * Check if constants are enabled or trusted
+     *
+     * @param  string $const    constant name
+     * @param  object $compiler compiler object
+     *
+     * @return bool
+     */
+    public function isTrustedConstant($const, $compiler)
+    {
+        if (in_array($const, array('true', 'false', 'null'))) {
+            return true;
+        }
+        if (!empty($this->trusted_constants)) {
+            if (!in_array($const, $this->trusted_constants)) {
+                $compiler->trigger_template_error("Security: access to constant '{$const}' not permitted");
+                return false;
+            }
+            return true;
+        }
+        if ($this->allow_constants) {
+            return true;
+        }
+        $compiler->trigger_template_error("Security: access to constants not permitted");
+        return false;
+    }
+
+    /**
      * Check if stream is trusted.
      *
-     * @param string $stream_name
-     * @return boolean true if stream is trusted
+     * @param  string $stream_name
+     *
+     * @return boolean         true if stream is trusted
      * @throws SmartyException if stream is not trusted
      */
     public function isTrustedStream($stream_name)
@@ -306,89 +500,81 @@ class Smarty_Security {
     /**
      * Check if directory of file resource is trusted.
      *
-     * @param string $filepath
-     * @return boolean true if directory is trusted
-     * @throws SmartyException if directory is not trusted
+     * @param  string   $filepath
+     * @param null|bool $isConfig
+     *
+     * @return bool true if directory is trusted
+     * @throws \SmartyException if directory is not trusted
      */
-    public function isTrustedResourceDir($filepath)
+    public function isTrustedResourceDir($filepath, $isConfig = null)
     {
-        $_template = false;
-        $_config = false;
-        $_secure = false;
-
-        $_template_dir = $this->smarty->getTemplateDir();
-        $_config_dir = $this->smarty->getConfigDir();
-
-        // check if index is outdated
-        if ((!$this->_template_dir || $this->_template_dir !== $_template_dir)
-                || (!$this->_config_dir || $this->_config_dir !== $_config_dir)
-                || (!empty($this->secure_dir) && (!$this->_secure_dir || $this->_secure_dir !== $this->secure_dir))
-        ) {
-            $this->_resource_dir = array();
-            $_template = true;
-            $_config = true;
-            $_secure = !empty($this->secure_dir);
-        }
-
-        // rebuild template dir index
-        if ($_template) {
-            $this->_template_dir = $_template_dir;
-            foreach ($_template_dir as $directory) {
-                $directory = realpath($directory);
-                $this->_resource_dir[$directory] = true;
+        if ($this->_include_path_status !== $this->smarty->use_include_path) {
+            foreach ($this->_include_dir as $directory) {
+                unset($this->_resource_dir[$directory]);
             }
+            if ($this->smarty->use_include_path) {
+                $this->_include_dir = array();
+                $_dirs = $this->smarty->ext->_getIncludePath->getIncludePathDirs($this->smarty);
+                foreach ($_dirs as $directory) {
+                    $this->_include_dir[] = $directory;
+                    $this->_resource_dir[$directory] = true;
+                }
+            }
+            $this->_include_path_status = $this->smarty->use_include_path;
         }
-
-        // rebuild config dir index
-        if ($_config) {
-            $this->_config_dir = $_config_dir;
-            foreach ($_config_dir as $directory) {
-                $directory = realpath($directory);
-                $this->_resource_dir[$directory] = true;
+        if ($isConfig !== true &&
+            (!isset($this->smarty->_cache['template_dir_new']) || $this->smarty->_cache['template_dir_new'])
+        ) {
+            $_dir = $this->smarty->getTemplateDir();
+            if ($this->_template_dir !== $_dir) {
+                foreach ($this->_template_dir as $directory) {
+                    unset($this->_resource_dir[$directory]);
+                }
+                foreach ($_dir as $directory) {
+                    $this->_resource_dir[$directory] = true;
+                }
+                $this->_template_dir = $_dir;
             }
+            $this->smarty->_cache['template_dir_new'] = false;
         }
-
-        // rebuild secure dir index
-        if ($_secure) {
-            $this->_secure_dir = $this->secure_dir;
-            foreach ((array) $this->secure_dir as $directory) {
-                $directory = realpath($directory);
-                $this->_resource_dir[$directory] = true;
+        if ($isConfig !== false &&
+            (!isset($this->smarty->_cache['config_dir_new']) || $this->smarty->_cache['config_dir_new'])
+        ) {
+            $_dir = $this->smarty->getConfigDir();
+            if ($this->_config_dir !== $_dir) {
+                foreach ($this->_config_dir as $directory) {
+                    unset($this->_resource_dir[$directory]);
+                }
+                foreach ($_dir as $directory) {
+                    $this->_resource_dir[$directory] = true;
+                }
+                $this->_config_dir = $_dir;
             }
+            $this->smarty->_cache['config_dir_new'] = false;
         }
-
-        $_filepath = realpath($filepath);
-        $directory = dirname($_filepath);
-        $_directory = array();
-        while (true) {
-            // remember the directory to add it to _resource_dir in case we're successful
-            $_directory[$directory] = true;
-            // test if the directory is trusted
-            if (isset($this->_resource_dir[$directory])) {
-                // merge sub directories of current $directory into _resource_dir to speed up subsequent lookups
-                $this->_resource_dir = array_merge($this->_resource_dir, $_directory);
-                return true;
+        if ($this->_secure_dir !== (array) $this->secure_dir) {
+            foreach ($this->_secure_dir as $directory) {
+                unset($this->_resource_dir[$directory]);
             }
-            // abort if we've reached root
-            if (($pos = strrpos($directory, DS)) === false || !isset($directory[1])) {
-                break;
+            foreach ((array) $this->secure_dir as $directory) {
+                $directory = $this->smarty->_realpath($directory . DS, true);
+                $this->_resource_dir[$directory] = true;
             }
-            // bubble up one level
-            $directory = substr($directory, 0, $pos);
+            $this->_secure_dir = (array) $this->secure_dir;
         }
-
-        // give up
-        throw new SmartyException("directory '{$_filepath}' not allowed by security setting");
+        $this->_resource_dir = $this->_checkDir($filepath, $this->_resource_dir);
+        return true;
     }
-    
+
     /**
      * Check if URI (e.g. {fetch} or {html_image}) is trusted
-     *
      * To simplify things, isTrustedUri() resolves all input to "{$PROTOCOL}://{$HOSTNAME}".
      * So "http://username:password@hello.world.example.org:8080/some-path?some=query-string"
      * is reduced to "http://hello.world.example.org" prior to applying the patters from {@link $trusted_uri}.
-     * @param string $uri 
-     * @return boolean true if URI is trusted
+     *
+     * @param  string $uri
+     *
+     * @return boolean         true if URI is trusted
      * @throws SmartyException if URI is not trusted
      * @uses $trusted_uri for list of patterns to match against $uri
      */
@@ -403,15 +589,16 @@ class Smarty_Security {
                 }
             }
         }
-        
+
         throw new SmartyException("URI '{$uri}' not allowed by security setting");
     }
-    
+
     /**
      * Check if directory of file resource is trusted.
      *
-     * @param string $filepath
-     * @return boolean true if directory is trusted
+     * @param  string $filepath
+     *
+     * @return boolean         true if directory is trusted
      * @throws SmartyException if PHP directory is not trusted
      */
     public function isTrustedPHPDir($filepath)
@@ -426,34 +613,103 @@ class Smarty_Security {
 
             $this->_trusted_dir = $this->trusted_dir;
             foreach ((array) $this->trusted_dir as $directory) {
-                $directory = realpath($directory);
+                $directory = $this->smarty->_realpath($directory . DS, true);
                 $this->_php_resource_dir[$directory] = true;
             }
         }
 
-        $_filepath = realpath($filepath);
-        $directory = dirname($_filepath);
+        $this->_php_resource_dir = $this->_checkDir($this->smarty->_realpath($filepath, true), $this->_php_resource_dir);
+        return true;
+    }
+
+    /**
+     * Start template processing
+     *
+     * @param $template
+     *
+     * @throws SmartyException
+     */
+    public function startTemplate($template)
+    {
+        if ($this->max_template_nesting > 0 && $this->_current_template_nesting ++ >= $this->max_template_nesting) {
+            throw new SmartyException("maximum template nesting level of '{$this->max_template_nesting}' exceeded when calling '{$template->template_resource}'");
+        }
+    }
+
+    /**
+     * Exit template processing
+     *
+     * @internal param $template
+     */
+    public function exitTemplate()
+    {
+        if ($this->max_template_nesting > 0) {
+            $this->_current_template_nesting --;
+        }
+    }
+
+    /**
+     * Check if file is inside a valid directory
+     *
+     * @param string $filepath
+     * @param array  $dirs valid directories
+     *
+     * @return array
+     * @throws \SmartyException
+     */
+    private function _checkDir($filepath, $dirs)
+    {
+        $directory = dirname($filepath) . DS;
         $_directory = array();
         while (true) {
             // remember the directory to add it to _resource_dir in case we're successful
-            $_directory[] = $directory;
+            $_directory[$directory] = true;
             // test if the directory is trusted
-            if (isset($this->_php_resource_dir[$directory])) {
-                // merge sub directories of current $directory into _resource_dir to speed up subsequent lookups
-                $this->_php_resource_dir = array_merge($this->_php_resource_dir, $_directory);
-                return true;
+            if (isset($dirs[$directory])) {
+                // merge sub directories of current $directory into _resource_dir to speed up subsequent lookup
+                $dirs = array_merge($dirs, $_directory);
+
+                return $dirs;
             }
             // abort if we've reached root
-            if (($pos = strrpos($directory, DS)) === false || !isset($directory[2])) {
+            if (!preg_match('#[\\\/][^\\\/]+[\\\/]$#', $directory)) {
                 break;
             }
             // bubble up one level
-            $directory = substr($directory, 0, $pos);
+            $directory = preg_replace('#[\\\/][^\\\/]+[\\\/]$#', DS, $directory);
         }
 
-        throw new SmartyException("directory '{$_filepath}' not allowed by security setting");
+        // give up
+        throw new SmartyException("directory '{$filepath}' not allowed by security setting");
     }
 
+    /**
+     * Loads security class and enables security
+     *
+     * @param \Smarty                 $smarty
+     * @param  string|Smarty_Security $security_class if a string is used, it must be class-name
+     *
+     * @return \Smarty current Smarty instance for chaining
+     * @throws \SmartyException when an invalid class name is provided
+     */
+    public static function enableSecurity(Smarty $smarty, $security_class)
+    {
+        if ($security_class instanceof Smarty_Security) {
+            $smarty->security_policy = $security_class;
+            return;
+        } elseif (is_object($security_class)) {
+            throw new SmartyException("Class '" . get_class($security_class) . "' must extend Smarty_Security.");
+        }
+        if ($security_class == null) {
+            $security_class = $smarty->security_class;
+        }
+        if (!class_exists($security_class)) {
+            throw new SmartyException("Security class '$security_class' is not defined");
+        } elseif ($security_class !== 'Smarty_Security' && !is_subclass_of($security_class, 'Smarty_Security')) {
+            throw new SmartyException("Class '$security_class' must extend Smarty_Security.");
+        } else {
+            $smarty->security_policy = new $security_class($smarty);
+        }
+        return;
+    }
 }
-
-?>
\ No newline at end of file
diff --git a/include/smarty/libs/sysplugins/smarty_template_cached.php b/include/smarty/libs/sysplugins/smarty_template_cached.php
new file mode 100644
index 000000000..cecf42986
--- /dev/null
+++ b/include/smarty/libs/sysplugins/smarty_template_cached.php
@@ -0,0 +1,246 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: Uwe Tews
+ * Date: 04.12.2014
+ * Time: 06:08
+ */
+
+/**
+ * Smarty Resource Data Object
+ * Cache Data Container for Template Files
+ *
+ * @package    Smarty
+ * @subpackage TemplateResources
+ * @author     Rodney Rehm
+ */
+class Smarty_Template_Cached extends Smarty_Template_Resource_Base
+{
+    /**
+     * Cache Is Valid
+     *
+     * @var boolean
+     */
+    public $valid = null;
+
+    /**
+     * CacheResource Handler
+     *
+     * @var Smarty_CacheResource
+     */
+    public $handler = null;
+
+    /**
+     * Template Cache Id (Smarty_Internal_Template::$cache_id)
+     *
+     * @var string
+     */
+    public $cache_id = null;
+
+    /**
+     * saved cache lifetime in seconds
+     *
+     * @var integer
+     */
+    public $cache_lifetime = 0;
+
+    /**
+     * Id for cache locking
+     *
+     * @var string
+     */
+    public $lock_id = null;
+
+    /**
+     * flag that cache is locked by this instance
+     *
+     * @var bool
+     */
+    public $is_locked = false;
+
+    /**
+     * Source Object
+     *
+     * @var Smarty_Template_Source
+     */
+    public $source = null;
+
+    /**
+     * Nocache hash codes of processed compiled templates
+     *
+     * @var array
+     */
+    public $hashes = array();
+
+    /**
+     * create Cached Object container
+     *
+     * @param Smarty_Internal_Template $_template template object
+     */
+    public function __construct(Smarty_Internal_Template $_template)
+    {
+        $this->compile_id = $_template->compile_id;
+        $this->cache_id = $_template->cache_id;
+        $this->source = $_template->source;
+        if (!class_exists('Smarty_CacheResource', false)) {
+            require SMARTY_SYSPLUGINS_DIR . 'smarty_cacheresource.php';
+        }
+        $this->handler = Smarty_CacheResource::load($_template->smarty);
+    }
+
+    /**
+     * @param Smarty_Internal_Template $_template
+     *
+     * @return Smarty_Template_Cached
+     */
+    static function load(Smarty_Internal_Template $_template)
+    {
+        $_template->cached = new Smarty_Template_Cached($_template);
+        $_template->cached->handler->populate($_template->cached, $_template);
+        // caching enabled ?
+        if (!($_template->caching == Smarty::CACHING_LIFETIME_CURRENT ||
+                $_template->caching == Smarty::CACHING_LIFETIME_SAVED) || $_template->source->handler->recompiled
+        ) {
+            $_template->cached->valid = false;
+        }
+        return $_template->cached;
+    }
+
+    /**
+     * Render cache template
+     *
+     * @param \Smarty_Internal_Template $_template
+     * @param  bool                     $no_output_filter
+     *
+     * @throws \Exception
+     */
+    public function render(Smarty_Internal_Template $_template, $no_output_filter = true)
+    {
+        if ($this->isCached($_template)) {
+            if ($_template->smarty->debugging) {
+                $_template->smarty->_debug->start_cache($_template);
+            }
+            if (!$this->processed) {
+                $this->process($_template);
+            }
+            $this->getRenderedTemplateCode($_template);
+            if ($_template->smarty->debugging) {
+                $_template->smarty->_debug->end_cache($_template);
+            }
+            return;
+        } else {
+            $_template->smarty->ext->_updateCache->updateCache($this, $_template, $no_output_filter);
+        }
+    }
+
+    /**
+     * 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) {
+                if ($this->exists === false || $_template->smarty->force_compile || $_template->smarty->force_cache) {
+                    $this->valid = false;
+                } else {
+                    $this->valid = true;
+                }
+                if ($this->valid && $_template->caching == Smarty::CACHING_LIFETIME_CURRENT &&
+                    $_template->cache_lifetime >= 0 && time() > ($this->timestamp + $_template->cache_lifetime)
+                ) {
+                    // lifetime expired
+                    $this->valid = false;
+                }
+                if ($this->valid && $_template->smarty->compile_check == 1 &&
+                    $_template->source->getTimeStamp() > $this->timestamp
+                ) {
+                    $this->valid = false;
+                }
+                if ($this->valid || !$_template->smarty->cache_locking) {
+                    break;
+                }
+                if (!$this->handler->locked($_template->smarty, $this)) {
+                    $this->handler->acquireLock($_template->smarty, $this);
+                    break 2;
+                }
+                $this->handler->populate($this, $_template);
+            }
+            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) {
+                        $_template->smarty->_debug->start_cache($_template);
+                    }
+                    if ($this->handler->process($_template, $this) === false) {
+                        $this->valid = false;
+                    } else {
+                        $this->processed = true;
+                    }
+                    if ($_template->smarty->debugging) {
+                        $_template->smarty->_debug->end_cache($_template);
+                    }
+                } else {
+                    $this->is_locked = true;
+                    continue;
+                }
+            } else {
+                return $this->valid;
+            }
+            if ($this->valid && $_template->caching === Smarty::CACHING_LIFETIME_SAVED &&
+                $_template->cached->cache_lifetime >= 0 &&
+                (time() > ($_template->cached->timestamp + $_template->cached->cache_lifetime))
+            ) {
+                $this->valid = false;
+            }
+            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;
+    }
+
+    /**
+     * Process cached template
+     *
+     * @param Smarty_Internal_Template $_template template object
+     * @param bool                     $update    flag if called because cache update
+     */
+    public function process(Smarty_Internal_Template $_template, $update = false)
+    {
+        if ($this->handler->process($_template, $this, $update) === false) {
+            $this->valid = false;
+        }
+        if ($this->valid) {
+            $this->processed = true;
+        } else {
+            $this->processed = false;
+        }
+    }
+
+    /**
+     * Read cache content from handler
+     *
+     * @param Smarty_Internal_Template $_template template object
+     *
+     * @return string content
+     */
+    public function read(Smarty_Internal_Template $_template)
+    {
+        if (!$_template->source->handler->recompiled) {
+            return $this->handler->readCachedContent($_template);
+        }
+        return false;
+    }
+}
diff --git a/include/smarty/libs/sysplugins/smarty_template_compiled.php b/include/smarty/libs/sysplugins/smarty_template_compiled.php
new file mode 100644
index 000000000..e7710f85e
--- /dev/null
+++ b/include/smarty/libs/sysplugins/smarty_template_compiled.php
@@ -0,0 +1,297 @@
+<?php
+
+/**
+ * Smarty Resource Data Object
+ * Meta Data Container for Template Files
+ *
+ * @package    Smarty
+ * @subpackage TemplateResources
+ * @author     Rodney Rehm
+ * @property string $content compiled content
+ */
+class Smarty_Template_Compiled extends Smarty_Template_Resource_Base
+{
+
+    /**
+     * nocache hash
+     *
+     * @var string|null
+     */
+    public $nocache_hash = null;
+
+    /**
+     * get a Compiled Object of this source
+     *
+     * @param  Smarty_Internal_Template $_template template object
+     *
+     * @return Smarty_Template_Compiled compiled object
+     */
+    static function load($_template)
+    {
+        // check runtime cache
+        if (!$_template->source->handler->recompiled &&
+            ($_template->smarty->resource_cache_mode & Smarty::RESOURCE_CACHE_ON)
+        ) {
+            $_cache_key = $_template->source->unique_resource . '#';
+            if ($_template->caching) {
+                $_cache_key .= 'caching#';
+            }
+            $_cache_key .= $_template->compile_id;
+            if (isset($_template->source->compileds[$_cache_key])) {
+                return $_template->source->compileds[$_cache_key];
+            }
+        }
+        $compiled = new Smarty_Template_Compiled();
+        if ($_template->source->handler->hasCompiledHandler) {
+            $_template->source->handler->populateCompiledFilepath($compiled, $_template);
+        } else {
+            $compiled->populateCompiledFilepath($_template);
+        }
+        // runtime cache
+        if (!$_template->source->handler->recompiled &&
+            ($_template->smarty->resource_cache_mode & Smarty::RESOURCE_CACHE_ON)
+        ) {
+            $_template->source->compileds[$_cache_key] = $compiled;
+        }
+        return $compiled;
+    }
+
+    /**
+     * populate Compiled Object with compiled filepath
+     *
+     * @param Smarty_Internal_Template $_template template object
+     **/
+    public function populateCompiledFilepath(Smarty_Internal_Template $_template)
+    {
+        $_compile_id = isset($_template->compile_id) ? preg_replace('![^\w]+!', '_', $_template->compile_id) : null;
+        if ($_template->source->isConfig) {
+            $_flag = '_' .
+                ((int) $_template->smarty->config_read_hidden + (int) $_template->smarty->config_booleanize * 2 +
+                    (int) $_template->smarty->config_overwrite * 4);
+        } else {
+            $_flag =
+                '_' . ((int) $_template->smarty->merge_compiled_includes + (int) $_template->smarty->escape_html * 2);
+        }
+        $_filepath = $_template->source->uid . $_flag;
+        // if use_sub_dirs, break file into directories
+        if ($_template->smarty->use_sub_dirs) {
+            $_filepath = substr($_filepath, 0, 2) . DS . substr($_filepath, 2, 2) . DS . substr($_filepath, 4, 2) . DS .
+                $_filepath;
+        }
+        $_compile_dir_sep = $_template->smarty->use_sub_dirs ? DS : '^';
+        if (isset($_compile_id)) {
+            $_filepath = $_compile_id . $_compile_dir_sep . $_filepath;
+        }
+        // caching token
+        if ($_template->caching) {
+            $_cache = '.cache';
+        } else {
+            $_cache = '';
+        }
+        $_compile_dir = $_template->smarty->getCompileDir();
+        // set basename if not specified
+        $_basename = $_template->source->handler->getBasename($_template->source);
+        if ($_basename === null) {
+            $_basename = basename(preg_replace('![^\w]+!', '_', $_template->source->name));
+        }
+        // separate (optional) basename by dot
+        if ($_basename) {
+            $_basename = '.' . $_basename;
+        }
+
+        $this->filepath = $_compile_dir . $_filepath . '.' . $_template->source->type . $_basename . $_cache . '.php';
+        $this->exists = is_file($this->filepath);
+        if (!$this->exists) {
+            $this->timestamp = false;
+        }
+    }
+
+    /**
+     * load compiled template or compile from source
+     *
+     * @param Smarty_Internal_Template $_template
+     *
+     * @throws Exception
+     */
+    public function process(Smarty_Internal_Template $_template)
+    {
+        $_smarty_tpl = $_template;
+        if ($_template->source->handler->recompiled || !$_template->compiled->exists ||
+            $_template->smarty->force_compile || ($_template->smarty->compile_check &&
+                $_template->source->getTimeStamp() > $_template->compiled->getTimeStamp())
+        ) {
+            $this->compileTemplateSource($_template);
+            $compileCheck = $_template->smarty->compile_check;
+            $_template->smarty->compile_check = false;
+            if ($_template->source->handler->recompiled) {
+                $level = ob_get_level();
+                ob_start();
+                try {
+                    eval("?>" . $this->content);
+                }
+                catch (Exception $e) {
+                    while (ob_get_level() > $level) {
+                        ob_end_clean();
+                    }
+                    throw $e;
+                }
+                ob_get_clean();
+                $this->content = null;
+            } else {
+                $this->loadCompiledTemplate($_template);
+            }
+            $_template->smarty->compile_check = $compileCheck;
+        } else {
+            $_template->mustCompile = true;
+            @include($_template->compiled->filepath);
+            if ($_template->mustCompile) {
+                $this->compileTemplateSource($_template);
+                $compileCheck = $_template->smarty->compile_check;
+                $_template->smarty->compile_check = false;
+                $this->loadCompiledTemplate($_template);
+                $_template->smarty->compile_check = $compileCheck;
+            }
+        }
+        $_template->smarty->ext->_subTemplate->registerSubTemplates($_template);
+
+        $this->processed = true;
+    }
+
+    /**
+     * Load fresh compiled template by including the PHP file
+     * HHVM requires a work around because of a PHP incompatibility
+     *
+     * @param \Smarty_Internal_Template $_template
+     */
+    private function loadCompiledTemplate(Smarty_Internal_Template $_template)
+    {
+        if (function_exists('opcache_invalidate')) {
+            opcache_invalidate($_template->compiled->filepath);
+        }
+        $_smarty_tpl = $_template;
+        if (defined('HHVM_VERSION')) {
+            $_template->smarty->ext->_hhvm->includeHhvm($_template, $_template->compiled->filepath);
+        } else {
+            include($_template->compiled->filepath);
+        }
+    }
+
+    /**
+     * render compiled template code
+     *
+     * @param Smarty_Internal_Template $_template
+     *
+     * @return string
+     * @throws Exception
+     */
+    public function render(Smarty_Internal_Template $_template)
+    {
+        if ($_template->smarty->debugging) {
+            $_template->smarty->_debug->start_render($_template);
+        }
+        if (!$this->processed) {
+            $this->process($_template);
+        }
+        if (isset($_template->cached)) {
+            $_template->cached->file_dependency =
+                array_merge($_template->cached->file_dependency, $this->file_dependency);
+        }
+        $this->getRenderedTemplateCode($_template);
+        if ($_template->caching && $this->has_nocache_code) {
+            $_template->cached->hashes[$this->nocache_hash] = true;
+        }
+        if (isset($_template->parent) && $_template->parent->_objType == 2 && !empty($_template->tpl_function)) {
+            $_template->parent->tpl_function = array_merge($_template->parent->tpl_function, $_template->tpl_function);
+        }
+        if ($_template->smarty->debugging) {
+            $_template->smarty->_debug->end_render($_template);
+        }
+    }
+
+    /**
+     * compile template from source
+     *
+     * @param Smarty_Internal_Template $_template
+     *
+     * @return string
+     * @throws Exception
+     */
+    public function compileTemplateSource(Smarty_Internal_Template $_template)
+    {
+        $_template->source->compileds = array();
+        $this->file_dependency = array();
+        $this->tpl_function = array();
+        $this->includes = array();
+        $this->nocache_hash = null;
+        $this->unifunc = null;
+        // compile locking
+        if (!$_template->source->handler->recompiled) {
+            if ($saved_timestamp = $_template->compiled->getTimeStamp()) {
+                touch($_template->compiled->filepath);
+            }
+        }
+        // call compiler
+        try {
+            $_template->loadCompiler();
+            $code = $_template->compiler->compileTemplate($_template);
+        }
+        catch (Exception $e) {
+            // restore old timestamp in case of error
+            if (!$_template->source->handler->recompiled && $saved_timestamp) {
+                touch($_template->compiled->filepath, $saved_timestamp);
+            }
+            throw $e;
+        }
+        // compiling succeeded
+        if ($_template->compiler->write_compiled_code) {
+            // write compiled template
+            $this->write($_template, $code);
+            $code = '';
+        }
+        // release compiler object to free memory
+        unset($_template->compiler);
+        return $code;
+    }
+
+    /**
+     * Write compiled code by handler
+     *
+     * @param Smarty_Internal_Template $_template template object
+     * @param string                   $code      compiled code
+     *
+     * @return boolean success
+     */
+    public function write(Smarty_Internal_Template $_template, $code)
+    {
+        if (!$_template->source->handler->recompiled) {
+            if ($_template->smarty->ext->_writeFile->writeFile($this->filepath, $code, $_template->smarty) === true) {
+                $this->timestamp = $this->exists = is_file($this->filepath);
+                if ($this->exists) {
+                    $this->timestamp = filemtime($this->filepath);
+                    return true;
+                }
+            }
+            return false;
+        } else {
+            $this->content = $code;
+        }
+        $this->timestamp = time();
+        $this->exists = true;
+        return true;
+    }
+
+    /**
+     * Read compiled content from handler
+     *
+     * @param Smarty_Internal_Template $_template template object
+     *
+     * @return string content
+     */
+    public function read(Smarty_Internal_Template $_template)
+    {
+        if (!$_template->source->handler->recompiled) {
+            return file_get_contents($this->filepath);
+        }
+        return isset($this->content) ? $this->content : false;
+    }
+}
diff --git a/include/smarty/libs/sysplugins/smarty_template_config.php b/include/smarty/libs/sysplugins/smarty_template_config.php
new file mode 100644
index 000000000..f0fff5080
--- /dev/null
+++ b/include/smarty/libs/sysplugins/smarty_template_config.php
@@ -0,0 +1,97 @@
+<?php
+/**
+ * Smarty Config Source Plugin
+ *
+ * @package    Smarty
+ * @subpackage TemplateResources
+ * @author     Uwe Tews
+ */
+
+/**
+ * Smarty Connfig Resource Data Object
+ * Meta Data Container for Template Files
+ *
+ * @package    Smarty
+ * @subpackage TemplateResources
+ * @author     Uwe Tews
+ *
+ */
+class Smarty_Template_Config extends Smarty_Template_Source
+{
+    /**
+     * array of section names, single section or null
+     *
+     * @var null|string|array
+     */
+    public $config_sections = null;
+
+    /**
+     * scope into which the config variables shall be loaded
+     *
+     * @var string
+     */
+    public $scope = 'local';
+
+    /**
+     * Flag that source is a config file
+     *
+     * @var bool
+     */
+    public $isConfig = true;
+
+    /**
+     * create Source Object container
+     *
+     * @param Smarty_Resource $handler  Resource Handler this source object communicates with
+     * @param Smarty          $smarty   Smarty instance this source object belongs to
+     * @param string          $resource full template_resource
+     * @param string          $type     type of resource
+     * @param string          $name     resource name
+     */
+    public function __construct(Smarty_Resource $handler, Smarty $smarty, $resource, $type, $name)
+    {
+        // must clone handler as we change class names
+        $this->handler = clone $handler; // Note: prone to circular references
+        $this->handler->compiler_class = 'Smarty_Internal_Config_File_Compiler';
+        $this->handler->template_lexer_class = 'Smarty_Internal_Configfilelexer';
+        $this->handler->template_parser_class = 'Smarty_Internal_Configfileparser';
+        $this->resource = $resource;
+        $this->type = $type;
+        $this->name = $name;
+        $this->smarty = $smarty;
+    }
+
+    /**
+     * initialize Source Object for given resource
+     * Either [$_template] or [$smarty, $template_resource] must be specified
+     *
+     * @param  Smarty_Internal_Template $_template         template object
+     * @param  Smarty                   $smarty            smarty object
+     * @param  string                   $template_resource resource identifier
+     *
+     * @return Smarty_Template_Config Source Object
+     * @throws SmartyException
+     */
+    public static function load(Smarty_Internal_Template $_template = null, Smarty $smarty = null, $template_resource = null)
+    {
+        static $_incompatible_resources = array('extends' => true, 'php' => true);
+        $template_resource = $_template->template_resource;
+        if (empty($template_resource)) {
+            throw new SmartyException('Missing config name');
+        }
+        // parse resource_name, load resource handler
+        list($name, $type) = Smarty_Resource::parseResourceName($template_resource, $_template->smarty->default_config_type);
+        // make sure configs are not loaded via anything smarty can't handle
+        if (isset($_incompatible_resources[$type])) {
+            throw new SmartyException ("Unable to use resource '{$type}' for config");
+        }
+        $resource = Smarty_Resource::load($_template->smarty, $type);
+        $source = new Smarty_Template_Config($resource, $_template->smarty, $template_resource, $type, $name);
+        $resource->populate($source, $_template);
+        if (!$source->exists && isset($_template->smarty->default_config_handler_func)) {
+            Smarty_Internal_Method_RegisterDefaultTemplateHandler::_getDefaultTemplate($source);
+        }
+        $source->unique_resource = $resource->buildUniqueResourceName($_template->smarty, $name, true);
+        return $source;
+    }
+}
diff --git a/include/smarty/libs/sysplugins/smarty_template_resource_base.php b/include/smarty/libs/sysplugins/smarty_template_resource_base.php
new file mode 100644
index 000000000..b9e2e2830
--- /dev/null
+++ b/include/smarty/libs/sysplugins/smarty_template_resource_base.php
@@ -0,0 +1,162 @@
+<?php
+
+/**
+ * Smarty Template Resource Base Object
+ *
+ * @package    Smarty
+ * @subpackage TemplateResources
+ * @author     Rodney Rehm
+ */
+abstract class Smarty_Template_Resource_Base
+{
+    /**
+     * Compiled Filepath
+     *
+     * @var string
+     */
+    public $filepath = null;
+
+    /**
+     * Compiled Timestamp
+     *
+     * @var integer
+     */
+    public $timestamp = null;
+
+    /**
+     * Compiled Existence
+     *
+     * @var boolean
+     */
+    public $exists = false;
+
+    /**
+     * Template Compile Id (Smarty_Internal_Template::$compile_id)
+     *
+     * @var string
+     */
+    public $compile_id = null;
+
+    /**
+     * Compiled Content Loaded
+     *
+     * @var boolean
+     */
+    public $processed = false;
+
+    /**
+     * unique function name for compiled template code
+     *
+     * @var string
+     */
+    public $unifunc = '';
+
+    /**
+     * flag if template does contain nocache code sections
+     *
+     * @var bool
+     */
+    public $has_nocache_code = false;
+
+    /**
+     * resource file dependency
+     *
+     * @var array
+     */
+    public $file_dependency = array();
+
+    /**
+     * Content buffer
+     *
+     * @var string
+     */
+    public $content = null;
+
+    /**
+     * required plugins
+     *
+     * @var array
+     */
+    public $required_plugins = array();
+
+    /**
+     * Known template functions
+     *
+     * @var array
+     */
+    public $tpl_function = array();
+
+    /**
+     * Included subtemplates
+     *
+     * @var array
+     */
+    public $includes = array();
+
+    /**
+     * Process resource
+     *
+     * @param Smarty_Internal_Template $_template template object
+     */
+    abstract public function process(Smarty_Internal_Template $_template);
+
+     /**
+     * get rendered template content by calling compiled or cached template code
+     *
+     * @param string $unifunc function with template code
+     *
+     * @return string
+     * @throws \Exception
+     */
+    public function getRenderedTemplateCode(Smarty_Internal_Template $_template, $unifunc = null)
+    {
+        $unifunc = isset($unifunc) ? $unifunc : $this->unifunc;
+        $level = ob_get_level();
+        try {
+            if (empty($unifunc) || !is_callable($unifunc)) {
+                throw new SmartyException("Invalid compiled template for '{$_template->template_resource}'");
+            }
+            if (isset($_template->smarty->security_policy)) {
+                $_template->smarty->security_policy->startTemplate($_template);
+            }
+            //
+            // render compiled or saved template code
+            //
+            if (!isset($_template->_cache['capture_stack'])) {
+                $_template->_cache['capture_stack'] = array();
+            }
+            $_saved_capture_level = count($_template->_cache['capture_stack']);
+            $unifunc($_template);
+            // any unclosed {capture} tags ?
+            if ($_saved_capture_level != count($_template->_cache['capture_stack'])) {
+                $_template->capture_error();
+            }
+            if (isset($_template->smarty->security_policy)) {
+                $_template->smarty->security_policy->exitTemplate();
+            }
+            return null;
+        }
+        catch (Exception $e) {
+            while (ob_get_level() > $level) {
+                ob_end_clean();
+            }
+             if (isset($_template->smarty->security_policy)) {
+                $_template->smarty->security_policy->exitTemplate();
+            }
+            throw $e;
+        }
+    }
+
+    /**
+     * Get compiled time stamp
+     *
+     * @return int
+     */
+    public function getTimeStamp()
+    {
+        if ($this->exists && !isset($this->timestamp)) {
+            $this->timestamp = @filemtime($this->filepath);
+        }
+        return $this->timestamp;
+    }
+}
diff --git a/include/smarty/libs/sysplugins/smarty_template_source.php b/include/smarty/libs/sysplugins/smarty_template_source.php
new file mode 100644
index 000000000..be5b62809
--- /dev/null
+++ b/include/smarty/libs/sysplugins/smarty_template_source.php
@@ -0,0 +1,267 @@
+<?php
+
+/**
+ * Smarty Resource Data Object
+ * Meta Data Container for Template Files
+ *
+ * @package    Smarty
+ * @subpackage TemplateResources
+ * @author     Rodney Rehm
+ *
+ */
+class Smarty_Template_Source
+{
+    /**
+     * Unique Template ID
+     *
+     * @var string
+     */
+    public $uid = null;
+
+    /**
+     * Template Resource (Smarty_Internal_Template::$template_resource)
+     *
+     * @var string
+     */
+    public $resource = null;
+
+    /**
+     * Resource Type
+     *
+     * @var string
+     */
+    public $type = null;
+
+    /**
+     * Resource Name
+     *
+     * @var string
+     */
+    public $name = null;
+
+    /**
+     * Unique Resource Name
+     *
+     * @var string
+     */
+    public $unique_resource = null;
+
+    /**
+     * Source Filepath
+     *
+     * @var string
+     */
+    public $filepath = null;
+
+    /**
+     * Source Timestamp
+     *
+     * @var integer
+     */
+    public $timestamp = null;
+
+    /**
+     * Source Existence
+     *
+     * @var boolean
+     */
+    public $exists = false;
+
+    /**
+     * Source File Base name
+     *
+     * @var string
+     */
+    public $basename = null;
+
+    /**
+     * The Components an extended template is made of
+     *
+     * @var \Smarty_Template_Source[]
+     */
+    public $components = null;
+
+    /**
+     * Resource Handler
+     *
+     * @var \Smarty_Resource
+     */
+    public $handler = null;
+
+    /**
+     * Smarty instance
+     *
+     * @var Smarty
+     */
+    public $smarty = null;
+
+    /**
+     * Resource is source
+     *
+     * @var bool
+     */
+    public $isConfig = false;
+
+    /**
+     * cache for Smarty_Template_Compiled instances
+     *
+     * @var Smarty_Template_Compiled[]
+     */
+    public $compileds = array();
+
+    /**
+     * Template source content eventually set by default handler
+     *
+     * @var string
+     */
+    public $content = null;
+
+    /**
+     * create Source Object container
+     *
+     * @param Smarty_Resource $handler  Resource Handler this source object communicates with
+     * @param Smarty          $smarty   Smarty instance this source object belongs to
+     * @param string          $resource full template_resource
+     * @param string          $type     type of resource
+     * @param string          $name     resource name
+     *
+     */
+    public function __construct(Smarty_Resource $handler, Smarty $smarty, $resource, $type, $name)
+    {
+        $this->handler = $handler; // Note: prone to circular references
+        $this->smarty = $smarty;
+        $this->resource = $resource;
+        $this->type = $type;
+        $this->name = $name;
+    }
+
+    /**
+     * initialize Source Object for given resource
+     * Either [$_template] or [$smarty, $template_resource] must be specified
+     *
+     * @param  Smarty_Internal_Template $_template         template object
+     * @param  Smarty                   $smarty            smarty object
+     * @param  string                   $template_resource resource identifier
+     *
+     * @return Smarty_Template_Source Source Object
+     * @throws SmartyException
+     */
+    public static function load(Smarty_Internal_Template $_template = null, Smarty $smarty = null,
+                                $template_resource = null)
+    {
+        if ($_template) {
+            $smarty = $_template->smarty;
+            $template_resource = $_template->template_resource;
+        }
+        if (empty($template_resource)) {
+            throw new SmartyException('Missing template name');
+        }
+        // parse resource_name, load resource handler, identify unique resource name
+        if (preg_match('/^([A-Za-z0-9_\-]{2,})[:]([\s\S]*)$/', $template_resource, $match)) {
+            $type = $match[1];
+            $name = $match[2];
+        } else {
+            // no resource given, use default
+            // or single character before the colon is not a resource type, but part of the filepath
+            $type = $smarty->default_resource_type;
+            $name = $template_resource;
+        }
+
+        $handler = isset($smarty->_cache['resource_handlers'][$type]) ?
+            $smarty->_cache['resource_handlers'][$type] :
+            Smarty_Resource::load($smarty, $type);
+        // if resource is not recompiling and resource name is not dotted we can check the source cache
+        if (($smarty->resource_cache_mode & Smarty::RESOURCE_CACHE_ON) && !$handler->recompiled &&
+            !(isset($name[1]) && $name[0] == '.' && ($name[1] == '.' || $name[1] == '/'))
+        ) {
+            $unique_resource = $handler->buildUniqueResourceName($smarty, $name);
+            if (isset($smarty->_cache['source_objects'][$unique_resource])) {
+                return $smarty->_cache['source_objects'][$unique_resource];
+            }
+        } else {
+            $unique_resource = null;
+        }
+        // create new source  object
+        $source = new Smarty_Template_Source($handler, $smarty, $template_resource, $type, $name);
+        $handler->populate($source, $_template);
+        if (!$source->exists && isset($_template->smarty->default_template_handler_func)) {
+            Smarty_Internal_Method_RegisterDefaultTemplateHandler::_getDefaultTemplate($source);
+        }
+        // on recompiling resources we are done
+        if (($smarty->resource_cache_mode & Smarty::RESOURCE_CACHE_ON) && !$handler->recompiled) {
+            // may by we have already $unique_resource
+            $is_relative = false;
+            if (!isset($unique_resource)) {
+                $is_relative = isset($name[1]) && $name[0] == '.' && ($name[1] == '.' || $name[1] == '/') &&
+                    ($type == 'file' ||
+                        (isset($_template->parent->source) && $_template->parent->source->type == 'extends'));
+                $unique_resource =
+                    $handler->buildUniqueResourceName($smarty, $is_relative ? $source->filepath . $name : $name);
+            }
+            $source->unique_resource = $unique_resource;
+            // save in runtime cache if not relative
+            if (!$is_relative) {
+                $smarty->_cache['source_objects'][$unique_resource] = $source;
+            }
+        }
+        return $source;
+    }
+
+    /**
+     * render the uncompiled source
+     *
+     * @param Smarty_Internal_Template $_template template object
+     *
+     * @return string
+     * @throws \Exception
+     */
+    public function renderUncompiled(Smarty_Internal_Template $_template)
+    {
+        $this->handler->renderUncompiled($_template->source, $_template);
+    }
+
+    /**
+     * Render uncompiled source
+     *
+     * @param \Smarty_Internal_Template $_template
+     */
+    public function render(Smarty_Internal_Template $_template)
+    {
+        if ($_template->source->handler->uncompiled) {
+            if ($_template->smarty->debugging) {
+                $_template->smarty->_debug->start_render($_template);
+            }
+            $this->handler->renderUncompiled($_template->source, $_template);
+            if (isset($_template->parent) && $_template->parent->_objType == 2 && !empty($_template->tpl_function)) {
+                $_template->parent->tpl_function =
+                    array_merge($_template->parent->tpl_function, $_template->tpl_function);
+            }
+            if ($_template->smarty->debugging) {
+                $_template->smarty->_debug->end_render($_template);
+            }
+        }
+    }
+
+    /**
+     * Get source time stamp
+     *
+     * @return int
+     */
+    public function getTimeStamp()
+    {
+        if (!isset($this->timestamp)) {
+            $this->handler->populateTimestamp($this);
+        }
+        return $this->timestamp;
+    }
+
+    /**
+     * Get source content
+     *
+     * @return string
+     */
+    public function getContent()
+    {
+        return isset($this->content) ? $this->content : $this->handler->getContent($this);
+    }
+}
diff --git a/include/smarty/libs/sysplugins/smarty_undefined_variable.php b/include/smarty/libs/sysplugins/smarty_undefined_variable.php
new file mode 100644
index 000000000..88bc6f68c
--- /dev/null
+++ b/include/smarty/libs/sysplugins/smarty_undefined_variable.php
@@ -0,0 +1,37 @@
+<?php
+
+/**
+ * class for undefined variable object
+ * This class defines an object for undefined variable handling
+ *
+ * @package    Smarty
+ * @subpackage Template
+ */
+class Smarty_Undefined_Variable
+{
+    /**
+     * Returns FALSE for 'nocache' and NULL otherwise.
+     *
+     * @param  string $name
+     *
+     * @return bool
+     */
+    public function __get($name)
+    {
+        if ($name == 'nocache') {
+            return false;
+        } else {
+            return null;
+        }
+    }
+
+    /**
+     * Always returns an empty string.
+     *
+     * @return string
+     */
+    public function __toString()
+    {
+        return "";
+    }
+}
diff --git a/include/smarty/libs/sysplugins/smarty_variable.php b/include/smarty/libs/sysplugins/smarty_variable.php
new file mode 100644
index 000000000..a6504b18f
--- /dev/null
+++ b/include/smarty/libs/sysplugins/smarty_variable.php
@@ -0,0 +1,47 @@
+<?php
+
+/**
+ * class for the Smarty variable object
+ * This class defines the Smarty variable object
+ *
+ * @package    Smarty
+ * @subpackage Template
+ */
+class Smarty_Variable
+{
+    /**
+     * template variable
+     *
+     * @var mixed
+     */
+    public $value = null;
+    /**
+     * if true any output of this variable will be not cached
+     *
+     * @var boolean
+     */
+    public $nocache = false;
+
+    /**
+     * create Smarty variable object
+     *
+     * @param mixed   $value   the value to assign
+     * @param boolean $nocache if true any output of this variable will be not cached
+     */
+    public function __construct($value = null, $nocache = false)
+    {
+        $this->value = $value;
+        $this->nocache = $nocache;
+    }
+
+    /**
+     * <<magic>> String conversion
+     *
+     * @return string
+     */
+    public function __toString()
+    {
+        return (string) $this->value;
+    }
+}
+
diff --git a/include/smarty/libs/sysplugins/smartycompilerexception.php b/include/smarty/libs/sysplugins/smartycompilerexception.php
new file mode 100644
index 000000000..4d5d77875
--- /dev/null
+++ b/include/smarty/libs/sysplugins/smartycompilerexception.php
@@ -0,0 +1,39 @@
+<?php
+
+/**
+ * Smarty compiler exception class
+ *
+ * @package Smarty
+ */
+class SmartyCompilerException extends SmartyException
+{
+    public function __toString()
+    {
+        return ' --> Smarty Compiler: ' . $this->message . ' <-- ';
+    }
+
+    /**
+     * The line number of the template error
+     *
+     * @type int|null
+     */
+    public $line = null;
+    /**
+     * The template source snippet relating to the error
+     *
+     * @type string|null
+     */
+    public $source = null;
+    /**
+     * The raw text of the error message
+     *
+     * @type string|null
+     */
+    public $desc = null;
+    /**
+     * The resource identifier or template name
+     *
+     * @type string|null
+     */
+    public $template = null;
+}
diff --git a/include/smarty/libs/sysplugins/smartyexception.php b/include/smarty/libs/sysplugins/smartyexception.php
new file mode 100644
index 000000000..3da16c276
--- /dev/null
+++ b/include/smarty/libs/sysplugins/smartyexception.php
@@ -0,0 +1,15 @@
+<?php
+/**
+ * Smarty exception class
+ *
+ * @package Smarty
+ */
+class SmartyException extends Exception
+{
+    public static $escape = false;
+
+    public function __toString()
+    {
+        return ' --> Smarty: ' . (self::$escape ? htmlentities($this->message) : $this->message) . ' <-- ';
+    }
+}
diff --git a/include/ws_core.inc.php b/include/ws_core.inc.php
index e46953287..648fb32d3 100644
--- a/include/ws_core.inc.php
+++ b/include/ws_core.inc.php
@@ -56,7 +56,7 @@ class PwgError
   private $_code;
   private $_codeText;
 
-  function PwgError($code, $codeText)
+  function __construct($code, $codeText)
   {
     if ($code>=400 and $code<600)
     {
@@ -89,7 +89,7 @@ class PwgNamedArray
    * @param xmlAttributes array of sub-item attributes that will be encoded as
    *      xml attributes instead of xml child elements
    */
-  function PwgNamedArray($arr, $itemName, $xmlAttributes=array() )
+  function __construct($arr, $itemName, $xmlAttributes=array() )
   {
     $this->_content = $arr;
     $this->_itemName = $itemName;
@@ -115,7 +115,7 @@ class PwgNamedStruct
    *    encoded as xml attributes (if null - automatically prefer xml attributes
    *    whenever possible)
    */
-  function PwgNamedStruct($content, $xmlAttributes=null, $xmlElements=null )
+  function __construct($content, $xmlAttributes=null, $xmlElements=null )
   {
     $this->_content = $content;
     if ( isset($xmlAttributes) )
@@ -236,7 +236,7 @@ class PwgServer
 
   var $_methods = array();
 
-  function PwgServer()
+  function __construct()
   {
   }
 
@@ -688,4 +688,4 @@ Request format: ".@$this->_requestFormat." Response format: ".@$this->_responseF
     return $res;
   }
 }
-?>
\ No newline at end of file
+?>
diff --git a/include/ws_protocols/rest_encoder.php b/include/ws_protocols/rest_encoder.php
index 2c8dbd698..d538a0ae8 100644
--- a/include/ws_protocols/rest_encoder.php
+++ b/include/ws_protocols/rest_encoder.php
@@ -33,7 +33,7 @@ class PwgXmlWriter
 
   var $_encodedXml;
 
-  function PwgXmlWriter()
+  function __construct()
   {
     $this->_elementStack = array();
     $this->_lastTagOpen = false;
diff --git a/install.php b/install.php
index 4933dc218..269b9830b 100644
--- a/install.php
+++ b/install.php
@@ -24,7 +24,7 @@
 //----------------------------------------------------------- include
 define('PHPWG_ROOT_PATH','./');
 
-@set_magic_quotes_runtime(0); // Disable magic_quotes_runtime
+// @set_magic_quotes_runtime(0); // Disable magic_quotes_runtime
 //
 // addslashes to vars if magic_quotes_gpc is off this is a security
 // precaution to prevent someone trying to break out of a SQL statement.
@@ -529,4 +529,4 @@ if (count($infos) != 0 )
 
 //----------------------------------------------------------- html code display
 $template->pparse('install');
-?>
\ No newline at end of file
+?>