From 8efb005a73da0f904e1043477c979902233dec37 Mon Sep 17 00:00:00 2001 From: nacin Date: Thu, 18 Nov 2010 05:29:03 +0000 Subject: [PATCH] Redirect from network.php to network/setup.php. see #15461. git-svn-id: http://svn.automattic.com/wordpress/trunk@16454 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/network.php | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/wp-admin/network.php b/wp-admin/network.php index ba163117d..0655b3d6c 100644 --- a/wp-admin/network.php +++ b/wp-admin/network.php @@ -18,8 +18,14 @@ require_once( './admin.php' ); if ( ! is_super_admin() ) wp_die( __( 'You do not have sufficient permissions to manage options for this site.' ) ); -if ( is_multisite() && ! defined( 'MULTISITE' ) ) - wp_die( __( 'The Network creation panel is not for WordPress MU networks.' ) ); +if ( is_multisite() ) { + if ( ! is_network_admin() ) { + wp_redirect( network_admin_url( 'setup.php' ) ); + exit; + } + if ( ! defined( 'MULTISITE' ) ) + wp_die( __( 'The Network creation panel is not for WordPress MU networks.' ) ); +} // We need to create references to ms global tables to enable Network. foreach ( $wpdb->tables( 'ms_global' ) as $table => $prefixed_table )