X-Git-Url: http://git.cyclocoop.org/?p=ptitvelo%2Fweb%2Fwww.git;a=blobdiff_plain;f=www%2Fplugins-dist%2Ftextwheel%2Fengine%2Ftextwheel.php;h=b473407ba044b9ba3051b05fecd81439d9b18d9c;hp=aba6e8573495719676489256471369b9577dd4ca;hb=e847eea4a82a7396dd0abf860f9b30d654f38629;hpb=d686c3e22e97dd46ef42bcd0f138c65083f8f232

diff --git a/www/plugins-dist/textwheel/engine/textwheel.php b/www/plugins-dist/textwheel/engine/textwheel.php
index aba6e85..b473407 100644
--- a/www/plugins-dist/textwheel/engine/textwheel.php
+++ b/www/plugins-dist/textwheel/engine/textwheel.php
@@ -164,7 +164,7 @@ class TextWheel {
 		}
 
 		# optimization: strpos or stripos?
-		if (isset($rule->strpos)) {
+		if (isset($rule->if_str)) {
 			if (strtolower($rule->if_str) !== strtoupper($rule->if_str)) {
 				$rule->if_stri = $rule->if_str;
 				unset($rule->if_str);
@@ -253,18 +253,19 @@ class TextWheel {
 		if (isset($rule->if_chars) AND (strpbrk($t, $rule->if_chars) === false))
 			return;
 
-		if (isset($rule->if_str) AND strpos($t, $rule->if_str) === false)
-			return;
-
-		if (isset($rule->if_stri) AND stripos($t, $rule->if_str) === false)
-			return;
-
 		if (isset($rule->if_match) AND !preg_match($rule->if_match, $t))
 			return;
 
+		// init rule before testing if_str / if_stri as they are optimized by initRule
 		if (!isset($rule->func_replace))
 			$this->initRule($rule);
 
+		if (isset($rule->if_str) AND strpos($t, $rule->if_str) === false)
+			return;
+
+		if (isset($rule->if_stri) AND stripos($t, $rule->if_stri) === false)
+			return;
+
 		$func = $rule->func_replace;
 		TextWheel::$func($rule->match,$rule->replace,$t,$count);
 	}