Ticket #16652: 16652.diff

wp-admin/network/admin.php

@@ -15 +15 @@
 if ( ! is_multisite() )
         wp_die( __( 'Multisite support is not enabled.' ) );
 
-if ( ! is_main_site() ) {
+if ( ( $current_blog->domain != $current_site->domain ) || ( $current_blog->path != $current_site->path ) ) {
         wp_redirect( network_admin_url() );
         exit;
 }

wp-admin/user/admin.php

@@ -16 +16 @@
         exit;
 }
 
-if ( ! is_main_site() ) {
+if ( ( $current_blog->domain != $current_site->domain ) || ( $current_blog->path != $current_site->path ) ) {
         wp_redirect( user_admin_url() );
         exit;
 }