Ticket #36675: 36675.diff

src/wp-admin/includes/class-wp-ms-sites-list-table.php

@@ -83 +83 @@
                 $s = isset( $_REQUEST['s'] ) ? wp_unslash( trim( $_REQUEST[ 's' ] ) ) : '';
                 $wild = '';
                 if ( false !== strpos($s, '*') ) {
-                        $wild = '%';
+                        $wild = '*';
                         $s = trim($s, '*');
                 }
 
@@ -98 +98 @@
                                 $_GET['order'] = $_REQUEST['order'] = 'DESC';
                 }
 
-                $query = "SELECT * FROM {$wpdb->blogs} WHERE site_id = '{$wpdb->siteid}' ";
+                $args = array(
+                        'fields'     => 'ids',
+                        'number'     => intval( $per_page ),
+                        'offset'     => intval( ( $pagenum - 1 ) * $per_page ),
+                        'network_id' => $current_site->id,
+                );
 
-                if ( empty($s) ) {
+                if ( empty( $s ) ) {
                         // Nothing to do.
                 } elseif ( preg_match( '/^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$/', $s ) ||
                                         preg_match( '/^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.?$/', $s ) ||
@@ -107 +112 @@
                                         preg_match( '/^[0-9]{1,3}\.[0-9]{1,3}\.?$/', $s ) ||
                                         preg_match( '/^[0-9]{1,3}\.$/', $s ) ) {
                         // IPv4 address
-                        $sql = $wpdb->prepare( "SELECT blog_id FROM {$wpdb->registration_log} WHERE {$wpdb->registration_log}.IP LIKE %s", $wpdb->esc_like( $s ) . $wild );
+                        $sql = $wpdb->prepare( "SELECT blog_id FROM {$wpdb->registration_log} WHERE {$wpdb->registration_log}.IP LIKE %s", $wpdb->esc_like( $s ) . ( ! empty( $wild ) ? '%' : '' ) );
                         $reg_blog_ids = $wpdb->get_col( $sql );
 
-                        if ( !$reg_blog_ids )
-                                $reg_blog_ids = array( 0 );
-
-                        $query = "SELECT *
-                                FROM {$wpdb->blogs}
-                                WHERE site_id = '{$wpdb->siteid}'
-                                AND {$wpdb->blogs}.blog_id IN (" . implode( ', ', $reg_blog_ids ) . ")";
+                        if ( $reg_blog_ids ) {
+                                $args['site__in'] = $reg_blog_ids;
+                        }
                 } else {
-                        if ( is_numeric($s) && empty( $wild ) ) {
-                                $query .= $wpdb->prepare( " AND ( {$wpdb->blogs}.blog_id = %s )", $s );
+                        if ( is_numeric( $s ) && empty( $wild ) ) {
+                                $args['ID'] = $s;
                         } elseif ( is_subdomain_install() ) {
-                                $blog_s = str_replace( '.' . $current_site->domain, '', $s );
-                                $blog_s = $wpdb->esc_like( $blog_s ) . $wild . $wpdb->esc_like( '.' . $current_site->domain );
-                                $query .= $wpdb->prepare( " AND ( {$wpdb->blogs}.domain LIKE %s ) ", $blog_s );
+                                $args['search'] = str_replace( '.' . $current_site->domain, '', $s ) . $wild . '.' . $current_site->domain;
                         } else {
                                 if ( $s != trim('/', $current_site->path) ) {
-                                        $blog_s = $wpdb->esc_like( $current_site->path . $s ) . $wild . $wpdb->esc_like( '/' );
+                                        $args['search'] = $current_site->path . $s . $wild . '/';
                                 } else {
-                                        $blog_s = $wpdb->esc_like( $s );
+                                        $args['search'] = $s;
                                 }
-                                $query .= $wpdb->prepare( " AND  ( {$wpdb->blogs}.path LIKE %s )", $blog_s );
                         }
                 }
 
                 $order_by = isset( $_REQUEST['orderby'] ) ? $_REQUEST['orderby'] : '';
-                if ( $order_by === 'registered' ) {
-                        $query .= ' ORDER BY registered ';
-                } elseif ( $order_by === 'lastupdated' ) {
-                        $query .= ' ORDER BY last_updated ';
-                } elseif ( $order_by === 'blogname' ) {
+                if ( 'lastupdated' === $order_by ) {
+                        $order_by = 'last_updated';
+                } elseif ( 'blogname' === $order_by ) {
                         if ( is_subdomain_install() ) {
-                                $query .= ' ORDER BY domain ';
+                                $order_by = 'domain';
                         } else {
-                                $query .= ' ORDER BY path ';
+                                $order_by = 'path';
                         }
-                } elseif ( $order_by === 'blog_id' ) {
-                        $query .= ' ORDER BY blog_id ';
-                } else {
-                        $order_by = null;
+                } elseif ( 'blog_id' === $order_by ) {
+                        $order_by = 'id';
+                } elseif ( ! $order_by ) {
+                        $order_by = false;
                 }
 
-                if ( isset( $order_by ) ) {
-                        $order = ( isset( $_REQUEST['order'] ) && 'DESC' === strtoupper( $_REQUEST['order'] ) ) ? "DESC" : "ASC";
-                        $query .= $order;
+                $args['orderby'] = $order_by;
+
+                if ( $order_by ) {
+                        $args['order'] = ( isset( $_REQUEST['order'] ) && 'DESC' === strtoupper( $_REQUEST['order'] ) ) ? "DESC" : "ASC";
                 }
 
-                // Don't do an unbounded count on large networks
-                if ( ! wp_is_large_network() )
-                        $total = $wpdb->get_var( str_replace( 'SELECT *', 'SELECT COUNT( blog_id )', $query ) );
+                if ( wp_is_large_network() ) {
+                        $args['no_found_rows'] = true;
+                } else {
+                        $args['no_found_rows'] = false;
+                }
 
-                $query .= " LIMIT " . intval( ( $pagenum - 1 ) * $per_page ) . ", " . intval( $per_page );
-                $this->items = $wpdb->get_results( $query, ARRAY_A );
+                $query = new WP_Site_Query();
+                $ids = $query->query( $args );
 
-                if ( wp_is_large_network() )
-                        $total = count($this->items);
+                if ( ! $args['no_found_rows'] ) {
+                        $total = $query->found_sites;
+                } else {
+                        $total = count( $ids );
+                }
 
+                $this->items = array();
+                foreach ( $ids as $id ) {
+                        $this->items[] = get_site( $id, ARRAY_A );
+                }
+
                 $this->set_pagination_args( array(
                         'total_items' => $total,
                         'per_page' => $per_page,

src/wp-includes/class-wp-site-query.php

@@ -563 +563 @@
         protected function get_search_sql( $string, $columns ) {
                 global $wpdb;
 
-                $like = '%' . $wpdb->esc_like( $string ) . '%';
+                if ( false !== strpos( $string, '*' ) ) {
+                        $like = implode( '%', array_map( array( $wpdb, 'esc_like' ), explode( '*', $string ) ) );
+                } else {
+                        $like = '%' . $wpdb->esc_like( $string ) . '%';
+                }
 
                 $searches = array();
                 foreach ( $columns as $column ) {