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

- 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

Browse Source
This commit is contained in:
Uwe Tews
2015-06-18 00:06:40 +02:00
parent 58616d6ee5
commit 52ced72361
4 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
change_log.txt
View File

@@ -1,4 +1,8 @@
 ===== 3.1.25===== (15.06.2015)  ===== 3.1.26-dev===== (xx.xx.2015)
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 15.06.2015
- optimization of smarty_cachereource_keyvaluestore.php code - optimization of smarty_cachereource_keyvaluestore.php code

2
lexer/smarty_internal_templateparser.y
View File

@@ -387,7 +387,7 @@ smartytag(res)::= SIMPLETAG(t). {
res = $this->compiler->compileTag('private_print_expression',array(),array('value'=>$tag)); res = $this->compiler->compileTag('private_print_expression',array(),array('value'=>$tag));
} else { } else {
if (preg_match('/^(.*)(\s+nocache)$/', $tag, $match)) { if (preg_match('/^(.*)(\s+nocache)$/', $tag, $match)) {
res = $this->compiler->compileTag($match[1],array('nocache')); res = $this->compiler->compileTag($match[1],array("'nocache'"));
} else { } else {
res = $this->compiler->compileTag($tag,array()); res = $this->compiler->compileTag($tag,array());
} }

4
libs/Smarty.class.php
View File

@@ -27,7 +27,7 @@
* @author Uwe Tews * @author Uwe Tews
* @author Rodney Rehm * @author Rodney Rehm
* @package Smarty * @package Smarty
* @version 3.1.25 * @version 3.1.26-dev
*/ */
/** /**
@@ -111,7 +111,7 @@ class Smarty extends Smarty_Internal_TemplateBase
/** /**
* smarty version * smarty version
*/ */
const SMARTY_VERSION = '3.1.25'; const SMARTY_VERSION = '3.1.26-dev/1';
/** /**
* define variable scopes * define variable scopes

2
libs/sysplugins/smarty_internal_templateparser.php
View File

@@ -1375,7 +1375,7 @@ class Smarty_Internal_Templateparser
$this->_retvalue = $this->compiler->compileTag('private_print_expression', array(), array('value' => $tag)); $this->_retvalue = $this->compiler->compileTag('private_print_expression', array(), array('value' => $tag));
} else { } else {
if (preg_match('/^(.*)(\s+nocache)$/', $tag, $match)) { if (preg_match('/^(.*)(\s+nocache)$/', $tag, $match)) {
$this->_retvalue = $this->compiler->compileTag($match[1], array('nocache')); $this->_retvalue = $this->compiler->compileTag($match[1], array("'nocache'"));
} else { } else {
$this->_retvalue = $this->compiler->compileTag($tag, array()); $this->_retvalue = $this->compiler->compileTag($tag, array());
} }