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

Timestamp:

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

Author:

markjaquith

Message:

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

File:

• trunk/wp-includes/rewrite.php (modified) (2 diffs)

trunk/wp-includes/rewrite.php

@@ -592 +592 @@
                 //2) post ID, 3) page name, 4) timestamp (year, month, day, hour, second and
                 //minute all present). Set these flags now as we need them for the endpoints.
-                if (strstr($struct, '%postname%') || strstr($struct, '%post_id%')
-                        || strstr($struct, '%pagename%')
-                        || (strstr($struct, '%year%') &&  strstr($struct, '%monthnum%') && strstr($struct, '%day%') && strstr($struct, '%hour%') && strstr($struct, '%minute') && strstr($struct, '%second%'))) {
+                if (strpos($struct, '%postname%') !== false || strpos($struct, '%post_id%') !== false
+                        || strpos($struct, '%pagename%') !== false
+                        || (strpos($struct, '%year%') !== false && strpos($struct, '%monthnum%') !== false && strpos($struct, '%day%') !== false && strpos($struct, '%hour%') !== false && strpos($struct, '%minute%') !== false && strpos($struct, '%second%') !== false)) {
                     $post = true;
-                    if  ( strstr($struct, '%pagename%') )
+                    if (strpos($struct, '%pagename%') !== false)
                         $page = true;
                 }
@@ -810 +810 @@
                 }
 
-                if (strstr($query, $this->index)) {
+                if (strpos($query, $this->index) !== false) {
                     $rules .= 'RewriteRule ^' . $match . ' ' . $home_root . $query . " [QSA,L]\n";
                 } else {