diff --git a/wp-admin/includes/class-wp-automatic-updater.php b/wp-admin/includes/class-wp-automatic-updater.php index f94f139e50..01e4dea1aa 100644 --- a/wp-admin/includes/class-wp-automatic-updater.php +++ b/wp-admin/includes/class-wp-automatic-updater.php @@ -944,9 +944,11 @@ class WP_Automatic_Updater { $unique_failures = false; $past_failure_emails = get_option( 'auto_plugin_theme_update_emails', array() ); - // When only failures have occurred, an email should only be sent if there are unique failures. - // A failure is considered unique if an email has not been sent for an update attempt failure - // to a plugin or theme with the same new_version. + /* + * When only failures have occurred, an email should only be sent if there are unique failures. + * A failure is considered unique if an email has not been sent for an update attempt failure + * to a plugin or theme with the same new_version. + */ if ( 'fail' === $type ) { foreach ( $failed_updates as $update_type => $failures ) { foreach ( $failures as $failed_update ) { @@ -1043,9 +1045,11 @@ class WP_Automatic_Updater { $body[] = __( 'These plugins failed to update:' ); foreach ( $failed_updates['plugin'] as $item ) { - $body[] = "- {$item->name}"; + $body[] = "- {$item->name}"; + $past_failure_emails[ $item->item->plugin ] = $item->item->new_version; } + $body[] = "\n"; } @@ -1054,9 +1058,11 @@ class WP_Automatic_Updater { $body[] = __( 'These themes failed to update:' ); foreach ( $failed_updates['theme'] as $item ) { - $body[] = "- {$item->name}"; + $body[] = "- {$item->name}"; + $past_failure_emails[ $item->item->theme ] = $item->item->new_version; } + $body[] = "\n"; } } @@ -1071,19 +1077,23 @@ class WP_Automatic_Updater { foreach ( $successful_updates['plugin'] as $item ) { $body[] = "- {$item->name}"; + unset( $past_failure_emails[ $item->item->plugin ] ); } + $body[] = "\n"; } // List successful theme updates. if ( ! empty( $successful_updates['theme'] ) ) { $body[] = __( 'These themes are now up to date:' ); - // List successful updates. + foreach ( $successful_updates['theme'] as $item ) { $body[] = "- {$item->name}"; + unset( $past_failure_emails[ $item->item->theme ] ); } + $body[] = "\n"; } } diff --git a/wp-includes/meta.php b/wp-includes/meta.php index abb5e6e8e9..a642d16e7b 100644 --- a/wp-includes/meta.php +++ b/wp-includes/meta.php @@ -1226,10 +1226,10 @@ function sanitize_meta( $meta_key, $meta_value, $object_type, $object_subtype = * Valid values are 'string', 'boolean', 'integer', 'number', 'array', and 'object'. * @type string $description A description of the data attached to this meta key. * @type bool $single Whether the meta key has one value per object, or an array of values per object. - * @type mixed $default The default value returned from {@see get_metadata()} if no value has been set yet. - * When using a non-single meta key, the default value is for the first entry. In other - * words, when calling {@see get_metadata()} with `$single` set to `false`, the default - * value given here will be wrapped in an array. + * @type mixed $default The default value returned from get_metadata() if no value has been set yet. + * When using a non-single meta key, the default value is for the first entry. + * In other words, when calling get_metadata() with `$single` set to `false`, + * the default value given here will be wrapped in an array. * @type string $sanitize_callback A function or method to call when sanitizing `$meta_key` data. * @type string $auth_callback Optional. A function or method to call when performing edit_post_meta, * add_post_meta, and delete_post_meta capability checks. diff --git a/wp-includes/nav-menu-template.php b/wp-includes/nav-menu-template.php index 1b2bfed9d7..94c253af5d 100644 --- a/wp-includes/nav-menu-template.php +++ b/wp-includes/nav-menu-template.php @@ -301,7 +301,7 @@ function wp_nav_menu( $args = array() ) { } /** - * Add the class property classes for the current context, if applicable. + * Adds the class property classes for the current context, if applicable. * * @access private * @since 3.0.0 @@ -592,7 +592,7 @@ function _wp_menu_item_classes_by_context( &$menu_items ) { } /** - * Retrieve the HTML list content for nav menu items. + * Retrieves the HTML list content for nav menu items. * * @uses Walker_Nav_Menu to create HTML list content. * @since 3.0.0 diff --git a/wp-includes/rest-api/endpoints/class-wp-rest-attachments-controller.php b/wp-includes/rest-api/endpoints/class-wp-rest-attachments-controller.php index f46357c054..e74ce6821f 100644 --- a/wp-includes/rest-api/endpoints/class-wp-rest-attachments-controller.php +++ b/wp-includes/rest-api/endpoints/class-wp-rest-attachments-controller.php @@ -460,9 +460,11 @@ class WP_REST_Attachments_Controller extends WP_REST_Posts_Controller { ); } - // If the file doesn't exist, attempt a URL fopen on the src link. - // This can occur with certain file replication plugins. - // Keep the original file path to get a modified name later. + /* + * If the file doesn't exist, attempt a URL fopen on the src link. + * This can occur with certain file replication plugins. + * Keep the original file path to get a modified name later. + */ $image_file_to_edit = $image_file; if ( ! file_exists( $image_file_to_edit ) ) { $image_file_to_edit = _load_image_to_edit_path( $attachment_id ); diff --git a/wp-includes/version.php b/wp-includes/version.php index c71c4cca4a..3f9d06d8e2 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -13,7 +13,7 @@ * * @global string $wp_version */ -$wp_version = '5.5-beta1-48407'; +$wp_version = '5.5-beta1-48408'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. diff --git a/wp-includes/widgets.php b/wp-includes/widgets.php index 231431bada..732a89653e 100644 --- a/wp-includes/widgets.php +++ b/wp-includes/widgets.php @@ -1656,7 +1656,7 @@ function wp_widget_rss_form( $args, $inputs = null ) {