X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/f9001779751f83dc8a10e478bfecb4d8dd5f964c..9c2096d803812dacbdf6cf8efe90053e39f00b96:/wp-admin/includes/class-wp-ms-sites-list-table.php
diff --git a/wp-admin/includes/class-wp-ms-sites-list-table.php b/wp-admin/includes/class-wp-ms-sites-list-table.php
index c1bf68b6..73ce8898 100644
--- a/wp-admin/includes/class-wp-ms-sites-list-table.php
+++ b/wp-admin/includes/class-wp-ms-sites-list-table.php
@@ -9,8 +9,8 @@
*/
class WP_MS_Sites_List_Table extends WP_List_Table {
- function WP_MS_Sites_List_Table() {
- parent::WP_List_Table( array(
+ function __construct() {
+ parent::__construct( array(
'plural' => 'sites',
) );
}
@@ -37,23 +37,24 @@ class WP_MS_Sites_List_Table extends WP_List_Table {
$like_s = esc_sql( like_escape( $s ) );
- $large_network = false;
// If the network is large and a search is not being performed, show only the latest blogs with no paging in order
// to avoid expensive count queries.
- if ( !$s && ( get_blog_count() >= 10000 ) ) {
+ if ( !$s && wp_is_large_network() ) {
if ( !isset($_REQUEST['orderby']) )
$_GET['orderby'] = $_REQUEST['orderby'] = '';
if ( !isset($_REQUEST['order']) )
$_GET['order'] = $_REQUEST['order'] = 'DESC';
- $large_network = true;
}
$query = "SELECT * FROM {$wpdb->blogs} WHERE site_id = '{$wpdb->siteid}' ";
if ( empty($s) ) {
// Nothing to do.
- } elseif ( preg_match('/^[0-9]+\./', $s) ) {
- // IP address
+ } 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 ) ||
+ preg_match( '/^[0-9]{1,3}\.[0-9]{1,3}\.?$/', $s ) ||
+ preg_match( '/^[0-9]{1,3}\.$/', $s ) ) {
+ // IPv4 address
$reg_blog_ids = $wpdb->get_col( "SELECT blog_id FROM {$wpdb->registration_log} WHERE {$wpdb->registration_log}.IP LIKE ( '{$like_s}$wild' )" );
if ( !$reg_blog_ids )
@@ -64,7 +65,7 @@ class WP_MS_Sites_List_Table extends WP_List_Table {
WHERE site_id = '{$wpdb->siteid}'
AND {$wpdb->blogs}.blog_id IN (" . implode( ', ', $reg_blog_ids ) . ")";
} else {
- if ( is_numeric($s) ) {
+ if ( is_numeric($s) && empty( $wild ) ) {
$query .= " AND ( {$wpdb->blogs}.blog_id = '{$like_s}' )";
} elseif ( is_subdomain_install() ) {
$blog_s = str_replace( '.' . $current_site->domain, '', $like_s );
@@ -72,7 +73,7 @@ class WP_MS_Sites_List_Table extends WP_List_Table {
$query .= " AND ( {$wpdb->blogs}.domain LIKE '$blog_s' ) ";
} else {
if ( $like_s != trim('/', $current_site->path) )
- $blog_s = $current_site->path .= $like_s . $wild . '/';
+ $blog_s = $current_site->path . $like_s . $wild . '/';
else
$blog_s = $like_s;
$query .= " AND ( {$wpdb->blogs}.path LIKE '$blog_s' )";
@@ -101,13 +102,13 @@ class WP_MS_Sites_List_Table extends WP_List_Table {
}
// Don't do an unbounded count on large networks
- if ( ! $large_network )
+ if ( ! wp_is_large_network() )
$total = $wpdb->get_var( str_replace( 'SELECT *', 'SELECT COUNT( blog_id )', $query ) );
$query .= " LIMIT " . intval( ( $pagenum - 1 ) * $per_page ) . ", " . intval( $per_page );
$this->items = $wpdb->get_results( $query, ARRAY_A );
- if ( $large_network )
+ if ( wp_is_large_network() )
$total = count($this->items);
$this->set_pagination_args( array(
@@ -245,22 +246,22 @@ class WP_MS_Sites_List_Table extends WP_List_Table {
$actions['backend'] = "" . __( 'Dashboard' ) . '';
if ( $current_site->blog_id != $blog['blog_id'] ) {
if ( get_blog_status( $blog['blog_id'], 'deleted' ) == '1' )
- $actions['activate'] = '' . __( 'Activate' ) . '';
+ $actions['activate'] = '' . __( 'Activate' ) . '';
else
- $actions['deactivate'] = '' . __( 'Deactivate' ) . '';
+ $actions['deactivate'] = '' . __( 'Deactivate' ) . '';
if ( get_blog_status( $blog['blog_id'], 'archived' ) == '1' )
- $actions['unarchive'] = '' . __( 'Unarchive' ) . '';
+ $actions['unarchive'] = '' . __( 'Unarchive' ) . '';
else
- $actions['archive'] = '' . _x( 'Archive', 'verb; site' ) . '';
+ $actions['archive'] = '' . _x( 'Archive', 'verb; site' ) . '';
if ( get_blog_status( $blog['blog_id'], 'spam' ) == '1' )
- $actions['unspam'] = '' . _x( 'Not Spam', 'site' ) . '';
+ $actions['unspam'] = '' . _x( 'Not Spam', 'site' ) . '';
else
- $actions['spam'] = '' . _x( 'Spam', 'site' ) . '';
+ $actions['spam'] = '' . _x( 'Spam', 'site' ) . '';
if ( current_user_can( 'delete_site', $blog['blog_id'] ) )
- $actions['delete'] = '' . __( 'Delete' ) . '';
+ $actions['delete'] = '' . __( 'Delete' ) . '';
}
$actions['visit'] = "" . __( 'Visit' ) . '';