diff --git a/src/wp-admin/network/about.php b/src/wp-admin/network/about.php index 4ad541268a..829fa1beef 100644 --- a/src/wp-admin/network/about.php +++ b/src/wp-admin/network/about.php @@ -10,7 +10,4 @@ /** Load WordPress Administration Bootstrap */ require_once( dirname( __FILE__ ) . '/admin.php' ); -if ( ! is_multisite() ) - wp_die( __( 'Multisite support is not enabled.' ) ); - require( ABSPATH . 'wp-admin/about.php' ); diff --git a/src/wp-admin/network/admin.php b/src/wp-admin/network/admin.php index 66b8999843..693fa5aa11 100644 --- a/src/wp-admin/network/admin.php +++ b/src/wp-admin/network/admin.php @@ -12,8 +12,10 @@ define( 'WP_NETWORK_ADMIN', true ); /** Load WordPress Administration Bootstrap */ require_once( dirname( dirname( __FILE__ ) ) . '/admin.php' ); -if ( ! is_multisite() ) +// Do not remove this check. It is required by individual network admin pages. +if ( ! is_multisite() ) { wp_die( __( 'Multisite support is not enabled.' ) ); +} $redirect_network_admin_request = 0 !== strcasecmp( $current_blog->domain, $current_site->domain ) || 0 !== strcasecmp( $current_blog->path, $current_site->path ); diff --git a/src/wp-admin/network/credits.php b/src/wp-admin/network/credits.php index 3d3ae1496b..75ee6e7337 100644 --- a/src/wp-admin/network/credits.php +++ b/src/wp-admin/network/credits.php @@ -10,7 +10,4 @@ /** Load WordPress Administration Bootstrap */ require_once( dirname( __FILE__ ) . '/admin.php' ); -if ( ! is_multisite() ) - wp_die( __( 'Multisite support is not enabled.' ) ); - require( ABSPATH . 'wp-admin/credits.php' ); diff --git a/src/wp-admin/network/edit.php b/src/wp-admin/network/edit.php index a5bb19602e..66f1942624 100644 --- a/src/wp-admin/network/edit.php +++ b/src/wp-admin/network/edit.php @@ -10,9 +10,6 @@ /** Load WordPress Administration Bootstrap */ require_once( dirname( __FILE__ ) . '/admin.php' ); -if ( ! is_multisite() ) - wp_die( __( 'Multisite support is not enabled.' ) ); - if ( empty( $_GET['action'] ) ) { wp_redirect( network_admin_url() ); exit; diff --git a/src/wp-admin/network/freedoms.php b/src/wp-admin/network/freedoms.php index da7f86bd22..9afbe82f34 100644 --- a/src/wp-admin/network/freedoms.php +++ b/src/wp-admin/network/freedoms.php @@ -10,7 +10,4 @@ /** Load WordPress Administration Bootstrap */ require_once( dirname( __FILE__ ) . '/admin.php' ); -if ( ! is_multisite() ) - wp_die( __( 'Multisite support is not enabled.' ) ); - require( ABSPATH . 'wp-admin/freedoms.php' ); diff --git a/src/wp-admin/network/index.php b/src/wp-admin/network/index.php index 796191f018..ab6f6b4708 100644 --- a/src/wp-admin/network/index.php +++ b/src/wp-admin/network/index.php @@ -13,9 +13,6 @@ require_once( dirname( __FILE__ ) . '/admin.php' ); /** Load WordPress dashboard API */ require_once( ABSPATH . 'wp-admin/includes/dashboard.php' ); -if ( !is_multisite() ) - wp_die( __( 'Multisite support is not enabled.' ) ); - if ( ! current_user_can( 'manage_network' ) ) wp_die( __( 'Sorry, you are not allowed to access this page.' ), 403 ); diff --git a/src/wp-admin/network/plugin-editor.php b/src/wp-admin/network/plugin-editor.php index 9af590c45a..7171e7252c 100644 --- a/src/wp-admin/network/plugin-editor.php +++ b/src/wp-admin/network/plugin-editor.php @@ -10,7 +10,4 @@ /** Load WordPress Administration Bootstrap */ require_once( dirname( __FILE__ ) . '/admin.php' ); -if ( ! is_multisite() ) - wp_die( __( 'Multisite support is not enabled.' ) ); - require( ABSPATH . 'wp-admin/plugin-editor.php' ); diff --git a/src/wp-admin/network/plugin-install.php b/src/wp-admin/network/plugin-install.php index a8a1c17297..26b3b0c867 100644 --- a/src/wp-admin/network/plugin-install.php +++ b/src/wp-admin/network/plugin-install.php @@ -13,7 +13,4 @@ if ( isset( $_GET['tab'] ) && ( 'plugin-information' == $_GET['tab'] ) ) /** Load WordPress Administration Bootstrap */ require_once( dirname( __FILE__ ) . '/admin.php' ); -if ( ! is_multisite() ) - wp_die( __( 'Multisite support is not enabled.' ) ); - require( ABSPATH . 'wp-admin/plugin-install.php' ); diff --git a/src/wp-admin/network/plugins.php b/src/wp-admin/network/plugins.php index e997060526..56c3debd01 100644 --- a/src/wp-admin/network/plugins.php +++ b/src/wp-admin/network/plugins.php @@ -10,7 +10,4 @@ /** Load WordPress Administration Bootstrap */ require_once( dirname( __FILE__ ) . '/admin.php' ); -if ( ! is_multisite() ) - wp_die( __( 'Multisite support is not enabled.' ) ); - require( ABSPATH . 'wp-admin/plugins.php' ); diff --git a/src/wp-admin/network/profile.php b/src/wp-admin/network/profile.php index df6b782711..240ef980a4 100644 --- a/src/wp-admin/network/profile.php +++ b/src/wp-admin/network/profile.php @@ -10,7 +10,4 @@ /** Load WordPress Administration Bootstrap */ require_once( dirname( __FILE__ ) . '/admin.php' ); -if ( ! is_multisite() ) - wp_die( __( 'Multisite support is not enabled.' ) ); - require( ABSPATH . 'wp-admin/profile.php' ); diff --git a/src/wp-admin/network/settings.php b/src/wp-admin/network/settings.php index d1af88b1a1..80c6c33382 100644 --- a/src/wp-admin/network/settings.php +++ b/src/wp-admin/network/settings.php @@ -13,9 +13,6 @@ require_once( dirname( __FILE__ ) . '/admin.php' ); /** WordPress Translation Install API */ require_once( ABSPATH . 'wp-admin/includes/translation-install.php' ); -if ( ! is_multisite() ) - wp_die( __( 'Multisite support is not enabled.' ) ); - if ( ! current_user_can( 'manage_network_options' ) ) wp_die( __( 'Sorry, you are not allowed to access this page.' ), 403 ); diff --git a/src/wp-admin/network/setup.php b/src/wp-admin/network/setup.php index 35938990e6..9a642bbb92 100644 --- a/src/wp-admin/network/setup.php +++ b/src/wp-admin/network/setup.php @@ -10,7 +10,4 @@ /** Load WordPress Administration Bootstrap */ require_once( dirname( __FILE__ ) . '/admin.php' ); -if ( ! is_multisite() ) - wp_die( __( 'Multisite support is not enabled.' ) ); - require( ABSPATH . 'wp-admin/network.php' ); diff --git a/src/wp-admin/network/site-info.php b/src/wp-admin/network/site-info.php index ecf425eee8..405e63f2c5 100644 --- a/src/wp-admin/network/site-info.php +++ b/src/wp-admin/network/site-info.php @@ -10,10 +10,6 @@ /** Load WordPress Administration Bootstrap */ require_once( dirname( __FILE__ ) . '/admin.php' ); -if ( ! is_multisite() ) { - wp_die( __( 'Multisite support is not enabled.' ) ); -} - if ( ! current_user_can( 'manage_sites' ) ) { wp_die( __( 'Sorry, you are not allowed to edit this site.' ) ); } diff --git a/src/wp-admin/network/site-new.php b/src/wp-admin/network/site-new.php index 4dd36392d4..a44064caea 100644 --- a/src/wp-admin/network/site-new.php +++ b/src/wp-admin/network/site-new.php @@ -13,9 +13,6 @@ require_once( dirname( __FILE__ ) . '/admin.php' ); /** WordPress Translation Install API */ require_once( ABSPATH . 'wp-admin/includes/translation-install.php' ); -if ( ! is_multisite() ) - wp_die( __( 'Multisite support is not enabled.' ) ); - if ( ! current_user_can( 'manage_sites' ) ) wp_die( __( 'Sorry, you are not allowed to add sites to this network.' ) ); diff --git a/src/wp-admin/network/site-settings.php b/src/wp-admin/network/site-settings.php index 10a64025bc..8e8cd242fe 100644 --- a/src/wp-admin/network/site-settings.php +++ b/src/wp-admin/network/site-settings.php @@ -10,9 +10,6 @@ /** Load WordPress Administration Bootstrap */ require_once( dirname( __FILE__ ) . '/admin.php' ); -if ( ! is_multisite() ) - wp_die( __( 'Multisite support is not enabled.' ) ); - if ( ! current_user_can( 'manage_sites' ) ) wp_die( __( 'Sorry, you are not allowed to edit this site.' ) ); diff --git a/src/wp-admin/network/site-themes.php b/src/wp-admin/network/site-themes.php index 91355c394d..ec2b1d851c 100644 --- a/src/wp-admin/network/site-themes.php +++ b/src/wp-admin/network/site-themes.php @@ -10,9 +10,6 @@ /** Load WordPress Administration Bootstrap */ require_once( dirname( __FILE__ ) . '/admin.php' ); -if ( ! is_multisite() ) - wp_die( __( 'Multisite support is not enabled.' ) ); - if ( ! current_user_can( 'manage_sites' ) ) wp_die( __( 'Sorry, you are not allowed to manage themes for this site.' ) ); diff --git a/src/wp-admin/network/site-users.php b/src/wp-admin/network/site-users.php index 40a17d6053..215fb131fc 100644 --- a/src/wp-admin/network/site-users.php +++ b/src/wp-admin/network/site-users.php @@ -10,9 +10,6 @@ /** Load WordPress Administration Bootstrap */ require_once( dirname( __FILE__ ) . '/admin.php' ); -if ( ! is_multisite() ) - wp_die( __( 'Multisite support is not enabled.' ) ); - if ( ! current_user_can('manage_sites') ) wp_die(__('Sorry, you are not allowed to edit this site.')); diff --git a/src/wp-admin/network/sites.php b/src/wp-admin/network/sites.php index 9b3343c89b..a272229026 100644 --- a/src/wp-admin/network/sites.php +++ b/src/wp-admin/network/sites.php @@ -10,9 +10,6 @@ /** Load WordPress Administration Bootstrap */ require_once( dirname( __FILE__ ) . '/admin.php' ); -if ( ! is_multisite() ) - wp_die( __( 'Multisite support is not enabled.' ) ); - if ( ! current_user_can( 'manage_sites' ) ) wp_die( __( 'Sorry, you are not allowed to access this page.' ), 403 ); diff --git a/src/wp-admin/network/theme-editor.php b/src/wp-admin/network/theme-editor.php index 621c506c26..c28c9675cc 100644 --- a/src/wp-admin/network/theme-editor.php +++ b/src/wp-admin/network/theme-editor.php @@ -10,7 +10,4 @@ /** Load WordPress Administration Bootstrap */ require_once( dirname( __FILE__ ) . '/admin.php' ); -if ( ! is_multisite() ) - wp_die( __( 'Multisite support is not enabled.' ) ); - require( ABSPATH . 'wp-admin/theme-editor.php' ); diff --git a/src/wp-admin/network/theme-install.php b/src/wp-admin/network/theme-install.php index c666eaff1c..4d4ee5ce86 100644 --- a/src/wp-admin/network/theme-install.php +++ b/src/wp-admin/network/theme-install.php @@ -13,7 +13,4 @@ if ( isset( $_GET['tab'] ) && ( 'theme-information' == $_GET['tab'] ) ) /** Load WordPress Administration Bootstrap */ require_once( dirname( __FILE__ ) . '/admin.php' ); -if ( ! is_multisite() ) - wp_die( __( 'Multisite support is not enabled.' ) ); - require( ABSPATH . 'wp-admin/theme-install.php' ); diff --git a/src/wp-admin/network/themes.php b/src/wp-admin/network/themes.php index 40530ba2bd..68b7c77ed3 100644 --- a/src/wp-admin/network/themes.php +++ b/src/wp-admin/network/themes.php @@ -10,9 +10,6 @@ /** Load WordPress Administration Bootstrap */ require_once( dirname( __FILE__ ) . '/admin.php' ); -if ( ! is_multisite() ) - wp_die( __( 'Multisite support is not enabled.' ) ); - if ( !current_user_can('manage_network_themes') ) wp_die( __( 'Sorry, you are not allowed to manage network themes.' ) ); diff --git a/src/wp-admin/network/update-core.php b/src/wp-admin/network/update-core.php index 3d2825a958..55f2aca32a 100644 --- a/src/wp-admin/network/update-core.php +++ b/src/wp-admin/network/update-core.php @@ -10,7 +10,4 @@ /** Load WordPress Administration Bootstrap */ require_once( dirname( __FILE__ ) . '/admin.php' ); -if ( ! is_multisite() ) - wp_die( __( 'Multisite support is not enabled.' ) ); - require( ABSPATH . 'wp-admin/update-core.php' ); diff --git a/src/wp-admin/network/update.php b/src/wp-admin/network/update.php index c90098b25b..db63968d10 100644 --- a/src/wp-admin/network/update.php +++ b/src/wp-admin/network/update.php @@ -13,7 +13,4 @@ if ( isset( $_GET['action'] ) && in_array( $_GET['action'], array( 'update-selec /** Load WordPress Administration Bootstrap */ require_once( dirname( __FILE__ ) . '/admin.php' ); -if ( ! is_multisite() ) - wp_die( __( 'Multisite support is not enabled.' ) ); - require( ABSPATH . 'wp-admin/update.php' ); diff --git a/src/wp-admin/network/upgrade.php b/src/wp-admin/network/upgrade.php index ee8fd57545..f184a8c3e6 100644 --- a/src/wp-admin/network/upgrade.php +++ b/src/wp-admin/network/upgrade.php @@ -10,9 +10,6 @@ /** Load WordPress Administration Bootstrap */ require_once( dirname( __FILE__ ) . '/admin.php' ); -if ( ! is_multisite() ) - wp_die( __( 'Multisite support is not enabled.' ) ); - require_once( ABSPATH . WPINC . '/http.php' ); $title = __( 'Upgrade Network' ); diff --git a/src/wp-admin/network/user-edit.php b/src/wp-admin/network/user-edit.php index effaaf8a0e..ef3c2720f1 100644 --- a/src/wp-admin/network/user-edit.php +++ b/src/wp-admin/network/user-edit.php @@ -10,7 +10,4 @@ /** Load WordPress Administration Bootstrap */ require_once( dirname( __FILE__ ) . '/admin.php' ); -if ( ! is_multisite() ) - wp_die( __( 'Multisite support is not enabled.' ) ); - require( ABSPATH . 'wp-admin/user-edit.php' ); diff --git a/src/wp-admin/network/user-new.php b/src/wp-admin/network/user-new.php index fae3fcb003..1dc6083dc9 100644 --- a/src/wp-admin/network/user-new.php +++ b/src/wp-admin/network/user-new.php @@ -10,9 +10,6 @@ /** Load WordPress Administration Bootstrap */ require_once( dirname( __FILE__ ) . '/admin.php' ); -if ( ! is_multisite() ) - wp_die( __( 'Multisite support is not enabled.' ) ); - if ( ! current_user_can('create_users') ) wp_die(__('Sorry, you are not allowed to add users to this network.')); diff --git a/src/wp-admin/network/users.php b/src/wp-admin/network/users.php index 437f76538c..0d74664a2b 100644 --- a/src/wp-admin/network/users.php +++ b/src/wp-admin/network/users.php @@ -10,9 +10,6 @@ /** Load WordPress Administration Bootstrap */ require_once( dirname( __FILE__ ) . '/admin.php' ); -if ( ! is_multisite() ) - wp_die( __( 'Multisite support is not enabled.' ) ); - if ( ! current_user_can( 'manage_network_users' ) ) wp_die( __( 'Sorry, you are not allowed to access this page.' ), 403 );