Changeset 17189 for trunk/wp-includes/user.php

Timestamp:

12/30/2010 11:38:21 PM (15 years ago)

Author:

ryan

Message:

Default to leading and trailing wildcards for site user searches. Require explicit trailing wildcard asterisk request for network user searches. Disallow leading wildcards for network user searches. Move wildcard policy up the stake, allowing more flexibility in WP_User_Query. Props SergeyBiryukov. fixes #16014

File:

• trunk/wp-includes/user.php (modified) (3 diffs)

trunk/wp-includes/user.php

@@ -466 +466 @@
         $search = trim( $qv['search'] );
         if ( $search ) {
-            $wild = false;
-            if ( false !== strpos($search, '*') ) {
-                $wild = true;
+            $leading_wild = ( ltrim($search, '*') != $search );
+            $trailing_wild = ( rtrim($search, '*') != $search );
+            if ( $leading_wild && $trailing_wild )
+                $wild = 'both';
+            elseif ( $leading_wild )
+                $wild = 'leading';
+            elseif ( $trailing_wild )
+                $wild = 'trailing';
+            else
+                $wild = false;
+            if ( $wild )
                 $search = trim($search, '*');
-            }
+
             if ( false !== strpos( $search, '@') )
                 $search_columns = array('user_email');
@@ -565 +573 @@
      * @param string $string
      * @param array $cols
-     * @param bool $wild Whether to allow trailing wildcard searches. Default is false.
+     * @param bool $wild Whether to allow wildcard searches. Default is false for Network Admin, true for
+     *  single site. Single site allows leading and trailing wildcards, Network Admin only trailing.
      * @return string
      */
@@ -572 +581 @@
 
         $searches = array();
-        $wild_char = ( $wild ) ? '%' : '';
+        $leading_wild = ( 'leading' == $wild || 'both' == $wild ) ? '%' : '';
+        $trailing_wild = ( 'trailing' == $wild || 'both' == $wild ) ? '%' : '';
         foreach ( $cols as $col ) {
             if ( 'ID' == $col )
                 $searches[] = "$col = '$string'";
             else
-                $searches[] = "$col LIKE '" . like_escape($string) . "$wild_char'";
+                $searches[] = "$col LIKE '$leading_wild" . like_escape($string) . "$trailing_wild'";
         }