Sync: avoid conflicts with other plugins using the filter (#39681)

* Sync: avoid conflicts with other plugins using the filter Fixes #39654 * Provide actual plugin data to filter See https://github.com/Automattic/jetpack/pull/39681/files#r1793690662 * Update projects/packages/sync/src/modules/class-callables.php Co-authored-by: Brad Jorsch <[email protected]> --------- Co-authored-by: Brad Jorsch <[email protected]>
Automattic · Oct 25, 2024 · 9957f93 · 9957f93
1 parent 7e0dcdf
commit 9957f93
Show file tree

Hide file tree

Showing 14 changed files with 67 additions and 4 deletions.
diff --git a/projects/packages/sync/changelog/fix-sync-filter-null-array b/projects/packages/sync/changelog/fix-sync-filter-null-array
@@ -0,0 +1,4 @@
+Significance: patch
+Type: fixed
+
+Update plugin action links filter parameter to avoid conflicts with other plugins.
diff --git a/projects/packages/sync/src/modules/class-callables.php b/projects/packages/sync/src/modules/class-callables.php
@@ -383,8 +383,8 @@ public function set_plugin_action_links() {
 		if ( ! empty( $plugins_lock ) && ( isset( $current_screeen->id ) && 'plugins' !== $current_screeen->id ) ) {
 			return;
 		}
-		$plugins = array_keys( Functions::get_plugins() );
-		foreach ( $plugins as $plugin_file ) {
+		$plugins = Functions::get_plugins();
+		foreach ( $plugins as $plugin_file => $plugin_data ) {
 			/**
 			 *  Plugins often like to unset things but things break if they are not able to.
 			 */
@@ -396,13 +396,13 @@ public function set_plugin_action_links() {
 				'edit'       => '',
 			);
 			/** This filter is documented in src/wp-admin/includes/class-wp-plugins-list-table.php */
-			$action_links = apply_filters( 'plugin_action_links', $action_links, $plugin_file, null, 'all' );
+			$action_links = apply_filters( 'plugin_action_links', $action_links, $plugin_file, $plugin_data, 'all' );
 			// Verify $action_links is still an array.
 			if ( ! is_array( $action_links ) ) {
 				$action_links = array();
 			}
 			/** This filter is documented in src/wp-admin/includes/class-wp-plugins-list-table.php */
-			$action_links = apply_filters( "plugin_action_links_{$plugin_file}", $action_links, $plugin_file, null, 'all' );
+			$action_links = apply_filters( "plugin_action_links_{$plugin_file}", $action_links, $plugin_file, $plugin_data, 'all' );
 			// Verify $action_links is still an array to resolve warnings from filters not returning an array.
 			if ( is_array( $action_links ) ) {
 				$action_links = array_filter( $action_links );

diff --git a/projects/plugins/automattic-for-agencies-client/changelog/fix-sync-filter-null-array b/projects/plugins/automattic-for-agencies-client/changelog/fix-sync-filter-null-array
@@ -0,0 +1,5 @@
+Significance: patch
+Type: fixed
+Comment: Sync: update filter parameter to avoid conflicts with other plugins.
+
+
diff --git a/projects/plugins/backup/changelog/fix-sync-filter-null-array b/projects/plugins/backup/changelog/fix-sync-filter-null-array
@@ -0,0 +1,5 @@
+Significance: patch
+Type: fixed
+Comment: Sync: update filter parameter to avoid conflicts with other plugins.
+
+
diff --git a/projects/plugins/boost/changelog/fix-sync-filter-null-array b/projects/plugins/boost/changelog/fix-sync-filter-null-array
@@ -0,0 +1,5 @@
+Significance: patch
+Type: fixed
+Comment: Sync: update filter parameter to avoid conflicts with other plugins.
+
+
diff --git a/projects/plugins/jetpack/changelog/fix-sync-filter-null-array b/projects/plugins/jetpack/changelog/fix-sync-filter-null-array
@@ -0,0 +1,4 @@
+Significance: patch
+Type: compat
+
+Plugin action links filters: update parameter to avoid any conflicts with other plugins.
diff --git a/projects/plugins/migration/changelog/fix-sync-filter-null-array b/projects/plugins/migration/changelog/fix-sync-filter-null-array
@@ -0,0 +1,5 @@
+Significance: patch
+Type: fixed
+Comment: Sync: update filter parameter to avoid conflicts with other plugins.
+
+
diff --git a/projects/plugins/mu-wpcom-plugin/changelog/fix-sync-filter-null-array b/projects/plugins/mu-wpcom-plugin/changelog/fix-sync-filter-null-array
@@ -0,0 +1,5 @@
+Significance: patch
+Type: fixed
+Comment: Sync: update filter parameter to avoid conflicts with other plugins.
+
+
diff --git a/projects/plugins/protect/changelog/fix-sync-filter-null-array b/projects/plugins/protect/changelog/fix-sync-filter-null-array
@@ -0,0 +1,5 @@
+Significance: patch
+Type: fixed
+Comment: Sync: update filter parameter to avoid conflicts with other plugins.
+
+
diff --git a/projects/plugins/search/changelog/fix-sync-filter-null-array b/projects/plugins/search/changelog/fix-sync-filter-null-array
@@ -0,0 +1,5 @@
+Significance: patch
+Type: fixed
+Comment: Sync: update filter parameter to avoid conflicts with other plugins.
+
+
diff --git a/projects/plugins/social/changelog/fix-sync-filter-null-array b/projects/plugins/social/changelog/fix-sync-filter-null-array
@@ -0,0 +1,5 @@
+Significance: patch
+Type: fixed
+Comment: Sync: update filter parameter to avoid conflicts with other plugins.
+
+
diff --git a/projects/plugins/starter-plugin/changelog/fix-sync-filter-null-array b/projects/plugins/starter-plugin/changelog/fix-sync-filter-null-array
@@ -0,0 +1,5 @@
+Significance: patch
+Type: fixed
+Comment: Sync: update filter parameter to avoid conflicts with other plugins.
+
+
diff --git a/projects/plugins/videopress/changelog/fix-sync-filter-null-array b/projects/plugins/videopress/changelog/fix-sync-filter-null-array
@@ -0,0 +1,5 @@
+Significance: patch
+Type: fixed
+Comment: Sync: update filter parameter to avoid conflicts with other plugins.
+
+
diff --git a/projects/plugins/wpcomsh/changelog/fix-sync-filter-null-array b/projects/plugins/wpcomsh/changelog/fix-sync-filter-null-array
@@ -0,0 +1,5 @@
+Significance: patch
+Type: fixed
+Comment: Sync: update filter parameter to avoid conflicts with other plugins.
+
+