Changeset 4990 for trunk/wp-includes/formatting.php

Timestamp:

03/07/2007 05:29:15 AM (19 years ago)

Author:

markjaquith

Message:

Use strpos instead of strstr where ever possible, for speed. Props rob1n. fixes #3920

File:

• trunk/wp-includes/formatting.php (modified) (4 diffs)

trunk/wp-includes/formatting.php

@@ -30 +30 @@
             // static strings
             $curl = str_replace($static_characters, $static_replacements, $curl);
-
             // regular expressions
             $curl = preg_replace($dynamic_characters, $dynamic_replacements, $curl);
-        } elseif ( strstr($curl, '<code') || strstr($curl, '<pre') || strstr($curl, '<kbd') || strstr($curl, '<style') || strstr($curl, '<script') ) { 
+        } elseif (strpos($curl, '<code') !== false || strpos($curl, '<pre') !== false || strpos($curl, '<kbd') !== false || strpos($curl, '<style') !== false || strpos($curl, '<script') !== false) {
             $next = false;
         } else {
@@ -79 +78 @@
     $pee = preg_replace('!(</?' . $allblocks . '[^>]*>)\s*<br />!', "$1", $pee);
     $pee = preg_replace('!<br />(\s*</?(?:p|li|div|dl|dd|dt|th|pre|td|ul|ol)[^>]*>)!', '$1', $pee);
-    if ( strstr( $pee, '<pre' ) )
+    if (strpos($pee, '<pre') !== false)
         $pee = preg_replace('!(<pre.*?>)(.*?)</pre>!ise', " stripslashes('$1') .  stripslashes(clean_pre('$2'))  . '</pre>' ", $pee);
     $pee = preg_replace( "|\n</p>$|", '</p>', $pee );
@@ -659 +658 @@
 function is_email($user_email) {
     $chars = "/^([a-z0-9+_]|\\-|\\.)+@(([a-z0-9_]|\\-)+\\.)+[a-z]{2,6}\$/i";
-    if(strstr($user_email, '@') && strstr($user_email, '.')) {
+    if (strpos($user_email, '@') !== false && strpos($user_email, '.') !== false) {
         if (preg_match($chars, $user_email)) {
             return true;
@@ -1073 +1072 @@
     $url = str_replace($strip, '', $url);
     $url = str_replace(';//', '://', $url);
-    $url = (!strstr($url, '://')) ? 'http://'.$url : $url;
+    $url = (strpos($url, '://') === false) ? 'http://'.$url : $url;
     $url = preg_replace('/&([^#])(?![a-z]{2,8};)/', '&#038;$1', $url);
     if ( !is_array($protocols) )