Changeset 16168

Timestamp:

11/03/2010 07:02:42 PM (14 years ago)

Author:

ryan

Message:

Anchor user search queries to the front. Limit columns searched based on what the search string looks like. see #15170

Location:

trunk/wp-includes

Files:

• class-wp-object-query.php (modified) (1 diff)
• user.php (modified) (1 diff)

trunk/wp-includes/class-wp-object-query.php

@@ -234 +234 @@
 
         $searches = array();
-        foreach ( $cols as $col )
-            $searches[] = "$col LIKE '%$string%'";
+        foreach ( $cols as $col ) {
+            if ( 'ID' == $col )
+                $searches[] = "$col = '$string'";
+            else
+                $searches[] = "$col LIKE '$string%'";
+        }
 
         return ' AND (' . implode(' OR ', $searches) . ')';

trunk/wp-includes/user.php

@@ -447 +447 @@
         $search = trim( $qv['search'] );
         if ( $search ) {
-            $this->query_where .= $this->get_search_sql( $search, array( 'user_login', 'user_nicename', 'user_email', 'user_url', 'display_name' ) );
+            if ( false !== strpos( $search, '@') )
+                $search_columns[] = array('user_email');
+            elseif ( is_numeric($search) )
+                $search_columns = array('user_login', 'ID');
+            elseif ( preg_match('|^https?://|', $search) )
+                $search_columns = array('user_url');
+            else
+                $search_columns = array('user_login', 'user_nicename', 'display_name');
+
+            $this->query_where .= $this->get_search_sql( $search, $search_columns );
         }