Changeset 17511

Timestamp:

03/08/2011 10:56:43 PM (14 years ago)

Author:

ryan

Message:

Anchor network and user admins at the network domain and path rather than at the main site. Makes the redirects consistent with network_admin_url(). fixes #16652 for 3.1

Location:

branches/3.1/wp-admin

Files:

• network/admin.php (modified) (1 diff)
• user/admin.php (modified) (1 diff)

branches/3.1/wp-admin/network/admin.php

@@ -16 +16 @@
     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;

branches/3.1/wp-admin/user/admin.php

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