From a0f8b7003b3251950b3630a597a0d225fefcfabc Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov.ru@gmail.com>
Date: Sat, 1 Feb 2020 22:42:06 +0000
Subject: [PATCH] Administration: Include options page name in the "Options
 page not found" error message to provide better context for plugin
 developers.

Props tdlewis77, williampatton.
Fixes #42941.
Built from https://develop.svn.wordpress.org/trunk@47158


git-svn-id: http://core.svn.wordpress.org/trunk@46958 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/options.php    | 12 +++++++++---
 wp-includes/version.php |  2 +-
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/wp-admin/options.php b/wp-admin/options.php
index 012164326c..2d7eddd632 100644
--- a/wp-admin/options.php
+++ b/wp-admin/options.php
@@ -200,7 +200,7 @@ if ( ! is_multisite() ) {
  *
  * @since 2.7.0
  *
- * @param array $whitelist_options Whitelist options.
+ * @param array $whitelist_options The options whitelist.
  */
 $whitelist_options = apply_filters( 'whitelist_options', $whitelist_options );
 
@@ -217,7 +217,13 @@ if ( 'update' == $action ) {
 	}
 
 	if ( ! isset( $whitelist_options[ $option_page ] ) ) {
-		wp_die( __( '<strong>Error</strong>: Options page not found.' ) );
+		wp_die(
+			sprintf(
+				/* translators: %s: The options page name. */
+				__( '<strong>Error</strong>: Options page %s not found in the options whitelist.' ),
+				'<code>' . esc_html( $option_page ) . '</code>'
+			)
+		);
 	}
 
 	if ( 'options' == $option_page ) {
@@ -268,7 +274,7 @@ if ( 'update' == $action ) {
 					sprintf(
 						/* translators: %s: The option/setting. */
 						__( 'The %s setting is unregistered. Unregistered settings are deprecated. See https://developer.wordpress.org/plugins/settings/settings-api/' ),
-						'<code>' . $option . '</code>'
+						'<code>' . esc_html( $option ) . '</code>'
 					)
 				);
 			}
diff --git a/wp-includes/version.php b/wp-includes/version.php
index ed1bd8e5e8..e54001519e 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -13,7 +13,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '5.4-alpha-47157';
+$wp_version = '5.4-alpha-47158';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.