WordPress 3.6.1-scripts

[autoinstalls/wordpress.git] / wp-admin / network / admin.php

diff --git a/wp-admin/network/admin.php b/wp-admin/network/admin.php
index d4374de09e7a29ede246f028c8882c74d14ae540..01e6ea70c987e75390d28ad671bf6bcc4ad9d661 100644 (file)
--- a/wp-admin/network/admin.php
+++ b/wp-admin/network/admin.php
@@ -7,7 +7,7 @@
  * @since 3.1.0
  */
 
-define( 'WP_NETWORK_ADMIN', TRUE );
+define( 'WP_NETWORK_ADMIN', true );
 
 /** Load WordPress Administration Bootstrap */
 require_once( dirname( dirname( __FILE__ ) ) . '/admin.php' );
@@ -15,8 +15,10 @@ require_once( dirname( dirname( __FILE__ ) ) . '/admin.php' );
 if ( ! is_multisite() )
        wp_die( __( 'Multisite support is not enabled.' ) );
 
-if ( ! is_main_site() ) {
+$redirect_network_admin_request = ( ( $current_blog->domain != $current_site->domain ) || ( $current_blog->path != $current_site->path ) );
+$redirect_network_admin_request = apply_filters( 'redirect_network_admin_request', $redirect_network_admin_request );
+if ( $redirect_network_admin_request ) {
        wp_redirect( network_admin_url() );
        exit;
 }
-?>
+unset( $redirect_network_admin_request );