Changeset 49477

Timestamp:

11/02/2020 07:11:32 PM (4 years ago)

Author:

desrosj

Message:

Upgrade/Install: Prevent removal of additional data from plugin update info.

This switches to using wp_parse_args() instead of a combination of array_merge() and array_intersect_key() when ensuring that all expected default keys are present in the update information for a plugin.

This prevents non-default data returned by 3rd-party plugins from being unintentionally stripped out.

Props peterwilsoncc, chriscct7.
Fixes #51609.

Location:

trunk/src/wp-admin/includes

Files:

• class-wp-debug-data.php (modified) (1 diff)
• class-wp-plugins-list-table.php (modified) (1 diff)

trunk/src/wp-admin/includes/class-wp-debug-data.php

@@ -975 +975 @@
                         'compatibility' => new stdClass(),
                     );
-                    $item = array_merge( $item, array_intersect_key( $plugin, $item ) );
+                    $item = wp_parse_args( $plugin, $item );
                 }
 

trunk/src/wp-admin/includes/class-wp-plugins-list-table.php

@@ -231 +231 @@
             );
 
-            $filter_payload = (object) array_merge( $filter_payload, array_intersect_key( $plugin_data, $filter_payload ) );
+            $filter_payload = (object) wp_parse_args( $plugin_data, $filter_payload );
 
             $auto_update_forced = wp_is_auto_update_forced_for_item( 'plugin', null, $filter_payload );