Ticket #36675: 36675.2.diff
File 36675.2.diff, 5.2 KB (added by , 8 years ago) |
---|
-
src/wp-admin/includes/class-wp-ms-sites-list-table.php
83 83 $s = isset( $_REQUEST['s'] ) ? wp_unslash( trim( $_REQUEST[ 's' ] ) ) : ''; 84 84 $wild = ''; 85 85 if ( false !== strpos($s, '*') ) { 86 $wild = ' %';86 $wild = '*'; 87 87 $s = trim($s, '*'); 88 88 } 89 89 … … 98 98 $_GET['order'] = $_REQUEST['order'] = 'DESC'; 99 99 } 100 100 101 $query = "SELECT * FROM {$wpdb->blogs} WHERE site_id = '{$wpdb->siteid}' "; 101 $args = array( 102 'fields' => 'ids', 103 'number' => intval( $per_page ), 104 'offset' => intval( ( $pagenum - 1 ) * $per_page ), 105 'network_id' => $current_site->id, 106 ); 102 107 103 108 if ( empty($s) ) { 104 109 // Nothing to do. … … 107 112 preg_match( '/^[0-9]{1,3}\.[0-9]{1,3}\.?$/', $s ) || 108 113 preg_match( '/^[0-9]{1,3}\.$/', $s ) ) { 109 114 // IPv4 address 110 $sql = $wpdb->prepare( "SELECT blog_id FROM {$wpdb->registration_log} WHERE {$wpdb->registration_log}.IP LIKE %s", $wpdb->esc_like( $s ) . $wild);115 $sql = $wpdb->prepare( "SELECT blog_id FROM {$wpdb->registration_log} WHERE {$wpdb->registration_log}.IP LIKE %s", $wpdb->esc_like( $s ) . ( ! empty( $wild ) ? '%' : '' ) ); 111 116 $reg_blog_ids = $wpdb->get_col( $sql ); 112 117 113 if ( !$reg_blog_ids ) 114 $reg_blog_ids = array( 0 ); 115 116 $query = "SELECT * 117 FROM {$wpdb->blogs} 118 WHERE site_id = '{$wpdb->siteid}' 119 AND {$wpdb->blogs}.blog_id IN (" . implode( ', ', $reg_blog_ids ) . ")"; 118 if ( $reg_blog_ids ) { 119 $args['site__in'] = $reg_blog_ids; 120 } 120 121 } else { 121 if ( is_numeric($s) && empty( $wild ) ) { 122 $query .= $wpdb->prepare( " AND ( {$wpdb->blogs}.blog_id = %s )", $s ); 123 } elseif ( is_subdomain_install() ) { 124 $blog_s = str_replace( '.' . $current_site->domain, '', $s ); 125 $blog_s = $wpdb->esc_like( $blog_s ) . $wild . $wpdb->esc_like( '.' . $current_site->domain ); 126 $query .= $wpdb->prepare( " AND ( {$wpdb->blogs}.domain LIKE %s ) ", $blog_s ); 122 if ( is_numeric( $s ) && empty( $wild ) ) { 123 $args['ID'] = $s; 127 124 } else { 128 if ( $s != trim('/', $current_site->path) ) { 129 $blog_s = $wpdb->esc_like( $current_site->path . $s ) . $wild . $wpdb->esc_like( '/' ); 130 } else { 131 $blog_s = $wpdb->esc_like( $s ); 132 } 133 $query .= $wpdb->prepare( " AND ( {$wpdb->blogs}.path LIKE %s )", $blog_s ); 125 $args['search'] = $s; 134 126 } 135 127 } 136 128 137 129 $order_by = isset( $_REQUEST['orderby'] ) ? $_REQUEST['orderby'] : ''; 138 if ( $order_by === 'registered' ) { 139 $query .= ' ORDER BY registered '; 140 } elseif ( $order_by === 'lastupdated' ) { 141 $query .= ' ORDER BY last_updated '; 142 } elseif ( $order_by === 'blogname' ) { 143 if ( is_subdomain_install() ) { 144 $query .= ' ORDER BY domain '; 145 } else { 146 $query .= ' ORDER BY path '; 147 } 148 } elseif ( $order_by === 'blog_id' ) { 149 $query .= ' ORDER BY blog_id '; 150 } else { 151 $order_by = null; 130 if ( 'registered' === $order_by ) { 131 // registered is named properly. 132 } elseif ( 'lastupdated' === $order_by ) { 133 $order_by = 'last_updated'; 134 } elseif ( 'blogname' === $order_by ) { 135 $order_by = 'domain'; 136 } elseif ( 'blog_id' === $order_by ) { 137 $order_by = 'id'; 138 } elseif ( ! $order_by ) { 139 $order_by = false; 152 140 } 153 141 154 if ( isset( $order_by ) ) { 155 $order = ( isset( $_REQUEST['order'] ) && 'DESC' === strtoupper( $_REQUEST['order'] ) ) ? "DESC" : "ASC"; 156 $query .= $order; 142 $args['orderby'] = $order_by; 143 144 if ( $order_by ) { 145 $args['order'] = ( isset( $_REQUEST['order'] ) && 'DESC' === strtoupper( $_REQUEST['order'] ) ) ? "DESC" : "ASC"; 157 146 } 158 147 159 // Don't do an unbounded count on large networks 160 if ( ! wp_is_large_network() ) 161 $total = $wpdb->get_var( str_replace( 'SELECT *', 'SELECT COUNT( blog_id )', $query ) ); 148 if ( wp_is_large_network() ) { 149 $args['no_found_rows'] = true; 150 } else { 151 $args['no_found_rows'] = false; 152 } 162 153 163 $query .= " LIMIT " . intval( ( $pagenum - 1 ) * $per_page ) . ", " . intval( $per_page);164 $ this->items = $wpdb->get_results( $query, ARRAY_A);154 $query = new WP_Site_Query(); 155 $ids = $query->query( $args ); 165 156 166 if ( wp_is_large_network() ) 167 $total = count($this->items); 157 if ( ! $args['no_found_rows'] ) { 158 $total = $query->found_sites; 159 } else { 160 $total = count( $ids ); 161 } 168 162 163 $this->items = array(); 164 foreach ( $ids as $id ) { 165 $this->items[] = (array) get_site( $id ); 166 } 167 169 168 $this->set_pagination_args( array( 170 169 'total_items' => $total, 171 170 'per_page' => $per_page, -
src/wp-includes/class-wp-site-query.php
563 563 protected function get_search_sql( $string, $columns ) { 564 564 global $wpdb; 565 565 566 $like = '%' . $wpdb->esc_like( $string ) . '%'; 566 if ( false !== strpos( $string, '*' ) ) { 567 $like = '%' . implode( '%', array_map( array( $wpdb, 'esc_like' ), explode( '*', $string ) ) ) . '%'; 568 } else { 569 $like = '%' . $wpdb->esc_like( $string ) . '%'; 570 } 567 571 568 572 $searches = array(); 569 573 foreach ( $columns as $column ) {