Fix wp core update-db --network to respect network ID in multinetwork installations (#302)

Co-authored-by: swissspidy <841956+swissspidy@users.noreply.github.com>
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: Pascal Birchler <pascalb@google.com>

Author: 3 people

features/core-update-db.feature

@@ -151,6 +151,54 @@ Feature: Update core's database
       {UPDATE_VERSION}
       """
 
+  # This test downgrades to an older WordPress version, but the SQLite plugin requires 6.0+
+  @require-mysql
+  Scenario: Update db only updates sites from the current network in multinetwork setup
+    Given a WP multisite install
+    And a disable_sidebar_check.php file:
+      """
+      <?php
+      WP_CLI::add_wp_hook( 'init', static function () {
+        remove_action( 'after_switch_theme', '_wp_sidebars_changed' );
+      } );
+      """
+    And I try `wp theme install twentytwenty --activate`
+    And I run `wp core download --version=5.4 --force`
+    And I run `wp option update db_version 45805 --require=disable_sidebar_check.php`
+    And I run `wp site option update wpmu_upgrade_site 45805`
+    # Create 2 additional sites in network 1 (main site already exists; 3 total in network 1)
+    And I run `wp site create --slug=net1-site1`
+    And I run `wp site create --slug=net1-site2`
+    # Create 2 sites that will be moved to a second network (5 sites total)
+    And I run `wp site create --slug=net2-site1 --porcelain`
+    And save STDOUT as {NET2_SITE1_ID}
+    And I run `wp site create --slug=net2-site2 --porcelain`
+    And save STDOUT as {NET2_SITE2_ID}
+    # Register a second network (ID=2) and reassign those two blogs to it
+    And I run `wp eval 'global $wpdb; $wpdb->insert( $wpdb->site, [ "domain" => "example.com", "path" => "/network2/" ] );'`
+    And I run `wp eval 'global $wpdb; $wpdb->update( $wpdb->blogs, [ "site_id" => 2 ], [ "blog_id" => {NET2_SITE1_ID} ] ); $wpdb->update( $wpdb->blogs, [ "site_id" => 2 ], [ "blog_id" => {NET2_SITE2_ID} ] );'`
+
+    When I run `wp site option get wpmu_upgrade_site`
+    Then save STDOUT as {UPDATE_VERSION}
+
+    # Only the 3 network-1 sites should be processed (not all 5 active sites).
+    # If the site_id filter were absent, the count would be 5/5 and net2 URLs would appear.
+    When I run `wp core update-db --network`
+    Then STDOUT should contain:
+      """
+      Success: WordPress database upgraded on 3/3 sites.
+      """
+    And STDOUT should not contain:
+      """
+      net2-site1
+      """
+
+    When I run `wp site option get wpmu_upgrade_site`
+    Then STDOUT should not contain:
+      """
+      {UPDATE_VERSION}
+      """
+
   Scenario: Ensure update-db sets WP_INSTALLING constant
     Given a WP install
     And a before.php file:

src/Core_Command.php

@@ -1522,6 +1522,11 @@ public function check_update_db( $args, $assoc_args ) {
 	 *     WordPress database upgraded successfully from db version 35700 to 29630 on example.com/
 	 *     Success: WordPress database upgraded on 123/123 sites.
 	 *
+	 *     # Update databases for all sites on a specific network in a multinetwork install.
+	 *     $ wp core update-db --network --url=network2.example.com
+	 *     WordPress database upgraded successfully from db version 35700 to 29630 on network2.example.com/
+	 *     Success: WordPress database upgraded on 50/50 sites.
+	 *
 	 * @subcommand update-db
 	 *
 	 * @param string[] $args Positional arguments. Unused.
@@ -1541,9 +1546,22 @@ public function update_db( $args, $assoc_args ) {
 		}
 
 		if ( $network ) {
+			// Determine the network ID to update.
+			// get_current_network_id() (available since WP 4.9) reflects the network
+			// determined from the --url context, enabling per-network updates in
+			// multinetwork setups. Fall back to SITE_ID_CURRENT_SITE for older WordPress.
+			if ( function_exists( 'get_current_network_id' ) ) {
+				$network_id = get_current_network_id();
+			} elseif ( defined( 'SITE_ID_CURRENT_SITE' ) ) {
+				$network_id = (int) SITE_ID_CURRENT_SITE;
+			} else {
+				$network_id = 1;
+			}
+
 			$iterator_args = [
 				'table' => $wpdb->blogs,
 				'where' => [
+					'site_id'  => $network_id,
 					'spam'     => 0,
 					'deleted'  => 0,
 					'archived' => 0,
@@ -1552,16 +1570,14 @@ public function update_db( $args, $assoc_args ) {
 			$it            = new TableIterator( $iterator_args );
 			$success       = 0;
 			$total         = 0;
-			$site_ids      = [];
 
 			/**
 			 * @var object{site_id: int, domain: string, path: string} $blog
 			 */
 			foreach ( $it as $blog ) {
 				++$total;
-				$site_ids[] = $blog->site_id;
-				$url        = $blog->domain . $blog->path;
-				$cmd        = "--url={$url} core update-db";
+				$url = $blog->domain . $blog->path;
+				$cmd = "--url={$url} core update-db";
 				if ( $dry_run ) {
 					$cmd .= ' --dry-run';
 				}
@@ -1591,9 +1607,7 @@ public function update_db( $args, $assoc_args ) {
 				}
 			}
 			if ( ! $dry_run && $total && $success === $total ) {
-				foreach ( array_unique( $site_ids ) as $site_id ) {
-					update_metadata( 'site', $site_id, 'wpmu_upgrade_site', $wp_db_version );
-				}
+				update_metadata( 'site', $network_id, 'wpmu_upgrade_site', $wp_db_version );
 			}
 			WP_CLI::success( "WordPress database upgraded on {$success}/{$total} sites." );
 		} else {