From 5fac9d83a9cbd0ffbd460b84af4e62930eeb557e Mon Sep 17 00:00:00 2001 From: Aaron Jorbin Date: Sat, 5 Jun 2021 15:46:57 +0000 Subject: [PATCH] Booststrap/Load: Only reference recovery mode email when it can be sent. The recovery mode email is sent from within the WP_Recovery_Mode::handle_error() method, but that method is only called by the fatal error handler if WP_Recovery_Mode has been initialized. This adjusts the message to only say the email has been sent if it can be sent. Props reynhartono, stevegrunwell for initial plan. Fixes #52560. Built from https://develop.svn.wordpress.org/trunk@51076 git-svn-id: http://core.svn.wordpress.org/trunk@50685 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/class-wp-fatal-error-handler.php | 2 +- wp-includes/version.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/wp-includes/class-wp-fatal-error-handler.php b/wp-includes/class-wp-fatal-error-handler.php index 412e1299f4..5a24793124 100644 --- a/wp-includes/class-wp-fatal-error-handler.php +++ b/wp-includes/class-wp-fatal-error-handler.php @@ -182,7 +182,7 @@ class WP_Fatal_Error_Handler { if ( true === $handled && wp_is_recovery_mode() ) { $message = __( 'There has been a critical error on this website, putting it in recovery mode. Please check the Themes and Plugins screens for more details. If you just installed or updated a theme or plugin, check the relevant page for that first.' ); - } elseif ( is_protected_endpoint() ) { + } elseif ( is_protected_endpoint() && wp_recovery_mode()->is_initialized() ) { $message = __( 'There has been a critical error on this website. Please check your site admin email inbox for instructions.' ); } else { $message = __( 'There has been a critical error on this website.' ); diff --git a/wp-includes/version.php b/wp-includes/version.php index 9ac6b2ea19..35e764f62e 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -13,7 +13,7 @@ * * @global string $wp_version */ -$wp_version = '5.8-alpha-51075'; +$wp_version = '5.8-alpha-51076'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.