Ticket #17376: 17376.3.diff

src/wp-includes/ms-load.php

@@ -348 +348 @@
         // If persistent caching is enabled, we could query the DB for a path <> '/'
         // then cache whether we can just always ignore paths.
 
-        if ( count( $paths ) > 1 ) {
+        // Look for all possible paths unless wp-admin is part of the request. At that
+        // point, an exact match should be made from the first path segment tested.
+        if ( count( $paths ) > 1  && ! is_admin() ) {
                 $paths = "'" . implode( "', '", $wpdb->_escape( $paths ) ) . "'";
                 $sql = $wpdb->prepare( "SELECT * FROM $wpdb->blogs WHERE domain = %s", $domain );
                 $sql .= " AND path IN ($paths) ORDER BY CHAR_LENGTH(path) DESC LIMIT 1";

src/wp-includes/ms-settings.php

@@ -153 +153 @@
                         if ( 0 !== strcasecmp( $current_site->domain, $domain ) ) {
                                 header( 'Location: http://' . $current_site->domain . $current_site->path );
                                 exit;
+                        } elseif ( is_admin() ) {
+                                header( 'Location: http://' . $current_site->domain . $current_site->path . '/wp-admin' );
+                                exit;
                         }
                         ms_not_installed();
                 }