Upstream
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Multisite: Remove redundant `is_multisite()` checks in network admin templates. 

`wp-admin/network/admin.php` is required by all of the individual network templates and begins with an `is_multisite()` check of its own. Because of this, we can remove the 26 other checks in the individual templates.

Props flixos90.
Fixes #37447.

Built from https://develop.svn.wordpress.org/trunk@38657


git-svn-id: http://core.svn.wordpress.org/trunk@38600 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Jeremy Felt 2016-09-27 15:39:29 +00:00
parent 03dd15bf7f
commit 3d19ab1ce2
28 changed files with 4 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
wp-admin/network/about.php
View File

@ -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' );

4
wp-admin/network/admin.php
View File

@ -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 );

3
wp-admin/network/credits.php
View File

@ -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' );

3
wp-admin/network/edit.php
View File

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

3
wp-admin/network/freedoms.php
View File

@ -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' );

3
wp-admin/network/index.php
View File

@ -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 );

3
wp-admin/network/plugin-editor.php
View File

@ -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' );

3
wp-admin/network/plugin-install.php
View File

@ -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' );

3
wp-admin/network/plugins.php
View File

@ -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' );

3
wp-admin/network/profile.php
View File

@ -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' );

3
wp-admin/network/settings.php
View File

@ -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 );

3
wp-admin/network/setup.php
View File

@ -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' );

4
wp-admin/network/site-info.php
View File

@ -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.' ) );
}

3
wp-admin/network/site-new.php
View File

@ -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.' ) );

3
wp-admin/network/site-settings.php
View File

@ -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.' ) );

3
wp-admin/network/site-themes.php
View File

@ -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.' ) );

3
wp-admin/network/site-users.php
View File

@ -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.'));

3
wp-admin/network/sites.php
View File

@ -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 );

3
wp-admin/network/theme-editor.php
View File

@ -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' );

3
wp-admin/network/theme-install.php
View File

@ -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' );

3
wp-admin/network/themes.php
View File

@ -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.' ) );

3
wp-admin/network/update-core.php
View File

@ -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' );

3
wp-admin/network/update.php
View File

@ -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' );

3
wp-admin/network/upgrade.php
View File

@ -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' );

3
wp-admin/network/user-edit.php
View File

@ -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' );

3
wp-admin/network/user-new.php
View File

@ -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.'));

3
wp-admin/network/users.php
View File

@ -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 );

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
*
* @global string $wp_version
*/
$wp_version = '4.7-alpha-38656';
$wp_version = '4.7-alpha-38657';
/**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.