Make WordPress Core

Changeset 38657


Ignore:
Timestamp:
09/27/2016 03:38:47 PM (8 years ago)
Author:
jeremyfelt
Message:

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.

Location:
trunk/src/wp-admin/network
Files:
27 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/wp-admin/network/about.php

    r25616 r38657  
    1111require_once( dirname( __FILE__ ) . '/admin.php' );
    1212
    13 if ( ! is_multisite() )
    14     wp_die( __( 'Multisite support is not enabled.' ) );
    15 
    1613require( ABSPATH . 'wp-admin/about.php' );
  • trunk/src/wp-admin/network/admin.php

    r37488 r38657  
    1313require_once( dirname( dirname( __FILE__ ) ) . '/admin.php' );
    1414
    15 if ( ! is_multisite() )
     15// Do not remove this check. It is required by individual network admin pages.
     16if ( ! is_multisite() ) {
    1617    wp_die( __( 'Multisite support is not enabled.' ) );
     18}
    1719
    1820$redirect_network_admin_request = 0 !== strcasecmp( $current_blog->domain, $current_site->domain ) || 0 !== strcasecmp( $current_blog->path, $current_site->path );
  • trunk/src/wp-admin/network/credits.php

    r25616 r38657  
    1111require_once( dirname( __FILE__ ) . '/admin.php' );
    1212
    13 if ( ! is_multisite() )
    14     wp_die( __( 'Multisite support is not enabled.' ) );
    15 
    1613require( ABSPATH . 'wp-admin/credits.php' );
  • trunk/src/wp-admin/network/edit.php

    r30647 r38657  
    1010/** Load WordPress Administration Bootstrap */
    1111require_once( dirname( __FILE__ ) . '/admin.php' );
    12 
    13 if ( ! is_multisite() )
    14     wp_die( __( 'Multisite support is not enabled.' ) );
    1512
    1613if ( empty( $_GET['action'] ) ) {
  • trunk/src/wp-admin/network/freedoms.php

    r25616 r38657  
    1111require_once( dirname( __FILE__ ) . '/admin.php' );
    1212
    13 if ( ! is_multisite() )
    14     wp_die( __( 'Multisite support is not enabled.' ) );
    15 
    1613require( ABSPATH . 'wp-admin/freedoms.php' );
  • trunk/src/wp-admin/network/index.php

    r37914 r38657  
    1313/** Load WordPress dashboard API */
    1414require_once( ABSPATH . 'wp-admin/includes/dashboard.php' );
    15 
    16 if ( !is_multisite() )
    17     wp_die( __( 'Multisite support is not enabled.' ) );
    1815
    1916if ( ! current_user_can( 'manage_network' ) )
  • trunk/src/wp-admin/network/plugin-editor.php

    r25616 r38657  
    1111require_once( dirname( __FILE__ ) . '/admin.php' );
    1212
    13 if ( ! is_multisite() )
    14     wp_die( __( 'Multisite support is not enabled.' ) );
    15 
    1613require( ABSPATH . 'wp-admin/plugin-editor.php' );
  • trunk/src/wp-admin/network/plugin-install.php

    r25616 r38657  
    1414require_once( dirname( __FILE__ ) . '/admin.php' );
    1515
    16 if ( ! is_multisite() )
    17     wp_die( __( 'Multisite support is not enabled.' ) );
    18 
    1916require( ABSPATH . 'wp-admin/plugin-install.php' );
  • trunk/src/wp-admin/network/plugins.php

    r25616 r38657  
    1111require_once( dirname( __FILE__ ) . '/admin.php' );
    1212
    13 if ( ! is_multisite() )
    14     wp_die( __( 'Multisite support is not enabled.' ) );
    15 
    1613require( ABSPATH . 'wp-admin/plugins.php' );
  • trunk/src/wp-admin/network/profile.php

    r25616 r38657  
    1111require_once( dirname( __FILE__ ) . '/admin.php' );
    1212
    13 if ( ! is_multisite() )
    14     wp_die( __( 'Multisite support is not enabled.' ) );
    15 
    1613require( ABSPATH . 'wp-admin/profile.php' );
  • trunk/src/wp-admin/network/settings.php

    r38322 r38657  
    1313/** WordPress Translation Install API */
    1414require_once( ABSPATH . 'wp-admin/includes/translation-install.php' );
    15 
    16 if ( ! is_multisite() )
    17     wp_die( __( 'Multisite support is not enabled.' ) );
    1815
    1916if ( ! current_user_can( 'manage_network_options' ) )
  • trunk/src/wp-admin/network/setup.php

    r25616 r38657  
    1111require_once( dirname( __FILE__ ) . '/admin.php' );
    1212
    13 if ( ! is_multisite() )
    14     wp_die( __( 'Multisite support is not enabled.' ) );
    15 
    1613require( ABSPATH . 'wp-admin/network.php' );
  • trunk/src/wp-admin/network/site-info.php

    r38320 r38657  
    1010/** Load WordPress Administration Bootstrap */
    1111require_once( dirname( __FILE__ ) . '/admin.php' );
    12 
    13 if ( ! is_multisite() ) {
    14     wp_die( __( 'Multisite support is not enabled.' ) );
    15 }
    1612
    1713if ( ! current_user_can( 'manage_sites' ) ) {
  • trunk/src/wp-admin/network/site-new.php

    r38655 r38657  
    1313/** WordPress Translation Install API */
    1414require_once( ABSPATH . 'wp-admin/includes/translation-install.php' );
    15 
    16 if ( ! is_multisite() )
    17     wp_die( __( 'Multisite support is not enabled.' ) );
    1815
    1916if ( ! current_user_can( 'manage_sites' ) )
  • trunk/src/wp-admin/network/site-settings.php

    r38320 r38657  
    1010/** Load WordPress Administration Bootstrap */
    1111require_once( dirname( __FILE__ ) . '/admin.php' );
    12 
    13 if ( ! is_multisite() )
    14     wp_die( __( 'Multisite support is not enabled.' ) );
    1512
    1613if ( ! current_user_can( 'manage_sites' ) )
  • trunk/src/wp-admin/network/site-themes.php

    r38647 r38657  
    1010/** Load WordPress Administration Bootstrap */
    1111require_once( dirname( __FILE__ ) . '/admin.php' );
    12 
    13 if ( ! is_multisite() )
    14     wp_die( __( 'Multisite support is not enabled.' ) );
    1512
    1613if ( ! current_user_can( 'manage_sites' ) )
  • trunk/src/wp-admin/network/site-users.php

    r38656 r38657  
    1010/** Load WordPress Administration Bootstrap */
    1111require_once( dirname( __FILE__ ) . '/admin.php' );
    12 
    13 if ( ! is_multisite() )
    14     wp_die( __( 'Multisite support is not enabled.' ) );
    1512
    1613if ( ! current_user_can('manage_sites') )
  • trunk/src/wp-admin/network/sites.php

    r38647 r38657  
    1010/** Load WordPress Administration Bootstrap */
    1111require_once( dirname( __FILE__ ) . '/admin.php' );
    12 
    13 if ( ! is_multisite() )
    14     wp_die( __( 'Multisite support is not enabled.' ) );
    1512
    1613if ( ! current_user_can( 'manage_sites' ) )
  • trunk/src/wp-admin/network/theme-editor.php

    r25616 r38657  
    1111require_once( dirname( __FILE__ ) . '/admin.php' );
    1212
    13 if ( ! is_multisite() )
    14     wp_die( __( 'Multisite support is not enabled.' ) );
    15 
    1613require( ABSPATH . 'wp-admin/theme-editor.php' );
  • trunk/src/wp-admin/network/theme-install.php

    r25616 r38657  
    1414require_once( dirname( __FILE__ ) . '/admin.php' );
    1515
    16 if ( ! is_multisite() )
    17     wp_die( __( 'Multisite support is not enabled.' ) );
    18 
    1916require( ABSPATH . 'wp-admin/theme-install.php' );
  • trunk/src/wp-admin/network/themes.php

    r38647 r38657  
    1010/** Load WordPress Administration Bootstrap */
    1111require_once( dirname( __FILE__ ) . '/admin.php' );
    12 
    13 if ( ! is_multisite() )
    14     wp_die( __( 'Multisite support is not enabled.' ) );
    1512
    1613if ( !current_user_can('manage_network_themes') )
  • trunk/src/wp-admin/network/update-core.php

    r25616 r38657  
    1111require_once( dirname( __FILE__ ) . '/admin.php' );
    1212
    13 if ( ! is_multisite() )
    14     wp_die( __( 'Multisite support is not enabled.' ) );
    15 
    1613require( ABSPATH . 'wp-admin/update-core.php' );
  • trunk/src/wp-admin/network/update.php

    r25616 r38657  
    1414require_once( dirname( __FILE__ ) . '/admin.php' );
    1515
    16 if ( ! is_multisite() )
    17     wp_die( __( 'Multisite support is not enabled.' ) );
    18 
    1916require( ABSPATH . 'wp-admin/update.php' );
  • trunk/src/wp-admin/network/upgrade.php

    r38229 r38657  
    1010/** Load WordPress Administration Bootstrap */
    1111require_once( dirname( __FILE__ ) . '/admin.php' );
    12 
    13 if ( ! is_multisite() )
    14     wp_die( __( 'Multisite support is not enabled.' ) );
    1512
    1613require_once( ABSPATH . WPINC . '/http.php' );
  • trunk/src/wp-admin/network/user-edit.php

    r25616 r38657  
    1111require_once( dirname( __FILE__ ) . '/admin.php' );
    1212
    13 if ( ! is_multisite() )
    14     wp_die( __( 'Multisite support is not enabled.' ) );
    15 
    1613require( ABSPATH . 'wp-admin/user-edit.php' );
  • trunk/src/wp-admin/network/user-new.php

    r37914 r38657  
    1010/** Load WordPress Administration Bootstrap */
    1111require_once( dirname( __FILE__ ) . '/admin.php' );
    12 
    13 if ( ! is_multisite() )
    14     wp_die( __( 'Multisite support is not enabled.' ) );
    1512
    1613if ( ! current_user_can('create_users') )
  • trunk/src/wp-admin/network/users.php

    r38647 r38657  
    1010/** Load WordPress Administration Bootstrap */
    1111require_once( dirname( __FILE__ ) . '/admin.php' );
    12 
    13 if ( ! is_multisite() )
    14     wp_die( __( 'Multisite support is not enabled.' ) );
    1512
    1613if ( ! current_user_can( 'manage_network_users' ) )
Note: See TracChangeset for help on using the changeset viewer.