From ffbfe4004365e7e58aa71bf4a49277bb18384fdd Mon Sep 17 00:00:00 2001
From: Uwe Tews <uwe.tews@googlemail.com>
Date: Sun, 23 Nov 2014 13:25:09 +0100
Subject: [PATCH] - bugfix a plugin with attached modifier could fail if the
 tag was immediately followed by another Smarty tag (since 3.1.21) (forum
 25326)

---
 change_log.txt                                     | 5 ++++-
 libs/sysplugins/smarty_internal_templateparser.php | 4 ++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/change_log.txt b/change_log.txt
index d750c441..3533976e 100644
--- a/change_log.txt
+++ b/change_log.txt
@@ -1,4 +1,7 @@
  ===== 3.1.22-dev ===== (xx.xx.2014)
+ 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
 
@@ -768,7 +771,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
diff --git a/libs/sysplugins/smarty_internal_templateparser.php b/libs/sysplugins/smarty_internal_templateparser.php
index 11ab43ce..ef20cf3f 100644
--- a/libs/sysplugins/smarty_internal_templateparser.php
+++ b/libs/sysplugins/smarty_internal_templateparser.php
@@ -3667,14 +3667,14 @@ class Smarty_Internal_Templateparser#line 80 "smarty_internal_templateparser.php
     function yy_r35()
     {
         $this->_retvalue = '<?php ob_start();?>' . $this->compiler->compileTag($this->yystack[$this->yyidx + - 2]->minor, $this->yystack[$this->yyidx + 0]->minor) . '<?php echo ';
-        $this->_retvalue .= $this->compiler->compileTag('private_modifier', array(), array('modifierlist' => $this->yystack[$this->yyidx + - 1]->minor, 'value' => 'ob_get_clean()')) . '?>';
+        $this->_retvalue .= $this->compiler->compileTag('private_modifier', array(), array('modifierlist' => $this->yystack[$this->yyidx + - 1]->minor, 'value' => 'ob_get_clean()')) . ';?>';
     }
     #line 2447 "smarty_internal_templateparser.php"
     #line 380 "smarty_internal_templateparser.y"
     function yy_r36()
     {
         $this->_retvalue = '<?php ob_start();?>' . $this->compiler->compileTag($this->yystack[$this->yyidx + - 4]->minor, $this->yystack[$this->yyidx + 0]->minor, array('object_method' => $this->yystack[$this->yyidx + - 2]->minor)) . '<?php echo ';
-        $this->_retvalue .= $this->compiler->compileTag('private_modifier', array(), array('modifierlist' => $this->yystack[$this->yyidx + - 1]->minor, 'value' => 'ob_get_clean()')) . '?>';
+        $this->_retvalue .= $this->compiler->compileTag('private_modifier', array(), array('modifierlist' => $this->yystack[$this->yyidx + - 1]->minor, 'value' => 'ob_get_clean()')) . ';?>';
     }
     #line 2453 "smarty_internal_templateparser.php"
     #line 386 "smarty_internal_templateparser.y"