From fc98619638ae4ab50a1a22823232a12ea2281b28 Mon Sep 17 00:00:00 2001
From: Carl Alberto <cgalbert01@gmail.com>
Date: Tue, 9 May 2023 06:58:45 +0800
Subject: [PATCH 1/3] Update pantheon.php to declare WP_ALLOW_MULTISITE before
 loading network config

---
 pantheon.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pantheon.php b/pantheon.php
index c94afed..ca485ac 100644
--- a/pantheon.php
+++ b/pantheon.php
@@ -25,9 +25,6 @@
     if ( defined( 'WP_CLI' ) && WP_CLI ) {
         require_once 'inc/cli.php';
     }
-	if ( defined( 'MULTISITE' ) && defined( 'WP_ALLOW_MULTISITE' ) && WP_ALLOW_MULTISITE ) {
-		require_once 'inc/pantheon-network-setup.php';
-	}
 	if ( ! defined( 'FS_METHOD' ) ) {
 		/**
 		 * When this constant is not set, WordPress writes and then deletes a
@@ -45,6 +42,9 @@
     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';
     }

From c0f85b4b8fcfbe908f48fcd33b0e58e7d92c919a Mon Sep 17 00:00:00 2001
From: Carl Alberto <cgalbert01@gmail.com>
Date: Tue, 9 May 2023 07:08:32 +0800
Subject: [PATCH 2/3] Update initial config to be simplified and works best on
 non live envs

---
 inc/network/includes-network.php | 26 +-------------------------
 1 file changed, 1 insertion(+), 25 deletions(-)

diff --git a/inc/network/includes-network.php b/inc/network/includes-network.php
index 7c06e24..8d3ad3a 100644
--- a/inc/network/includes-network.php
+++ b/inc/network/includes-network.php
@@ -496,33 +496,9 @@ function network_step2( $errors = false ) {
 		</label></p>
 		<textarea id="network-wpconfig-rules" class="code" readonly="readonly" cols="100" rows="31" aria-describedby="network-wpconfig-rules-description">
 <?php ob_start(); ?>
-if ( !empty( $_ENV['PANTHEON_ENVIRONMENT'] )) {
-    $site_name = $_ENV['PANTHEON_SITE_NAME'];
-    // Override $hostname value as needed.
-    switch ( $_ENV['PANTHEON_ENVIRONMENT'] ) {
-        case 'live':
-            $hostname = $_SERVER['HTTP_HOST'];
-            break;
-        case 'test':
-            $hostname = 'test-' . $site_name . '.pantheonsite.io';
-            break;
-        case 'dev':
-            $hostname = 'dev-' . $site_name . '.pantheonsite.io';
-            break;
-        case 'lando':
-            $hostname = $site_name . '.lndo.site';
-            break;
-        default:
-            $hostname = $_ENV['PANTHEON_ENVIRONMENT'] . '-' . $site_name . '.pantheonsite.io';
-            break;
-    }
-} else {
-    // Override with a default hostname.
-    $hostname = '<?php echo $hostname ?>';
-}
 define( 'MULTISITE', true );
 define( 'SUBDOMAIN_INSTALL', <?php echo $subdomain_install ? 'true' : 'false'; ?> );
-define( 'DOMAIN_CURRENT_SITE', $hostname );
+define( 'DOMAIN_CURRENT_SITE', $_SERVER['HTTP_HOST'] );
 define( 'PATH_CURRENT_SITE', '<?php echo $base; ?>' );
 define( 'SITE_ID_CURRENT_SITE', 1 );
 define( 'BLOG_ID_CURRENT_SITE', 1 );

From 5c83f6fe2a31deb71dfe9f26f94923a74fc37a73 Mon Sep 17 00:00:00 2001
From: Carl Alberto <cgalbert01@gmail.com>
Date: Sat, 13 May 2023 00:11:47 +0800
Subject: [PATCH 3/3] Updated config if users are not using Pantheon and Lando

---
 inc/network/includes-network.php | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/inc/network/includes-network.php b/inc/network/includes-network.php
index 8d3ad3a..6cdc71b 100644
--- a/inc/network/includes-network.php
+++ b/inc/network/includes-network.php
@@ -496,9 +496,25 @@ function network_step2( $errors = false ) {
 		</label></p>
 		<textarea id="network-wpconfig-rules" class="code" readonly="readonly" cols="100" rows="31" aria-describedby="network-wpconfig-rules-description">
 <?php ob_start(); ?>
+// Check if running in Pantheon and not via CLI
+if ( !empty( $_ENV['PANTHEON_ENVIRONMENT'] ) && php_sapi_name() != 'cli') {
+    $site_name = $_ENV['PANTHEON_SITE_NAME'];
+    // Override $hostname value as needed.
+    switch ( $_ENV['PANTHEON_ENVIRONMENT'] ) {
+        case 'lando':
+            $hostname = $site_name . '.lndo.site';
+            break;
+        default:
+            $hostname = $_SERVER['HTTP_HOST'];
+            break;
+    }
+} else {
+    // Override here with a default hostname if not using Lando for local development. 
+    $hostname = '<?php echo $hostname ?>';
+}
 define( 'MULTISITE', true );
 define( 'SUBDOMAIN_INSTALL', <?php echo $subdomain_install ? 'true' : 'false'; ?> );
-define( 'DOMAIN_CURRENT_SITE', $_SERVER['HTTP_HOST'] );
+define( 'DOMAIN_CURRENT_SITE', $hostname );
 define( 'PATH_CURRENT_SITE', '<?php echo $base; ?>' );
 define( 'SITE_ID_CURRENT_SITE', 1 );
 define( 'BLOG_ID_CURRENT_SITE', 1 );