From 2d81c95f7308e252d2d0802b87cc331f98bb83b8 Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov.ru@gmail.com>
Date: Wed, 17 Apr 2019 23:04:53 +0000
Subject: [PATCH] Bootstrap/Load: Only send the recovery mode email if the
 error occurs on a protected endpoint.

This reduces the potential email noise to places where the fatal error could be interfering with the login and admin experience.

Once the user is in recovery mode, any fatal errors (even if they aren't in a protected endpoint) are handled and the plugin or theme will be paused.

Props TimothyBlynJacobs.
See #46950.
Built from https://develop.svn.wordpress.org/trunk@45238


git-svn-id: http://core.svn.wordpress.org/trunk@45047 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/class-wp-recovery-mode.php | 4 ++++
 wp-includes/version.php                | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/wp-includes/class-wp-recovery-mode.php b/wp-includes/class-wp-recovery-mode.php
index 6ac1a09569..fc38afdb54 100644
--- a/wp-includes/class-wp-recovery-mode.php
+++ b/wp-includes/class-wp-recovery-mode.php
@@ -173,6 +173,10 @@ class WP_Recovery_Mode {
 		}
 
 		if ( ! $this->is_active() ) {
+			if ( ! is_protected_endpoint() ) {
+				return new WP_Error( 'non_protected_endpoint', __( 'Error occurred on a non-protected endpoint.' ) );
+			}
+
 			if ( ! function_exists( 'wp_generate_password' ) ) {
 				require_once ABSPATH . WPINC . '/pluggable.php';
 			}
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 179bb5e7c7..63ad9cbf2c 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -13,7 +13,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '5.2-beta3-45237';
+$wp_version = '5.2-beta3-45238';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.