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

change default modifiers to array instead of string

Browse Source
This commit is contained in:
mohrt
2002-07-17 21:33:12 +00:00
parent 8fc32e427f
commit cecabd6cd2
5 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
NEWS
View File

@@ -1,3 +1,4 @@
- add default modifier logic (Monte)
- updated popup_init to be xhtml compliant (Tom Oram, Monte) - updated popup_init to be xhtml compliant (Tom Oram, Monte)
- fix filename bug with windows (Gary Loescher, Monte) - fix filename bug with windows (Gary Loescher, Monte)
- add ability to supply expire time in seconds when clearing - add ability to supply expire time in seconds when clearing

6
Smarty.class.php
View File

@@ -152,9 +152,9 @@ class Smarty
// sub directories are more efficient, but // sub directories are more efficient, but
// you can set this to false if your PHP environment // you can set this to false if your PHP environment
// does not allow the creation of them. // does not allow the creation of them.
var $default_modifiers = ''; var $default_modifiers = array();
// modifier string to implicitly append to every var // modifiers to implicitly append to every var
// example: '|escape:"htmlall"' // example: array('escape:"htmlall"');
/**************************************************************************/ /**************************************************************************/
/* END SMARTY CONFIGURATION SECTION */ /* END SMARTY CONFIGURATION SECTION */

6
Smarty_Compiler.class.php
View File

@@ -1109,9 +1109,9 @@ class Smarty_Compiler extends Smarty {
$var_ref = $parts[0]; $var_ref = $parts[0];
$modifiers = isset($parts[1]) ? $parts[1] : ''; $modifiers = isset($parts[1]) ? $parts[1] : '';
if(!empty($this->default_modifiers) && !strstr('smarty:nodefaults',$modifiers)) {
if(!empty($this->default_modifiers) && !strstr($modifiers,'smarty:nodefaults')) { $_default_mod_string = implode('|',(array)$this->default_modifiers);
$modifiers = empty($modifiers) ? $this->default_modifiers : $this->default_modifiers . '|' . $modifiers; $modifiers = empty($modifiers) ? $_default_mod_string : $_default_mod_string . '|' . $modifiers;
} }
$modifiers = str_replace(array('smarty:nodefaults','||'),array('','|'),$modifiers); $modifiers = str_replace(array('smarty:nodefaults','||'),array('','|'),$modifiers);

6
libs/Smarty.class.php
View File

@@ -152,9 +152,9 @@ class Smarty
// sub directories are more efficient, but // sub directories are more efficient, but
// you can set this to false if your PHP environment // you can set this to false if your PHP environment
// does not allow the creation of them. // does not allow the creation of them.
var $default_modifiers = ''; var $default_modifiers = array();
// modifier string to implicitly append to every var // modifiers to implicitly append to every var
// example: '|escape:"htmlall"' // example: array('escape:"htmlall"');
/**************************************************************************/ /**************************************************************************/
/* END SMARTY CONFIGURATION SECTION */ /* END SMARTY CONFIGURATION SECTION */

6
libs/Smarty_Compiler.class.php
View File

@@ -1109,9 +1109,9 @@ class Smarty_Compiler extends Smarty {
$var_ref = $parts[0]; $var_ref = $parts[0];
$modifiers = isset($parts[1]) ? $parts[1] : ''; $modifiers = isset($parts[1]) ? $parts[1] : '';
if(!empty($this->default_modifiers) && !strstr('smarty:nodefaults',$modifiers)) {
if(!empty($this->default_modifiers) && !strstr($modifiers,'smarty:nodefaults')) { $_default_mod_string = implode('|',(array)$this->default_modifiers);
$modifiers = empty($modifiers) ? $this->default_modifiers : $this->default_modifiers . '|' . $modifiers; $modifiers = empty($modifiers) ? $_default_mod_string : $_default_mod_string . '|' . $modifiers;
} }
$modifiers = str_replace(array('smarty:nodefaults','||'),array('','|'),$modifiers); $modifiers = str_replace(array('smarty:nodefaults','||'),array('','|'),$modifiers);