Make WordPress Core

Ticket #51609: 51609.diff

File 51609.diff, 1.3 KB (added by peterwilsoncc, 6 years ago)
  • src/wp-admin/includes/class-wp-debug-data.php

    diff --git a/src/wp-admin/includes/class-wp-debug-data.php b/src/wp-admin/includes/class-wp-debug-data.php
    index 0419aa4cdf..1f3ebf8f0b 100644
    a b class WP_Debug_Data { 
    974974                                                'requires_php'  => '',
    975975                                                'compatibility' => new stdClass(),
    976976                                        );
    977                                         $item = array_merge( $item, array_intersect_key( $plugin, $item ) );
     977                                        $item = wp_parse_args( $plugin, $item );
    978978                                }
    979979
    980980                                $auto_update_forced = wp_is_auto_update_forced_for_item( 'plugin', null, (object) $item );
  • src/wp-admin/includes/class-wp-plugins-list-table.php

    diff --git a/src/wp-admin/includes/class-wp-plugins-list-table.php b/src/wp-admin/includes/class-wp-plugins-list-table.php
    index 5a1f682455..9f45f4840d 100644
    a b class WP_Plugins_List_Table extends WP_List_Table { 
    230230                                'compatibility' => new stdClass(),
    231231                        );
    232232
    233                         $filter_payload = (object) array_merge( $filter_payload, array_intersect_key( $plugin_data, $filter_payload ) );
     233                        $filter_payload = (object) wp_parse_args( $plugin_data, $filter_payload );
    234234
    235235                        $auto_update_forced = wp_is_auto_update_forced_for_item( 'plugin', null, $filter_payload );
    236236