[BUGS-6657] Handle explicit WP_ALLOW_MULTISITE false correctly (#23)

pantheon-systems · Aug 30, 2023 · 223ba5c · 223ba5c
1 parent 5ac00de
commit 223ba5c
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 16 deletions.
diff --git a/inc/pantheon-multisite-finalize.php b/inc/pantheon-multisite-finalize.php
@@ -23,7 +23,7 @@ function pantheon_multisite_install_finalize_message() { ?>
 			} else {
 				?>
 					<p><?php esc_html_e( 'You are trying to configure a WordPress Multisite with a wrong upstream!', 'pantheon' ); ?></p>
-					<p><?php echo sprintf( __( 'Make sure that you have the correct upstream configuration for WPMS. If you do not have that capability or check if you are eligible, please <a href="%s">Contact Support</a>.', 'pantheon' ), 'https://pantheon.io/support' ); ?></p>
+					<p><?php echo sprintf( __( 'Make sure that you have the correct upstream configuration for WPMS. If you do not have that capability or to check if you are eligible, please <a href="%s">Contact Support</a>.', 'pantheon' ), 'https://pantheon.io/support' ); ?></p>
 				<?php
 			}
 		}

diff --git a/pantheon.php b/pantheon.php
@@ -16,15 +16,15 @@
 	if ( ! defined( 'DISABLE_PANTHEON_UPDATE_NOTICES' ) || ! DISABLE_PANTHEON_UPDATE_NOTICES ) {
 		require_once 'inc/pantheon-updates.php';
 	}
-	if ( ! defined('RETURN_TO_PANTHEON_BUTTON') || RETURN_TO_PANTHEON_BUTTON ) {
+	if ( ! defined( 'RETURN_TO_PANTHEON_BUTTON' ) || RETURN_TO_PANTHEON_BUTTON ) {
 		require_once 'inc/pantheon-login-form-mods.php';
 	}
 	if ( 'dev' === $_ENV['PANTHEON_ENVIRONMENT'] && function_exists( 'wp_is_writable' ) ) {
 		require_once 'inc/pantheon-plugin-install-notice.php';
 	}
-    if ( defined( 'WP_CLI' ) && WP_CLI ) {
-        require_once 'inc/cli.php';
-    }
+	if ( defined( 'WP_CLI' ) && WP_CLI ) {
+		require_once 'inc/cli.php';
+	}
 	if ( ! defined( 'FS_METHOD' ) ) {
 		/**
 		 * When this constant is not set, WordPress writes and then deletes a
@@ -37,15 +37,16 @@
 		 */
 		define( 'FS_METHOD', 'direct' );
 	}
-    // When developing a WordPress Multisite locally, ensure that this constant is set.
-    // This will set the Multisite variable in all Pantheon environments.
-    if ( getenv( 'FRAMEWORK' ) === 'wordpress_network' && ! defined( 'WP_ALLOW_MULTISITE' ) ) {
-        define( 'WP_ALLOW_MULTISITE', true );
-    }
-    if ( defined( 'MULTISITE' ) && defined( 'WP_ALLOW_MULTISITE' ) && WP_ALLOW_MULTISITE ) {
-	require_once 'inc/pantheon-network-setup.php';
-    }
-    if ( defined( 'WP_ALLOW_MULTISITE' ) && ( ! defined( 'MULTISITE' ) || empty( MULTISITE ) ) ) {
-        require_once 'inc/pantheon-multisite-finalize.php';
-    }
+	// When developing a WordPress Multisite locally, ensure that this constant is set.
+	// This will set the Multisite variable in all Pantheon environments.
+	if ( getenv( 'FRAMEWORK' ) === 'wordpress_network' && ! defined( 'WP_ALLOW_MULTISITE' ) ) {
+		define( 'WP_ALLOW_MULTISITE', true );
+	}
+	if ( defined( 'WP_ALLOW_MULTISITE' ) && WP_ALLOW_MULTISITE ) {
+		if ( defined( 'MULTISITE' ) && MULTISITE ) {
+			require_once 'inc/pantheon-network-setup.php';
+		} else {
+			require_once 'inc/pantheon-multisite-finalize.php';
+		}
+	}
 } // Ensuring that this is on Pantheon.