smarty-php/smarty
1
0
Fork 0
mirror of https://github.com/smarty-php/smarty.git synced 2025-08-06 11:24:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

- bugfix a plugin with attached modifier could fail

Browse Source 
if the tag was immediately followed by another Smarty tag (since 3.1.21) (forum 25326)
This commit is contained in:
Uwe Tews
2014-11-23 13:25:09 +01:00
parent de7310b702
commit ffbfe40043
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
change_log.txt
View File

@@ -1,4 +1,7 @@
===== 3.1.22-dev ===== (xx.xx.2014) ===== 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 13.11.2014
- improvement move autoload code into Autoloader.php. Use Composer autoloader when possible - improvement move autoload code into Autoloader.php. Use Composer autoloader when possible
@@ -768,7 +771,7 @@
15/07/2011 15/07/2011
- bugfix individual cache_lifetime of {include} did not work correctly inside {block} tags - 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 14/07/2011
- made Smarty::loadPlugin() respect the include_path if required - made Smarty::loadPlugin() respect the include_path if required

4
libs/sysplugins/smarty_internal_templateparser.php
View File

@@ -3667,14 +3667,14 @@ class Smarty_Internal_Templateparser#line 80 "smarty_internal_templateparser.php
function yy_r35() 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 = '<?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 2447 "smarty_internal_templateparser.php"
#line 380 "smarty_internal_templateparser.y" #line 380 "smarty_internal_templateparser.y"
function yy_r36() 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 = '<?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 2453 "smarty_internal_templateparser.php"
#line 386 "smarty_internal_templateparser.y" #line 386 "smarty_internal_templateparser.y"