WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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.
Built from https://develop.svn.wordpress.org/trunk@49166


git-svn-id: http://core.svn.wordpress.org/trunk@48928 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Sergey Biryukov 2020-10-15 23:27:03 +00:00
parent 3c1961faa1
commit df51aa9b6f
2 changed files with 37 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
wp-admin/includes/class-wp-automatic-updater.php
View File

@ -892,44 +892,48 @@ class WP_Automatic_Updater {
$successful_updates = array(); $successful_updates = array();
$failed_updates = array(); $failed_updates = array();
/** if ( ! empty( $update_results['plugin'] ) ) {
* Filters whether to send an email following an automatic background plugin update. /**
* * 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. * @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. * @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'] ); */
$notifications_enabled = apply_filters( 'auto_plugin_update_send_email', true, $update_results['plugin'] );
if ( ! empty( $update_results['plugin'] ) && $notifications_enabled ) { if ( $notifications_enabled ) {
foreach ( $update_results['plugin'] as $update_result ) { foreach ( $update_results['plugin'] as $update_result ) {
if ( true === $update_result->result ) { if ( true === $update_result->result ) {
$successful_updates['plugin'][] = $update_result; $successful_updates['plugin'][] = $update_result;
} else { } else {
$failed_updates['plugin'][] = $update_result; $failed_updates['plugin'][] = $update_result;
}
} }
} }
} }
/** if ( ! empty( $update_results['theme'] ) ) {
* Filters whether to send an email following an automatic background theme update. /**
* * 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. * @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. * @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'] ); */
$notifications_enabled = apply_filters( 'auto_theme_update_send_email', true, $update_results['theme'] );
if ( ! empty( $update_results['theme'] ) && $notifications_enabled ) { if ( $notifications_enabled ) {
foreach ( $update_results['theme'] as $update_result ) { foreach ( $update_results['theme'] as $update_result ) {
if ( true === $update_result->result ) { if ( true === $update_result->result ) {
$successful_updates['theme'][] = $update_result; $successful_updates['theme'][] = $update_result;
} else { } else {
$failed_updates['theme'][] = $update_result; $failed_updates['theme'][] = $update_result;
}
} }
} }
} }

2
wp-includes/version.php
View File

@ -13,7 +13,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '5.6-alpha-49165'; $wp_version = '5.6-alpha-49166';
/** /**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.