From 413d00f9fb54ce4764c4cfef5fcbb3f379774d8f Mon Sep 17 00:00:00 2001
From: mohrt <mohrt@localhost>
Date: Thu, 18 Jul 2002 13:29:16 +0000
Subject: [PATCH] correct the expression match for smarty:nodefaults

---
 Smarty_Compiler.class.php      | 2 +-
 libs/Smarty_Compiler.class.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Smarty_Compiler.class.php b/Smarty_Compiler.class.php
index 000bacca..322df8ba 100644
--- a/Smarty_Compiler.class.php
+++ b/Smarty_Compiler.class.php
@@ -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;
 		}
diff --git a/libs/Smarty_Compiler.class.php b/libs/Smarty_Compiler.class.php
index 000bacca..322df8ba 100644
--- a/libs/Smarty_Compiler.class.php
+++ b/libs/Smarty_Compiler.class.php
@@ -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;
 		}