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

- revert change of 17.03.2014

Browse Source
This commit is contained in:
Uwe.Tews@googlemail.com
2014-03-18 18:22:33 +00:00
parent d82d54bffd
commit 7dec7d9963
2 changed files with 573 additions and 568 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
change_log.txt
View File

@@ -1,4 +1,7 @@
===== trunk ===== ===== trunk =====
18.03.2014
- revert change of 17.03.2014
17.03.2014 17.03.2014
- bugfix $smarty->auto_literal and mbsting.func_overload 2, 6 or 7 did fail (forum topic 24899) - bugfix $smarty->auto_literal and mbsting.func_overload 2, 6 or 7 did fail (forum topic 24899)

56
libs/sysplugins/smarty_internal_templatelexer.php
View File

@@ -230,7 +230,7 @@ class Smarty_Internal_Templatelexer
function yy_r1_4($yy_subpatterns) function yy_r1_4($yy_subpatterns)
{ {
if ($this->smarty->auto_literal && (strlen($this->value) > $this->ldel_length)) { if ($this->smarty->auto_literal && ($this->mbstring_overload ? (mb_strpos(" \n\t\r",mb_substr($this->value,$this->ldel_length,1,'latin1'),0,'latin1') !== false) : (strpos(" \n\t\r",substr($this->value,$this->ldel_length,1)) !== false))) {
$this->token = Smarty_Internal_Templateparser::TP_TEXT; $this->token = Smarty_Internal_Templateparser::TP_TEXT;
} else { } else {
$this->token = Smarty_Internal_Templateparser::TP_STRIPON; $this->token = Smarty_Internal_Templateparser::TP_STRIPON;
@@ -239,7 +239,7 @@ class Smarty_Internal_Templatelexer
function yy_r1_5($yy_subpatterns) function yy_r1_5($yy_subpatterns)
{ {
if ($this->smarty->auto_literal && (strlen($this->value) > $this->ldel_length)) { if ($this->smarty->auto_literal && ($this->mbstring_overload ? (mb_strpos(" \n\t\r",mb_substr($this->value,$this->ldel_length,1,'latin1'),0,'latin1') !== false) : (strpos(" \n\t\r",substr($this->value,$this->ldel_length,1)) !== false))) {
$this->token = Smarty_Internal_Templateparser::TP_TEXT; $this->token = Smarty_Internal_Templateparser::TP_TEXT;
} else { } else {
$this->token = Smarty_Internal_Templateparser::TP_STRIPOFF; $this->token = Smarty_Internal_Templateparser::TP_STRIPOFF;
@@ -248,7 +248,7 @@ class Smarty_Internal_Templatelexer
function yy_r1_6($yy_subpatterns) function yy_r1_6($yy_subpatterns)
{ {
if ($this->smarty->auto_literal && (strlen($this->value) > $this->ldel_length)) { if ($this->smarty->auto_literal && ($this->mbstring_overload ? (mb_strpos(" \n\t\r",mb_substr($this->value,$this->ldel_length,1,'latin1'),0,'latin1') !== false) : (strpos(" \n\t\r",substr($this->value,$this->ldel_length,1)) !== false))) {
$this->token = Smarty_Internal_Templateparser::TP_TEXT; $this->token = Smarty_Internal_Templateparser::TP_TEXT;
} else { } else {
$this->token = Smarty_Internal_Templateparser::TP_LITERALSTART; $this->token = Smarty_Internal_Templateparser::TP_LITERALSTART;
@@ -258,7 +258,7 @@ class Smarty_Internal_Templatelexer
function yy_r1_7($yy_subpatterns) function yy_r1_7($yy_subpatterns)
{ {
if ($this->smarty->auto_literal && (strlen($this->value) > $this->ldel_length)) { if ($this->smarty->auto_literal && ($this->mbstring_overload ? (mb_strpos(" \n\t\r",mb_substr($this->value,$this->ldel_length,1,'latin1'),0,'latin1') !== false) : (strpos(" \n\t\r",substr($this->value,$this->ldel_length,1)) !== false))) {
$this->token = Smarty_Internal_Templateparser::TP_TEXT; $this->token = Smarty_Internal_Templateparser::TP_TEXT;
} else { } else {
$this->token = Smarty_Internal_Templateparser::TP_LDELIF; $this->token = Smarty_Internal_Templateparser::TP_LDELIF;
@@ -269,7 +269,7 @@ class Smarty_Internal_Templatelexer
function yy_r1_9($yy_subpatterns) function yy_r1_9($yy_subpatterns)
{ {
if ($this->smarty->auto_literal && (strlen($this->value) > $this->ldel_length)) { if ($this->smarty->auto_literal && ($this->mbstring_overload ? (mb_strpos(" \n\t\r",mb_substr($this->value,$this->ldel_length,1,'latin1'),0,'latin1') !== false) : (strpos(" \n\t\r",substr($this->value,$this->ldel_length,1)) !== false))) {
$this->token = Smarty_Internal_Templateparser::TP_TEXT; $this->token = Smarty_Internal_Templateparser::TP_TEXT;
} else { } else {
$this->token = Smarty_Internal_Templateparser::TP_LDELFOR; $this->token = Smarty_Internal_Templateparser::TP_LDELFOR;
@@ -280,7 +280,7 @@ class Smarty_Internal_Templatelexer
function yy_r1_10($yy_subpatterns) function yy_r1_10($yy_subpatterns)
{ {
if ($this->smarty->auto_literal && (strlen($this->value) > $this->ldel_length)) { if ($this->smarty->auto_literal && ($this->mbstring_overload ? (mb_strpos(" \n\t\r",mb_substr($this->value,$this->ldel_length,1,'latin1'),0,'latin1') !== false) : (strpos(" \n\t\r",substr($this->value,$this->ldel_length,1)) !== false))) {
$this->token = Smarty_Internal_Templateparser::TP_TEXT; $this->token = Smarty_Internal_Templateparser::TP_TEXT;
} else { } else {
$this->token = Smarty_Internal_Templateparser::TP_LDELFOREACH; $this->token = Smarty_Internal_Templateparser::TP_LDELFOREACH;
@@ -291,7 +291,7 @@ class Smarty_Internal_Templatelexer
function yy_r1_11($yy_subpatterns) function yy_r1_11($yy_subpatterns)
{ {
if ($this->smarty->auto_literal && (strlen($this->value) > $this->ldel_length)) { if ($this->smarty->auto_literal && ($this->mbstring_overload ? (mb_strpos(" \n\t\r",mb_substr($this->value,$this->ldel_length,1,'latin1'),0,'latin1') !== false) : (strpos(" \n\t\r",substr($this->value,$this->ldel_length,1)) !== false))) {
$this->token = Smarty_Internal_Templateparser::TP_TEXT; $this->token = Smarty_Internal_Templateparser::TP_TEXT;
} else { } else {
$this->token = Smarty_Internal_Templateparser::TP_LDELSETFILTER; $this->token = Smarty_Internal_Templateparser::TP_LDELSETFILTER;
@@ -302,7 +302,7 @@ class Smarty_Internal_Templatelexer
function yy_r1_12($yy_subpatterns) function yy_r1_12($yy_subpatterns)
{ {
if ($this->smarty->auto_literal && (strlen($this->value) > $this->ldel_length)) { if ($this->smarty->auto_literal && ($this->mbstring_overload ? (mb_strpos(" \n\t\r",mb_substr($this->value,$this->ldel_length,1,'latin1'),0,'latin1') !== false) : (strpos(" \n\t\r",substr($this->value,$this->ldel_length,1)) !== false))) {
$this->token = Smarty_Internal_Templateparser::TP_TEXT; $this->token = Smarty_Internal_Templateparser::TP_TEXT;
} else { } else {
$this->token = Smarty_Internal_Templateparser::TP_LDELSLASH; $this->token = Smarty_Internal_Templateparser::TP_LDELSLASH;
@@ -313,7 +313,7 @@ class Smarty_Internal_Templatelexer
function yy_r1_13($yy_subpatterns) function yy_r1_13($yy_subpatterns)
{ {
if ($this->smarty->auto_literal && (strlen($this->value) > $this->ldel_length)) { if ($this->smarty->auto_literal && ($this->mbstring_overload ? (mb_strpos(" \n\t\r",mb_substr($this->value,$this->ldel_length,1,'latin1'),0,'latin1') !== false) : (strpos(" \n\t\r",substr($this->value,$this->ldel_length,1)) !== false))) {
$this->token = Smarty_Internal_Templateparser::TP_TEXT; $this->token = Smarty_Internal_Templateparser::TP_TEXT;
} else { } else {
$this->token = Smarty_Internal_Templateparser::TP_LDEL; $this->token = Smarty_Internal_Templateparser::TP_LDEL;
@@ -811,7 +811,7 @@ class Smarty_Internal_Templatelexer
function yy_r2_70($yy_subpatterns) function yy_r2_70($yy_subpatterns)
{ {
if ($this->smarty->auto_literal && (strlen($this->value) > $this->ldel_length)) { if ($this->smarty->auto_literal && ($this->mbstring_overload ? (mb_strpos(" \n\t\r",mb_substr($this->value,$this->ldel_length,1,'latin1'),0,'latin1') !== false) : (strpos(" \n\t\r",substr($this->value,$this->ldel_length,1)) !== false))) {
$this->token = Smarty_Internal_Templateparser::TP_TEXT; $this->token = Smarty_Internal_Templateparser::TP_TEXT;
} else { } else {
$this->token = Smarty_Internal_Templateparser::TP_LDELIF; $this->token = Smarty_Internal_Templateparser::TP_LDELIF;
@@ -822,7 +822,7 @@ class Smarty_Internal_Templatelexer
function yy_r2_72($yy_subpatterns) function yy_r2_72($yy_subpatterns)
{ {
if ($this->smarty->auto_literal && (strlen($this->value) > $this->ldel_length)) { if ($this->smarty->auto_literal && ($this->mbstring_overload ? (mb_strpos(" \n\t\r",mb_substr($this->value,$this->ldel_length,1,'latin1'),0,'latin1') !== false) : (strpos(" \n\t\r",substr($this->value,$this->ldel_length,1)) !== false))) {
$this->token = Smarty_Internal_Templateparser::TP_TEXT; $this->token = Smarty_Internal_Templateparser::TP_TEXT;
} else { } else {
$this->token = Smarty_Internal_Templateparser::TP_LDELFOR; $this->token = Smarty_Internal_Templateparser::TP_LDELFOR;
@@ -833,7 +833,7 @@ class Smarty_Internal_Templatelexer
function yy_r2_73($yy_subpatterns) function yy_r2_73($yy_subpatterns)
{ {
if ($this->smarty->auto_literal && (strlen($this->value) > $this->ldel_length)) { if ($this->smarty->auto_literal && ($this->mbstring_overload ? (mb_strpos(" \n\t\r",mb_substr($this->value,$this->ldel_length,1,'latin1'),0,'latin1') !== false) : (strpos(" \n\t\r",substr($this->value,$this->ldel_length,1)) !== false))) {
$this->token = Smarty_Internal_Templateparser::TP_TEXT; $this->token = Smarty_Internal_Templateparser::TP_TEXT;
} else { } else {
$this->token = Smarty_Internal_Templateparser::TP_LDELFOREACH; $this->token = Smarty_Internal_Templateparser::TP_LDELFOREACH;
@@ -844,7 +844,7 @@ class Smarty_Internal_Templatelexer
function yy_r2_74($yy_subpatterns) function yy_r2_74($yy_subpatterns)
{ {
if ($this->smarty->auto_literal && (strlen($this->value) > $this->ldel_length)) { if ($this->smarty->auto_literal && ($this->mbstring_overload ? (mb_strpos(" \n\t\r",mb_substr($this->value,$this->ldel_length,1,'latin1'),0,'latin1') !== false) : (strpos(" \n\t\r",substr($this->value,$this->ldel_length,1)) !== false))) {
$this->token = Smarty_Internal_Templateparser::TP_TEXT; $this->token = Smarty_Internal_Templateparser::TP_TEXT;
} else { } else {
$this->token = Smarty_Internal_Templateparser::TP_LDELSLASH; $this->token = Smarty_Internal_Templateparser::TP_LDELSLASH;
@@ -855,7 +855,7 @@ class Smarty_Internal_Templatelexer
function yy_r2_75($yy_subpatterns) function yy_r2_75($yy_subpatterns)
{ {
if ($this->smarty->auto_literal && (strlen($this->value) > $this->ldel_length)) { if ($this->smarty->auto_literal && ($this->mbstring_overload ? (mb_strpos(" \n\t\r",mb_substr($this->value,$this->ldel_length,1,'latin1'),0,'latin1') !== false) : (strpos(" \n\t\r",substr($this->value,$this->ldel_length,1)) !== false))) {
$this->token = Smarty_Internal_Templateparser::TP_TEXT; $this->token = Smarty_Internal_Templateparser::TP_TEXT;
} else { } else {
$this->token = Smarty_Internal_Templateparser::TP_LDEL; $this->token = Smarty_Internal_Templateparser::TP_LDEL;
@@ -938,7 +938,7 @@ class Smarty_Internal_Templatelexer
function yy_r3_1($yy_subpatterns) function yy_r3_1($yy_subpatterns)
{ {
if ($this->smarty->auto_literal && (strlen($this->value) > $this->ldel_length)) { if ($this->smarty->auto_literal && ($this->mbstring_overload ? (mb_strpos(" \n\t\r",mb_substr($this->value,$this->ldel_length,1,'latin1'),0,'latin1') !== false) : (strpos(" \n\t\r",substr($this->value,$this->ldel_length,1)) !== false))) {
$this->token = Smarty_Internal_Templateparser::TP_TEXT; $this->token = Smarty_Internal_Templateparser::TP_TEXT;
} else { } else {
$this->token = Smarty_Internal_Templateparser::TP_LITERALSTART; $this->token = Smarty_Internal_Templateparser::TP_LITERALSTART;
@@ -948,7 +948,7 @@ class Smarty_Internal_Templatelexer
function yy_r3_2($yy_subpatterns) function yy_r3_2($yy_subpatterns)
{ {
if ($this->smarty->auto_literal && (strlen($this->value) > $this->ldel_length)) { if ($this->smarty->auto_literal && ($this->mbstring_overload ? (mb_strpos(" \n\t\r",mb_substr($this->value,$this->ldel_length,1,'latin1'),0,'latin1') !== false) : (strpos(" \n\t\r",substr($this->value,$this->ldel_length,1)) !== false))) {
$this->token = Smarty_Internal_Templateparser::TP_TEXT; $this->token = Smarty_Internal_Templateparser::TP_TEXT;
} else { } else {
$this->token = Smarty_Internal_Templateparser::TP_LITERALEND; $this->token = Smarty_Internal_Templateparser::TP_LITERALEND;
@@ -1074,7 +1074,7 @@ class Smarty_Internal_Templatelexer
function yy_r4_1($yy_subpatterns) function yy_r4_1($yy_subpatterns)
{ {
if ($this->smarty->auto_literal && (strlen($this->value) > $this->ldel_length)) { if ($this->smarty->auto_literal && ($this->mbstring_overload ? (mb_strpos(" \n\t\r",mb_substr($this->value,$this->ldel_length,1,'latin1'),0,'latin1') !== false) : (strpos(" \n\t\r",substr($this->value,$this->ldel_length,1)) !== false))) {
$this->token = Smarty_Internal_Templateparser::TP_TEXT; $this->token = Smarty_Internal_Templateparser::TP_TEXT;
} else { } else {
$this->token = Smarty_Internal_Templateparser::TP_LDELIF; $this->token = Smarty_Internal_Templateparser::TP_LDELIF;
@@ -1085,7 +1085,7 @@ class Smarty_Internal_Templatelexer
function yy_r4_3($yy_subpatterns) function yy_r4_3($yy_subpatterns)
{ {
if ($this->smarty->auto_literal && (strlen($this->value) > $this->ldel_length)) { if ($this->smarty->auto_literal && ($this->mbstring_overload ? (mb_strpos(" \n\t\r",mb_substr($this->value,$this->ldel_length,1,'latin1'),0,'latin1') !== false) : (strpos(" \n\t\r",substr($this->value,$this->ldel_length,1)) !== false))) {
$this->token = Smarty_Internal_Templateparser::TP_TEXT; $this->token = Smarty_Internal_Templateparser::TP_TEXT;
} else { } else {
$this->token = Smarty_Internal_Templateparser::TP_LDELFOR; $this->token = Smarty_Internal_Templateparser::TP_LDELFOR;
@@ -1096,7 +1096,7 @@ class Smarty_Internal_Templatelexer
function yy_r4_4($yy_subpatterns) function yy_r4_4($yy_subpatterns)
{ {
if ($this->smarty->auto_literal && (strlen($this->value) > $this->ldel_length)) { if ($this->smarty->auto_literal && ($this->mbstring_overload ? (mb_strpos(" \n\t\r",mb_substr($this->value,$this->ldel_length,1,'latin1'),0,'latin1') !== false) : (strpos(" \n\t\r",substr($this->value,$this->ldel_length,1)) !== false))) {
$this->token = Smarty_Internal_Templateparser::TP_TEXT; $this->token = Smarty_Internal_Templateparser::TP_TEXT;
} else { } else {
$this->token = Smarty_Internal_Templateparser::TP_LDELFOREACH; $this->token = Smarty_Internal_Templateparser::TP_LDELFOREACH;
@@ -1107,7 +1107,7 @@ class Smarty_Internal_Templatelexer
function yy_r4_5($yy_subpatterns) function yy_r4_5($yy_subpatterns)
{ {
if ($this->smarty->auto_literal && (strlen($this->value) > $this->ldel_length)) { if ($this->smarty->auto_literal && ($this->mbstring_overload ? (mb_strpos(" \n\t\r",mb_substr($this->value,$this->ldel_length,1,'latin1'),0,'latin1') !== false) : (strpos(" \n\t\r",substr($this->value,$this->ldel_length,1)) !== false))) {
$this->token = Smarty_Internal_Templateparser::TP_TEXT; $this->token = Smarty_Internal_Templateparser::TP_TEXT;
} else { } else {
$this->token = Smarty_Internal_Templateparser::TP_LDELSLASH; $this->token = Smarty_Internal_Templateparser::TP_LDELSLASH;
@@ -1118,7 +1118,7 @@ class Smarty_Internal_Templatelexer
function yy_r4_6($yy_subpatterns) function yy_r4_6($yy_subpatterns)
{ {
if ($this->smarty->auto_literal && (strlen($this->value) > $this->ldel_length)) { if ($this->smarty->auto_literal && ($this->mbstring_overload ? (mb_strpos(" \n\t\r",mb_substr($this->value,$this->ldel_length,1,'latin1'),0,'latin1') !== false) : (strpos(" \n\t\r",substr($this->value,$this->ldel_length,1)) !== false))) {
$this->token = Smarty_Internal_Templateparser::TP_TEXT; $this->token = Smarty_Internal_Templateparser::TP_TEXT;
} else { } else {
$this->token = Smarty_Internal_Templateparser::TP_LDEL; $this->token = Smarty_Internal_Templateparser::TP_LDEL;
@@ -1236,7 +1236,7 @@ class Smarty_Internal_Templatelexer
function yy_r5_1($yy_subpatterns) function yy_r5_1($yy_subpatterns)
{ {
if ($this->smarty->auto_literal && (strlen($this->value) > $this->ldel_length)) { if ($this->smarty->auto_literal && ($this->mbstring_overload ? (mb_strpos(" \n\t\r",mb_substr($this->value,$this->ldel_length,1,'latin1'),0,'latin1') !== false) : (strpos(" \n\t\r",substr($this->value,$this->ldel_length,1)) !== false))) {
return false; return false;
} else { } else {
$this->token = Smarty_Internal_Templateparser::TP_STRIPON; $this->token = Smarty_Internal_Templateparser::TP_STRIPON;
@@ -1245,7 +1245,7 @@ class Smarty_Internal_Templatelexer
function yy_r5_2($yy_subpatterns) function yy_r5_2($yy_subpatterns)
{ {
if ($this->smarty->auto_literal && (strlen($this->value) > $this->ldel_length)) { if ($this->smarty->auto_literal && ($this->mbstring_overload ? (mb_strpos(" \n\t\r",mb_substr($this->value,$this->ldel_length,1,'latin1'),0,'latin1') !== false) : (strpos(" \n\t\r",substr($this->value,$this->ldel_length,1)) !== false))) {
return false; return false;
} else { } else {
$this->token = Smarty_Internal_Templateparser::TP_STRIPOFF; $this->token = Smarty_Internal_Templateparser::TP_STRIPOFF;
@@ -1254,7 +1254,7 @@ class Smarty_Internal_Templatelexer
function yy_r5_3($yy_subpatterns) function yy_r5_3($yy_subpatterns)
{ {
if ($this->smarty->auto_literal && (strlen($this->value) > $this->ldel_length)) { if ($this->smarty->auto_literal && ($this->mbstring_overload ? (mb_strpos(" \n\t\r",mb_substr($this->value,$this->ldel_length,1,'latin1'),0,'latin1') !== false) : (strpos(" \n\t\r",substr($this->value,$this->ldel_length,1)) !== false))) {
return false; return false;
} else { } else {
$this->yypopstate(); $this->yypopstate();
@@ -1346,7 +1346,7 @@ class Smarty_Internal_Templatelexer
function yy_r6_1($yy_subpatterns) function yy_r6_1($yy_subpatterns)
{ {
if ($this->smarty->auto_literal && (strlen($this->value) > $this->ldel_length)) { if ($this->smarty->auto_literal && ($this->mbstring_overload ? (mb_strpos(" \n\t\r",mb_substr($this->value,$this->ldel_length,1,'latin1'),0,'latin1') !== false) : (strpos(" \n\t\r",substr($this->value,$this->ldel_length,1)) !== false))) {
$this->token = Smarty_Internal_Templateparser::TP_BLOCKSOURCE; $this->token = Smarty_Internal_Templateparser::TP_BLOCKSOURCE;
} else { } else {
$this->yypopstate(); $this->yypopstate();
@@ -1356,7 +1356,7 @@ class Smarty_Internal_Templatelexer
function yy_r6_2($yy_subpatterns) function yy_r6_2($yy_subpatterns)
{ {
if ($this->smarty->auto_literal && (strlen($this->value) > $this->ldel_length)) { if ($this->smarty->auto_literal && ($this->mbstring_overload ? (mb_strpos(" \n\t\r",mb_substr($this->value,$this->ldel_length,1,'latin1'),0,'latin1') !== false) : (strpos(" \n\t\r",substr($this->value,$this->ldel_length,1)) !== false))) {
$this->token = Smarty_Internal_Templateparser::TP_BLOCKSOURCE; $this->token = Smarty_Internal_Templateparser::TP_BLOCKSOURCE;
} else { } else {
$this->yypopstate(); $this->yypopstate();
@@ -1366,7 +1366,7 @@ class Smarty_Internal_Templatelexer
function yy_r6_3($yy_subpatterns) function yy_r6_3($yy_subpatterns)
{ {
if ($this->smarty->auto_literal && (strlen($this->value) > $this->ldel_length)) { if ($this->smarty->auto_literal && ($this->mbstring_overload ? (mb_strpos(" \n\t\r",mb_substr($this->value,$this->ldel_length,1,'latin1'),0,'latin1') !== false) : (strpos(" \n\t\r",substr($this->value,$this->ldel_length,1)) !== false))) {
$this->token = Smarty_Internal_Templateparser::TP_BLOCKSOURCE; $this->token = Smarty_Internal_Templateparser::TP_BLOCKSOURCE;
} else { } else {
$this->yypopstate(); $this->yypopstate();
@@ -1394,3 +1394,5 @@ class Smarty_Internal_Templatelexer
} }
} }