Changeset 16170

Timestamp:

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

Author:

ryan

Message:

Allow trailing wildcard user searches by appending *. see #15170

Location:

trunk/wp-includes

Files:

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

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

@@ -228 +228 @@
      * @param string $string
      * @param array $cols
+     * @param bool $wild Whether to allow trailing wildcard searches. Default is false.
      * @return string
      */
-    function get_search_sql( $string, $cols ) {
+    function get_search_sql( $string, $cols, $wild = false ) {
         $string = esc_sql( $string );
 
         $searches = array();
+        $wild_char = ( $wild ) ? '%' : '';
         foreach ( $cols as $col ) {
             if ( 'ID' == $col )
                 $searches[] = "$col = '$string'";
             else
-                $searches[] = "$col LIKE '$string%'";
+                $searches[] = "$col LIKE '$string$wild_char'";
         }
 

trunk/wp-includes/user.php

@@ -447 +447 @@
         $search = trim( $qv['search'] );
         if ( $search ) {
+            $wild = false;
+            if ( false !== strpos($search, '*') ) {
+                $wild = 'true';
+                $search = trim($search, '*');
+            }
             if ( false !== strpos( $search, '@') )
                 $search_columns[] = array('user_email');
@@ -456 +461 @@
                 $search_columns = array('user_login', 'user_nicename', 'display_name');
 
-            $this->query_where .= $this->get_search_sql( $search, $search_columns );
+            $this->query_where .= $this->get_search_sql( $search, $search_columns, $wild );
         }