mirror of
https://github.com/smarty-php/smarty.git
synced 2025-08-04 10:24:26 +02:00
- bugfix instanceof expression in template code must be treated as value https://github.com/smarty-php/smarty/issues/191
This commit is contained in:
@@ -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
|
||||
|
@@ -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;
|
||||
|
@@ -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
Reference in New Issue
Block a user