Ticket #60792: multisite_flag2.patch

src/wp-admin/menu.php

@@ -380 +380 @@
 if ( is_multisite() && ! is_main_site() ) {
         $submenu['tools.php'][35] = array( __( 'Delete Site' ), 'delete_site', 'ms-delete-site.php' );
 }
-if ( ! is_multisite() && defined( 'WP_ALLOW_MULTISITE' ) && WP_ALLOW_MULTISITE ) {
+if ( ! is_multisite() && ( ! defined( 'WP_ALLOW_MULTISITE' ) || WP_ALLOW_MULTISITE ) ) {
         $submenu['tools.php'][50] = array( __( 'Network Setup' ), 'setup_network', 'network.php' );
 }
 

src/wp-admin/network.php

@@ -26 +26 @@
         }
 
         if ( ! defined( 'MULTISITE' ) ) {
-                wp_die( __( 'The Network creation panel is not for WordPress MU networks.' ) );
+                wp_die( __( 'The Network creation panel is not for WordPress Multisite networks.' ) );
         }
 }
 
@@ -37 +37 @@
         $wpdb->$table = $prefixed_table;
 }
 
-if ( ! network_domain_check() && ( ! defined( 'WP_ALLOW_MULTISITE' ) || ! WP_ALLOW_MULTISITE ) ) {
+if ( ! network_domain_check() && ( defined( 'WP_ALLOW_MULTISITE' ) && ! WP_ALLOW_MULTISITE ) ) {
         wp_die(
                 printf(
                         /* translators: 1: WP_ALLOW_MULTISITE, 2: wp-config.php */

src/wp-admin/network/menu.php

@@ -107 +107 @@
 $submenu['plugins.php'][15] = array( __( 'Plugin File Editor' ), 'edit_plugins', 'plugin-editor.php' );
 
 $menu[25] = array( __( 'Settings' ), 'manage_network_options', 'settings.php', '', 'menu-top menu-icon-settings', 'menu-settings', 'dashicons-admin-settings' );
-if ( defined( 'MULTISITE' ) && defined( 'WP_ALLOW_MULTISITE' ) && WP_ALLOW_MULTISITE ) {
+if ( defined( 'MULTISITE' ) ) {
         $submenu['settings.php'][5]  = array( __( 'Network Settings' ), 'manage_network_options', 'settings.php' );
         $submenu['settings.php'][10] = array( __( 'Network Setup' ), 'setup_network', 'setup.php' );
 }