Changeset 48747 for branches/5.5

Timestamp:

08/07/2020 01:49:47 PM (6 years ago)

Author:

desrosj

Message:

Site Health: Consistently pass an object to the auto_update_{$type} filter in Site Health debug data.

Previously, some instances of the filter received an array from a plugin or theme update response, potentially triggering PHP notices.

Merges [48745] to the 5.5 branch.
Reviewed by desrosj, SergeyBiryukov.
Props bpayton, pbiron.
Fixes #50852.

Location:

branches/5.5

Files:

• . (modified) (1 prop)
• src/wp-admin/includes/class-wp-debug-data.php (modified) (7 diffs)

branches/5.5/src/wp-admin/includes/class-wp-debug-data.php

@@ -969 +969 @@
                                                 'compatibility' => new stdClass(),
                                         );
-                                        $item = (object) array_merge( $item, array_intersect_key( $plugin, $item ) );
+                                        $item = array_merge( $item, array_intersect_key( $plugin, $item ) );
                                 }
 
                                 /** This action is documented in wp-admin/includes/class-wp-automatic-updater.php */
-                                $auto_update_forced = apply_filters( 'auto_update_plugin', null, $item );
+                                $auto_update_forced = apply_filters( 'auto_update_plugin', null, (object) $item );
 
                                 if ( ! is_null( $auto_update_forced ) ) {
@@ -1105 +1105 @@
                                 $item = $transient->no_update[ $active_theme->stylesheet ];
                         } else {
-                                $item = (object) array(
+                                $item = array(
                                         'theme'        => $active_theme->stylesheet,
                                         'new_version'  => $active_theme->version,
@@ -1116 +1116 @@
 
                         /** This action is documented in wp-admin/includes/class-wp-automatic-updater.php */
-                        $auto_update_forced = apply_filters( 'auto_update_theme', null, $item );
+                        $auto_update_forced = apply_filters( 'auto_update_theme', null, (object) $item );
 
                         if ( ! is_null( $auto_update_forced ) ) {
@@ -1192 +1192 @@
                                         $item = $transient->no_update[ $parent_theme->stylesheet ];
                                 } else {
-                                        $item = (object) array(
+                                        $item = array(
                                                 'theme'        => $parent_theme->stylesheet,
                                                 'new_version'  => $parent_theme->version,
@@ -1203 +1203 @@
 
                                 /** This action is documented in wp-admin/includes/class-wp-automatic-updater.php */
-                                $auto_update_forced = apply_filters( 'auto_update_theme', null, $item );
+                                $auto_update_forced = apply_filters( 'auto_update_theme', null, (object) $item );
 
                                 if ( ! is_null( $auto_update_forced ) ) {
@@ -1281 +1281 @@
                                         $item = $transient->no_update[ $theme_slug ];
                                 } else {
-                                        $item = (object) array(
+                                        $item = array(
                                                 'theme'        => $theme_slug,
                                                 'new_version'  => $theme->version,
@@ -1292 +1292 @@
 
                                 /** This action is documented in wp-admin/includes/class-wp-automatic-updater.php */
-                                $auto_update_forced = apply_filters( 'auto_update_theme', null, $item );
+                                $auto_update_forced = apply_filters( 'auto_update_theme', null, (object) $item );
 
                                 if ( ! is_null( $auto_update_forced ) ) {