From 4dcfeabff197bc6d7f1cde5ce0a4f34fe1c322ea Mon Sep 17 00:00:00 2001 From: Ryan Boren Date: Fri, 15 Jul 2011 15:42:26 +0000 Subject: [PATCH] Sites search improvements. fixes #18013 git-svn-id: https://develop.svn.wordpress.org/trunk@18442 602fd350-edb4-49c9-b593-d223f7449a82 --- wp-admin/includes/class-wp-ms-sites-list-table.php | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) 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 baefc8276f..0e0d25be9a 100644 --- a/wp-admin/includes/class-wp-ms-sites-list-table.php +++ b/wp-admin/includes/class-wp-ms-sites-list-table.php @@ -52,8 +52,11 @@ class WP_MS_Sites_List_Table extends WP_List_Table { 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 +67,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 );