smarty-php/smarty
1
0
Fork 0
mirror of https://github.com/smarty-php/smarty.git synced 2025-08-04 18:34:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

- bugfix regression when mdifier parameter was follow by math https://github.com/smarty-php/smarty/issues/132

Browse Source
This commit is contained in:
uwetews
2015-12-18 04:43:55 +01:00
parent 05c069d889
commit 44eea98260
4 changed files with 1098 additions and 1127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
change_log.txt
View File

@@ -1,4 +1,7 @@
 ===== 3.1.29-dev ===== (xx.xx.2015)  ===== 3.1.29-dev ===== (xx.xx.2015)
18.12.2015
- bugfix regression when mdifier parameter was follow by math https://github.com/smarty-php/smarty/issues/132
17.12.2015 17.12.2015
- bugfix {$smarty.capture.nameFail} did lowercase capture name https://github.com/smarty-php/smarty/issues/135 - bugfix {$smarty.capture.nameFail} did lowercase capture name https://github.com/smarty-php/smarty/issues/135
- bugfix using {block append/prepend} on same block in multiple levels of inheritance templates could fail (forum topic 25827) - bugfix using {block append/prepend} on same block in multiple levels of inheritance templates could fail (forum topic 25827)

12
lexer/smarty_internal_templateparser.y
View File

@@ -352,26 +352,18 @@ tag(res) ::= LDEL variable(e). {
res = $this->compiler->compileTag('private_print_expression',array(),array('value'=>e)); res = $this->compiler->compileTag('private_print_expression',array(),array('value'=>e));
} }
tag(res) ::= LDEL variable(e) modifierlist(l) attributes(a). {
res = $this->compiler->compileTag('private_print_expression',a,array('value'=>e, 'modifierlist'=>l));
}
tag(res) ::= LDEL variable(e) attributes(a). { tag(res) ::= LDEL variable(e) attributes(a). {
res = $this->compiler->compileTag('private_print_expression',a,array('value'=>e)); res = $this->compiler->compileTag('private_print_expression',a,array('value'=>e));
} }
tag(res) ::= LDEL value(e). { tag(res) ::= LDEL value(e). {
res = $this->compiler->compileTag('private_print_expression',array(),array('value'=>e)); res = $this->compiler->compileTag('private_print_expression',array(),array('value'=>e));
} }
tag(res) ::= LDEL value(e) modifierlist(l) attributes(a). {
res = $this->compiler->compileTag('private_print_expression',a,array('value'=>e, 'modifierlist'=>l));
}
tag(res) ::= LDEL value(e) attributes(a). { tag(res) ::= LDEL value(e) attributes(a). {
res = $this->compiler->compileTag('private_print_expression',a,array('value'=>e)); res = $this->compiler->compileTag('private_print_expression',a,array('value'=>e));
} }
tag(res) ::= LDEL expr(e) modifierlist(l) attributes(a). { tag(res) ::= LDEL expr(e). {
res = $this->compiler->compileTag('private_print_expression',a,array('value'=>e,'modifierlist'=>l)); res = $this->compiler->compileTag('private_print_expression',array(),array('value'=>e));
} }
tag(res) ::= LDEL expr(e) attributes(a). { tag(res) ::= LDEL expr(e) attributes(a). {

2
libs/Smarty.class.php
View File

@@ -118,7 +118,7 @@ class Smarty extends Smarty_Internal_TemplateBase
/** /**
* smarty version * smarty version
*/ */
const SMARTY_VERSION = '3.1.29-dev/10'; const SMARTY_VERSION = '3.1.29-dev/11';
/** /**
* define variable scopes * define variable scopes

2208
libs/sysplugins/smarty_internal_templateparser.php
View File

File diff suppressed because it is too large Load Diff