diff --git a/change_log.txt b/change_log.txt index d06c8ce3..3bc68c43 100644 --- a/change_log.txt +++ b/change_log.txt @@ -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 - optimization of smarty_cachereource_keyvaluestore.php code diff --git a/lexer/smarty_internal_templateparser.y b/lexer/smarty_internal_templateparser.y index fef849e4..225f71b2 100644 --- a/lexer/smarty_internal_templateparser.y +++ b/lexer/smarty_internal_templateparser.y @@ -387,7 +387,7 @@ smartytag(res)::= SIMPLETAG(t). { 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')); + res = $this->compiler->compileTag($match[1],array("'nocache'")); } else { res = $this->compiler->compileTag($tag,array()); } diff --git a/libs/Smarty.class.php b/libs/Smarty.class.php index e8af0a22..4f5a6022 100644 --- a/libs/Smarty.class.php +++ b/libs/Smarty.class.php @@ -27,7 +27,7 @@ * @author Uwe Tews * @author Rodney Rehm * @package Smarty - * @version 3.1.25 + * @version 3.1.26-dev */ /** @@ -111,7 +111,7 @@ class Smarty extends Smarty_Internal_TemplateBase /** * smarty version */ - const SMARTY_VERSION = '3.1.25'; + const SMARTY_VERSION = '3.1.26-dev/1'; /** * define variable scopes diff --git a/libs/sysplugins/smarty_internal_templateparser.php b/libs/sysplugins/smarty_internal_templateparser.php index d6edb8b5..871f7c0a 100644 --- a/libs/sysplugins/smarty_internal_templateparser.php +++ b/libs/sysplugins/smarty_internal_templateparser.php @@ -1375,7 +1375,7 @@ class Smarty_Internal_Templateparser $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')); + $this->_retvalue = $this->compiler->compileTag($match[1], array("'nocache'")); } else { $this->_retvalue = $this->compiler->compileTag($tag, array()); }