Connection: fix the connected plugins option on multisites (#39355)

Recent optimizations of the connected plugin options update/sync exposed an issue in the original implementation, making the "active connected plugins" option always empty on multisites. Here we fix that problem.
Automattic · Sep 11, 2024 · 11ebad6 · 11ebad6
1 parent 5ee714f
commit 11ebad6
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/projects/packages/connection/changelog/fix-connected-plugins-on-multisites b/projects/packages/connection/changelog/fix-connected-plugins-on-multisites
@@ -0,0 +1,4 @@
+Significance: patch
+Type: fixed
+
+Fix the connected plugins option on multisites.
diff --git a/projects/packages/connection/src/class-plugin-storage.php b/projects/packages/connection/src/class-plugin-storage.php
@@ -144,7 +144,10 @@ private static function ensure_configured() {
 		}
 
 		if ( is_multisite() && get_current_blog_id() !== self::$current_blog_id ) {
-			self::$plugins         = (array) get_option( self::ACTIVE_PLUGINS_OPTION_NAME, array() );
+			if ( self::$current_blog_id ) {
+				// If blog ID got changed, pull the list of active plugins for that blog from the database.
+				self::$plugins = (array) get_option( self::ACTIVE_PLUGINS_OPTION_NAME, array() );
+			}
 			self::$current_blog_id = get_current_blog_id();
 		}