Ticket #16014: 16014.3.diff

wp-includes/user.php

@@ -465 +465 @@
 
                 $search = trim( $qv['search'] );
                 if ( $search ) {
-                        $wild = false;
-                        if ( false !== strpos($search, '*') ) {
+                        if ( is_network_admin() )
+                                $wild = ( false !== strpos($search, '*') );
+                        else
                                 $wild = true;
-                                $search = trim($search, '*');
-                        }
+                        $search = trim($search, '*');
                         if ( false !== strpos( $search, '@') )
                                 $search_columns = array('user_email');
                         elseif ( is_numeric($search) )
@@ -564 +564 @@
          *
          * @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
          */
-        function get_search_sql( $string, $cols, $wild = false ) {
+        function get_search_sql( $string, $cols, $wild = null ) {
                 $string = esc_sql( $string );
 
                 $searches = array();
-                $wild_char = ( $wild ) ? '%' : '';
+                if ( null === $wild )
+                        $wild = ! is_network_admin();
+
+                $trailing_wild = ( $wild ) ? '%' : '';
+                $leading_wild = $wild && ! is_network_admin() ? '%' : '';
                 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'";
                 }
 
                 return ' AND (' . implode(' OR ', $searches) . ')';