Changeset 4990 for trunk/wp-includes/query.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/query.php (modified) (6 diffs)

trunk/wp-includes/query.php

@@ -30 +30 @@
         global $wp_query;
 
-        return ( $wp_query->is_admin || strstr($_SERVER['REQUEST_URI'], 'wp-admin/') );
+        return ($wp_query->is_admin || (strpos($_SERVER['REQUEST_URI'], 'wp-admin/') !== false));
 }
 
@@ -511 +511 @@
                                 $this->is_category = false;
                         } else {
-                                if (stristr($qv['cat'],'-')) {
+                                if (strpos($qv['cat'], '-') !== false) {
                                         $this->is_category = false;
                                 } else {
@@ -558 +558 @@
                 }
 
-                if (strstr($_SERVER['PHP_SELF'], 'wp-admin/')) {
+                if (strpos($_SERVER['PHP_SELF'], 'wp-admin/') !== false) {
                         $this->is_admin = true;
                 }
@@ -851 +851 @@
                         foreach ( $cat_array as $cat ) {
                                 $cat = intval($cat);
-                                $in = strstr($cat, '-') ? false : true;
+                                $in = (strpos($cat, '-') !== false) ? false : true;
                                 $cat = trim($cat, '-');
                                 if ( $in )
@@ -919 +919 @@
                         $q['author'] = ''.urldecode($q['author']).'';
                         $q['author'] = addslashes_gpc($q['author']);
-                        if (stristr($q['author'], '-')) {
+                        if (strpos($q['author'], '-') !== false) {
                                 $eq = '!=';
                                 $andor = 'AND';
@@ -939 +939 @@
 
                 if ('' != $q['author_name']) {
-                        if (stristr($q['author_name'],'/')) {
+                        if (strpos($q['author_name'], '/') !== false) {
                                 $q['author_name'] = explode('/',$q['author_name']);
                                 if ($q['author_name'][count($q['author_name'])-1]) {