mirror of
https://github.com/smarty-php/smarty.git
synced 2025-08-04 18:34:27 +02:00
-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
This commit is contained in:
@@ -1,4 +1,9 @@
|
|||||||
===== 3.1.32 - dev ===
|
===== 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
|
12.10.2017
|
||||||
- bugfix $smarty.block.child and $smarty.block.parent could not be used like any
|
- 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
|
$smarty special variable https://github.com/smarty-php/smarty/issues/393
|
||||||
|
@@ -694,7 +694,6 @@ class Smarty_Internal_Templatelexer
|
|||||||
double_quote {
|
double_quote {
|
||||||
$this->token = Smarty_Internal_Templateparser::TP_QUOTE;
|
$this->token = Smarty_Internal_Templateparser::TP_QUOTE;
|
||||||
$this->yypopstate();
|
$this->yypopstate();
|
||||||
$this->compiler->leaveDoubleQuote();
|
|
||||||
}
|
}
|
||||||
backtick dollar {
|
backtick dollar {
|
||||||
$this->token = Smarty_Internal_Templateparser::TP_BACKTICK;
|
$this->token = Smarty_Internal_Templateparser::TP_BACKTICK;
|
||||||
|
@@ -1250,6 +1250,7 @@ doublequoted_with_quotes(res) ::= QUOTE QUOTE. {
|
|||||||
}
|
}
|
||||||
|
|
||||||
doublequoted_with_quotes(res) ::= QUOTE doublequoted(s) QUOTE. {
|
doublequoted_with_quotes(res) ::= QUOTE doublequoted(s) QUOTE. {
|
||||||
|
$this->compiler->leaveDoubleQuote();
|
||||||
res = s->to_smarty_php($this);
|
res = s->to_smarty_php($this);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -108,7 +108,7 @@ class Smarty extends Smarty_Internal_TemplateBase
|
|||||||
/**
|
/**
|
||||||
* smarty version
|
* smarty version
|
||||||
*/
|
*/
|
||||||
const SMARTY_VERSION = '3.1.32-dev-25';
|
const SMARTY_VERSION = '3.1.32-dev-26';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* define variable scopes
|
* define variable scopes
|
||||||
|
@@ -1066,7 +1066,6 @@ class Smarty_Internal_Templatelexer
|
|||||||
{
|
{
|
||||||
$this->token = Smarty_Internal_Templateparser::TP_QUOTE;
|
$this->token = Smarty_Internal_Templateparser::TP_QUOTE;
|
||||||
$this->yypopstate();
|
$this->yypopstate();
|
||||||
$this->compiler->leaveDoubleQuote();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
function yy_r5_8()
|
function yy_r5_8()
|
||||||
|
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user