- bugfix instanceof expression in template code must be treated as value https://github.com/smarty-php/smarty/issues/191

This commit is contained in:
uwetews
2016-02-26 00:50:15 +01:00
parent a5b465e2c6
commit 0e5ea2a467
4 changed files with 535 additions and 531 deletions

View File

@@ -2,6 +2,7 @@
25.02.2016
- bugfix wrong _realpath with 4 or more parent-directories https://github.com/smarty-php/smarty/issues/190
- optimization of _realpath
- bugfix instanceof expression in template code must be treated as value https://github.com/smarty-php/smarty/issues/191
20.02.2016
- bugfix {strip} must keep space between hmtl tags. Broken by changes of 10.2.2016 https://github.com/smarty-php/smarty/issues/184

View File

@@ -716,14 +716,6 @@ expr(res) ::= expr(e1) ISIN value(v). {
res = 'in_array('.e1.',(array)'.v.')';
}
expr(res) ::= variable(v1) INSTANCEOF(i) ns1(v2). {
res = v1.i.v2;
}
expr(res) ::= variable(v1) INSTANCEOF(i) variable(v2). {
res = v1.i.v2;
}
//
// ternary
@@ -802,6 +794,13 @@ value(res) ::= OPENP expr(e) CLOSEP. {
res = "(". e .")";
}
value(res) ::= variable(v1) INSTANCEOF(i) ns1(v2). {
res = v1.i.v2;
}
value(res) ::= variable(v1) INSTANCEOF(i) variable(v2). {
res = v1.i.v2;
}
// singele quoted string
value(res) ::= SINGLEQUOTESTRING(t). {
res = t;

View File

@@ -121,7 +121,7 @@ class Smarty extends Smarty_Internal_TemplateBase
/**
* smarty version
*/
const SMARTY_VERSION = '3.1.30-dev/49';
const SMARTY_VERSION = '3.1.30-dev/50';
/**
* define variable scopes

File diff suppressed because it is too large Load Diff