Uwe Tews
2017-10-18 09:40:38 +02:00
parent 6b97d5cdd5
commit e4f41adf5a
6 changed files with 534 additions and 538 deletions

View File

@@ -1,4 +1,9 @@
===== 3.1.32 - dev ===
18.10.2017
-bugfix fix implementation of unclosed block tag in double quoted string of 12.10.2017
https://github.com/smarty-php/smarty/issues/396 https://github.com/smarty-php/smarty/issues/397
https://github.com/smarty-php/smarty/issues/391 https://github.com/smarty-php/smarty/issues/392
12.10.2017
- bugfix $smarty.block.child and $smarty.block.parent could not be used like any
$smarty special variable https://github.com/smarty-php/smarty/issues/393

View File

@@ -694,7 +694,6 @@ class Smarty_Internal_Templatelexer
double_quote {
$this->token = Smarty_Internal_Templateparser::TP_QUOTE;
$this->yypopstate();
$this->compiler->leaveDoubleQuote();
}
backtick dollar {
$this->token = Smarty_Internal_Templateparser::TP_BACKTICK;

View File

@@ -1250,6 +1250,7 @@ doublequoted_with_quotes(res) ::= QUOTE QUOTE. {
}
doublequoted_with_quotes(res) ::= QUOTE doublequoted(s) QUOTE. {
$this->compiler->leaveDoubleQuote();
res = s->to_smarty_php($this);
}

View File

@@ -108,7 +108,7 @@ class Smarty extends Smarty_Internal_TemplateBase
/**
* smarty version
*/
const SMARTY_VERSION = '3.1.32-dev-25';
const SMARTY_VERSION = '3.1.32-dev-26';
/**
* define variable scopes

View File

@@ -1066,7 +1066,6 @@ class Smarty_Internal_Templatelexer
{
$this->token = Smarty_Internal_Templateparser::TP_QUOTE;
$this->yypopstate();
$this->compiler->leaveDoubleQuote();
}
function yy_r5_8()

File diff suppressed because it is too large Load Diff