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

- bugfix change of 08.10.2014 could create E_NOTICE meassage when using "<?php" tags

Browse Source
This commit is contained in:
Uwe.Tews@googlemail.com
2014-10-12 15:09:52 +00:00
parent 6af75db3c3
commit f03fc13bc9
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
change_log.txt
View File

@@ -1,6 +1,7 @@
===== 3.1.21-dev ===== (xx.xx.2014)
12.10.2014
- bugfix a comment like "<script{*foo*} language=php>" bypassed $php_handling checking (Thue Kristensen)
- bugfix change of 08.10.2014 could create E_NOTICE meassage when using "<?php" tags
===== 3.1.20 ===== (09.10.2014)
08.10.2014

4
libs/sysplugins/smarty_internal_templatelexer.php
View File

@@ -339,7 +339,7 @@ class Smarty_Internal_Templatelexer
function yy_r1_14($yy_subpatterns)
{
if (in_array($this->value, Array('<?', '<?=', '<?php')) || $script = strpos($this->value, '<s') === 0) {
if ($script = strpos($this->value, '<s') === 0 || in_array($this->value, Array('<?', '<?=', '<?php'))) {
if ($script) {
$this->is_phpScript = true;
}
@@ -1068,7 +1068,7 @@ class Smarty_Internal_Templatelexer
function yy_r3_3($yy_subpatterns)
{
if (in_array($this->value, Array('<?', '<?=', '<?php')) || $script = strpos($this->value, '<s') === 0) {
if ($script = strpos($this->value, '<s') === 0 || in_array($this->value, Array('<?', '<?=', '<?php'))) {
if ($script) {
$this->is_phpScript = true;
}

5
libs/sysplugins/smarty_internal_templateparser.php
View File

@@ -4444,13 +4444,14 @@ class Smarty_Internal_Templateparser#line 80 "smarty_internal_templateparser.php
while ($this->yyidx >= 0) {
$stack = $this->yy_pop_parser_stack();
}
#line 76 "smarty_internal_templateparser.y"
#line 75 "smarty_internal_templateparser.y"
$this->successful = !$this->internalError;
$this->internalError = false;
$this->retvalue = $this->_retvalue;
//echo $this->retvalue."\n\n";
#line 3165 "smarty_internal_templateparser.php"
#line 3166 "smarty_internal_templateparser.php"
}
public function doParse($yymajor, $yytokenvalue)