correct the expression match for smarty:nodefaults

This commit is contained in:
mohrt
2002-07-18 13:29:16 +00:00
parent 1f4b4f8a28
commit 413d00f9fb
2 changed files with 2 additions and 2 deletions

View File

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

View File

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