Changeset 49166 for trunk

Timestamp:

10/15/2020 11:25:19 PM (6 years ago)

Author:

SergeyBiryukov

Message:

Upgrade/Install: Check if plugin or theme update results are available before applying the notification filters.

This avoids a PHP notice for an undefined index of either plugin or theme in the auto_{plugin|theme}_update_send_email filter hook.

Props afragen, audrasjb.
Fixes #51400.

File:

• trunk/src/wp-admin/includes/class-wp-automatic-updater.php (modified) (1 diff)

trunk/src/wp-admin/includes/class-wp-automatic-updater.php

@@ -893 +893 @@
                 $failed_updates     = array();
 
-                /**
-                 * Filters whether to send an email following an automatic background plugin update.
-                 *
-                 * @since 5.5.0
-                 * @since 5.5.1 Added the `$update_results` parameter.
-                 *
-                 * @param bool  $enabled        True if plugin update notifications are enabled, false otherwise.
-                 * @param array $update_results The results of plugins update tasks.
-                 */
-                $notifications_enabled = apply_filters( 'auto_plugin_update_send_email', true, $update_results['plugin'] );
-
-                if ( ! empty( $update_results['plugin'] ) && $notifications_enabled ) {
-                        foreach ( $update_results['plugin'] as $update_result ) {
-                                if ( true === $update_result->result ) {
-                                        $successful_updates['plugin'][] = $update_result;
-                                } else {
-                                        $failed_updates['plugin'][] = $update_result;
-                                }
-                        }
-                }
-
-                /**
-                 * Filters whether to send an email following an automatic background theme update.
-                 *
-                 * @since 5.5.0
-                 * @since 5.5.1 Added the `$update_results` parameter.
-                 *
-                 * @param bool  $enabled        True if theme update notifications are enabled, false otherwise.
-                 * @param array $update_results The results of theme update tasks.
-                 */
-                $notifications_enabled = apply_filters( 'auto_theme_update_send_email', true, $update_results['theme'] );
-
-                if ( ! empty( $update_results['theme'] ) && $notifications_enabled ) {
-                        foreach ( $update_results['theme'] as $update_result ) {
-                                if ( true === $update_result->result ) {
-                                        $successful_updates['theme'][] = $update_result;
-                                } else {
-                                        $failed_updates['theme'][] = $update_result;
+                if ( ! empty( $update_results['plugin'] ) ) {
+                        /**
+                         * Filters whether to send an email following an automatic background plugin update.
+                         *
+                         * @since 5.5.0
+                         * @since 5.5.1 Added the `$update_results` parameter.
+                         *
+                         * @param bool  $enabled        True if plugin update notifications are enabled, false otherwise.
+                         * @param array $update_results The results of plugins update tasks.
+                         */
+                        $notifications_enabled = apply_filters( 'auto_plugin_update_send_email', true, $update_results['plugin'] );
+
+                        if ( $notifications_enabled ) {
+                                foreach ( $update_results['plugin'] as $update_result ) {
+                                        if ( true === $update_result->result ) {
+                                                $successful_updates['plugin'][] = $update_result;
+                                        } else {
+                                                $failed_updates['plugin'][] = $update_result;
+                                        }
+                                }
+                        }
+                }
+
+                if ( ! empty( $update_results['theme'] ) ) {
+                        /**
+                         * Filters whether to send an email following an automatic background theme update.
+                         *
+                         * @since 5.5.0
+                         * @since 5.5.1 Added the `$update_results` parameter.
+                         *
+                         * @param bool  $enabled        True if theme update notifications are enabled, false otherwise.
+                         * @param array $update_results The results of theme update tasks.
+                         */
+                        $notifications_enabled = apply_filters( 'auto_theme_update_send_email', true, $update_results['theme'] );
+
+                        if ( $notifications_enabled ) {
+                                foreach ( $update_results['theme'] as $update_result ) {
+                                        if ( true === $update_result->result ) {
+                                                $successful_updates['theme'][] = $update_result;
+                                        } else {
+                                                $failed_updates['theme'][] = $update_result;
+                                        }
                                 }
                         }