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

- removed /* vim: set expandtab: */ comments

Browse Source 
- bugfix of auto literal problem introduce with fix of 31/05/2010
This commit is contained in:
Uwe.Tews
2010-06-01 19:11:48 +00:00
parent c82455c145
commit 62490ae8c0
7 changed files with 14 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
change_log.txt
View File

@@ -1,5 +1,7 @@
01/06/2010
- bugfix on template functions used with template inheritance
- removed /* vim: set expandtab: */ comments
- bugfix of auto literal problem introduce with fix of 31/05/2010
31/05/2010
- bugfix the parser did not allow some smarty variables with special name like $for, $if, $else and others.

3
libs/plugins/function.counter.php
View File

@@ -74,7 +74,4 @@ function smarty_function_counter($params, $smarty)
return $retval;
}
/* vim: set expandtab: */
?>

3
libs/plugins/function.cycle.php
View File

@@ -100,7 +100,4 @@ function smarty_function_cycle($params, $smarty)
return $retval;
}
/* vim: set expandtab: */
?>

5
libs/plugins/function.popup_init.php
View File

@@ -35,7 +35,4 @@ function smarty_function_popup_init($params, $smarty, $template)
trigger_error("popup_init: missing src parameter",E_USER_WARNING);
}
}
/* vim: set expandtab: */
?>
?>

5
libs/plugins/modifier.regex_replace.php
View File

@@ -42,7 +42,4 @@ function _smarty_regex_replace_check($search)
}
return $search;
}
/* vim: set expandtab: */
?>
?>

5
libs/plugins/shared.escape_special_chars.php
View File

@@ -25,7 +25,4 @@ function smarty_function_escape_special_chars($string)
}
return $string;
}
/* vim: set expandtab: */
?>
?>

18
libs/sysplugins/smarty_internal_templatelexer.php
View File

@@ -270,7 +270,7 @@ class Smarty_Internal_Templatelexer
function yy_r1_11($yy_subpatterns)
{
if ($this->smarty->auto_literal && substr($this->value,$this->ldel_length,1) == ' ') {
if ($this->smarty->auto_literal && trim(substr($this->value,$this->ldel_length,1)) == '') {
$this->token = Smarty_Internal_Templateparser::TP_OTHER;
} else {
$this->token = Smarty_Internal_Templateparser::TP_LDELIF;
@@ -281,7 +281,7 @@ class Smarty_Internal_Templatelexer
function yy_r1_13($yy_subpatterns)
{
if ($this->smarty->auto_literal && substr($this->value,$this->ldel_length,1) == ' ') {
if ($this->smarty->auto_literal && trim(substr($this->value,$this->ldel_length,1)) == '') {
$this->token = Smarty_Internal_Templateparser::TP_OTHER;
} else {
$this->token = Smarty_Internal_Templateparser::TP_LDELFOR;
@@ -292,7 +292,7 @@ class Smarty_Internal_Templatelexer
function yy_r1_14($yy_subpatterns)
{
if ($this->smarty->auto_literal && substr($this->value,$this->ldel_length,1) == ' ') {
if ($this->smarty->auto_literal && trim(substr($this->value,$this->ldel_length,1)) == '') {
$this->token = Smarty_Internal_Templateparser::TP_OTHER;
} else {
$this->token = Smarty_Internal_Templateparser::TP_LDELFOREACH;
@@ -479,7 +479,7 @@ class Smarty_Internal_Templatelexer
function yy_r2_3($yy_subpatterns)
{
if ($this->smarty->auto_literal && substr($this->value,$this->ldel_length,1) == ' ') {
if ($this->smarty->auto_literal && trim(substr($this->value,$this->ldel_length,1)) == '') {
$this->token = Smarty_Internal_Templateparser::TP_OTHER;
} else {
$this->token = Smarty_Internal_Templateparser::TP_LDELIF;
@@ -490,7 +490,7 @@ class Smarty_Internal_Templatelexer
function yy_r2_5($yy_subpatterns)
{
if ($this->smarty->auto_literal && substr($this->value,$this->ldel_length,1) == ' ') {
if ($this->smarty->auto_literal && trim(substr($this->value,$this->ldel_length,1)) == '') {
$this->token = Smarty_Internal_Templateparser::TP_OTHER;
} else {
$this->token = Smarty_Internal_Templateparser::TP_LDELFOR;
@@ -501,7 +501,7 @@ class Smarty_Internal_Templatelexer
function yy_r2_6($yy_subpatterns)
{
if ($this->smarty->auto_literal && substr($this->value,$this->ldel_length,1) == ' ') {
if ($this->smarty->auto_literal && trim(substr($this->value,$this->ldel_length,1)) == '') {
$this->token = Smarty_Internal_Templateparser::TP_OTHER;
} else {
$this->token = Smarty_Internal_Templateparser::TP_LDELFOREACH;
@@ -1021,7 +1021,7 @@ class Smarty_Internal_Templatelexer
function yy_r4_2($yy_subpatterns)
{
if ($this->smarty->auto_literal && substr($this->value,$this->ldel_length,1) == ' ') {
if ($this->smarty->auto_literal && trim(substr($this->value,$this->ldel_length,1)) == '') {
$this->token = Smarty_Internal_Templateparser::TP_OTHER;
} else {
$this->token = Smarty_Internal_Templateparser::TP_LDELIF;
@@ -1032,7 +1032,7 @@ class Smarty_Internal_Templatelexer
function yy_r4_4($yy_subpatterns)
{
if ($this->smarty->auto_literal && substr($this->value,$this->ldel_length,1) == ' ') {
if ($this->smarty->auto_literal && trim(substr($this->value,$this->ldel_length,1)) == '') {
$this->token = Smarty_Internal_Templateparser::TP_OTHER;
} else {
$this->token = Smarty_Internal_Templateparser::TP_LDELFOR;
@@ -1043,7 +1043,7 @@ class Smarty_Internal_Templatelexer
function yy_r4_5($yy_subpatterns)
{
if ($this->smarty->auto_literal && substr($this->value,$this->ldel_length,1) == ' ') {
if ($this->smarty->auto_literal && trim(substr($this->value,$this->ldel_length,1)) == '') {
$this->token = Smarty_Internal_Templateparser::TP_OTHER;
} else {
$this->token = Smarty_Internal_Templateparser::TP_LDELFOREACH;