Ticket #21837: 21837.2.diff

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

@@ -115 +115 @@
                 } else {
                         if ( is_numeric($s) && empty( $wild ) ) {
                                 $query .= $wpdb->prepare( " AND ( {$wpdb->blogs}.blog_id = %s )", $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 );
                         } else {
-                                if ( $s != trim('/', $current_site->path) ) {
-                                        $blog_s = $wpdb->esc_like( $current_site->path . $s ) . $wild . $wpdb->esc_like( '/' );
+                                if ( '%' === $wild ) {
+                                        $blog_s = str_replace( '.' . $current_site->domain, '', $s );
+                                        $blog_s = $wild . $wpdb->esc_like( $blog_s ) . $wild;
+                                        $query .= $wpdb->prepare( " AND ( {$wpdb->blogs}.domain LIKE %s ) OR ( {$wpdb->blogs}.path LIKE %s )", $blog_s, $blog_s );
                                 } else {
-                                        $blog_s = $wpdb->esc_like( $s );
+                                        $has_dot   = false !== strpos( $s, '.' );
+                                        $has_slash = false !== strpos( $s, '/' );
+
+                                        // Searching domain & path
+                                        if ( $has_dot && $has_slash ) {
+                                                $pos    = strpos( $s, '/' );
+                                                $domain = substr( $s, 0, $pos );
+                                                $path   = substr( $s, $pos, strlen( $s ) );
+                                                $query .= $wpdb->prepare( " AND ( {$wpdb->blogs}.domain LIKE %s ) AND ( {$wpdb->blogs}.path LIKE %s )", $domain, $path );
+
+                                        // Searching paths
+                                        } elseif ( $has_slash ) {
+                                                $blog_s = $wild . $wpdb->esc_like( $s ) . $wild;
+                                                $query .= $wpdb->prepare( " AND ( {$wpdb->blogs}.path LIKE %s )", $blog_s );
+
+                                        // Searching domains
+                                        } elseif ( $has_dot ) {
+                                                $blog_s = $wild . $wpdb->esc_like( $s ) . $wild;
+                                                $query .= $wpdb->prepare( " AND ( {$wpdb->blogs}.domain LIKE %s )", $blog_s );
+                                        }
                                 }
-                                $query .= $wpdb->prepare( " AND  ( {$wpdb->blogs}.path LIKE %s )", $blog_s );
                         }
                 }