Ticket #17376: 17376.4.diff

src/wp-includes/ms-settings.php

@@ -119 +119 @@
                 $current_blog->blog_id = $blog_id = 1;
         }
 
+        if ( is_admin() && 0 !== strcasecmp( $current_blog->path, $path ) ) {
+                unset( $current_blog );
+        }
+
         // No site has been found, bail.
         if ( empty( $current_blog ) ) {
                 // We're going to redirect to the network URL, with some possible modifications.
@@ -149 +153 @@
                         if ( '%siteurl%' !== NOBLOGREDIRECT ) {
                                 $destination = NOBLOGREDIRECT;
                         }
+                } elseif ( is_admin() ) {
+                        $destination .= 'wp-admin/';
                 } elseif ( 0 === strcasecmp( $current_site->domain, $domain ) ) {
                         /*
                          * If the domain we were searching for matches the network's domain,