From 94b088339ce5d10b29fedc612fa2d2ba560b58c4 Mon Sep 17 00:00:00 2001 From: Sergey Biryukov Date: Tue, 20 Oct 2020 17:44:06 +0000 Subject: [PATCH] Upgrade/Install: Restore casting `$filter_payload` to an object in `WP_MS_Themes_List_Table::prepare_items()`. Follow-up to [48750], [49241]. See #50875. Built from https://develop.svn.wordpress.org/trunk@49243 git-svn-id: http://core.svn.wordpress.org/trunk@49005 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/includes/class-wp-ms-themes-list-table.php | 2 +- wp-includes/version.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/wp-admin/includes/class-wp-ms-themes-list-table.php b/wp-admin/includes/class-wp-ms-themes-list-table.php index b3df81c008..a22fcb80bb 100644 --- a/wp-admin/includes/class-wp-ms-themes-list-table.php +++ b/wp-admin/includes/class-wp-ms-themes-list-table.php @@ -179,7 +179,7 @@ class WP_MS_Themes_List_Table extends WP_List_Table { 'requires_php' => '', ); - $filter_payload = array_merge( $filter_payload, array_intersect_key( $theme_data, $filter_payload ) ); + $filter_payload = (object) array_merge( $filter_payload, array_intersect_key( $theme_data, $filter_payload ) ); $auto_update_forced = wp_is_auto_update_forced_for_item( 'theme', null, $filter_payload ); diff --git a/wp-includes/version.php b/wp-includes/version.php index ff8beb95c0..f19fcdff19 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -13,7 +13,7 @@ * * @global string $wp_version */ -$wp_version = '5.6-alpha-49242'; +$wp_version = '5.6-alpha-49243'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.