From 2cebcb6144aeeb6d404f4cf6baea1f0c39106562 Mon Sep 17 00:00:00 2001
From: desrosj <desrosj@git.wordpress.org>
Date: Wed, 22 Jul 2020 18:52:02 +0000
Subject: [PATCH] General: Rename `remove_option_allowed_list()` to
 `remove_allowed_options()`.

This was missed in [48142] which renamed `add_option_allowed_list()` to `add_allowed_options()` for better readability. The two functions should have consistent names.

See #50413.
Built from https://develop.svn.wordpress.org/trunk@48566


git-svn-id: http://core.svn.wordpress.org/trunk@48328 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/includes/plugin.php | 2 +-
 wp-includes/deprecated.php   | 6 +++---
 wp-includes/version.php      | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/wp-admin/includes/plugin.php b/wp-admin/includes/plugin.php
index 05bd0c60f1..43966ab6f8 100644
--- a/wp-admin/includes/plugin.php
+++ b/wp-admin/includes/plugin.php
@@ -2231,7 +2231,7 @@ function add_allowed_options( $new_options, $options = '' ) {
  * @param string|array $options
  * @return array
  */
-function remove_option_allowed_list( $del_options, $options = '' ) {
+function remove_allowed_options( $del_options, $options = '' ) {
 	if ( '' === $options ) {
 		global $allowed_options;
 	} else {
diff --git a/wp-includes/deprecated.php b/wp-includes/deprecated.php
index 43450e8d4a..5cae9d514a 100644
--- a/wp-includes/deprecated.php
+++ b/wp-includes/deprecated.php
@@ -4086,7 +4086,7 @@ function add_option_whitelist( $new_options, $options = '' ) {
  * Removes a list of options from the allowed options list.
  *
  * @since 2.7.0
- * @deprecated 5.5.0 Use remove_option_allowed_list() instead.
+ * @deprecated 5.5.0 Use remove_allowed_options() instead.
  *                   Please consider writing more inclusive code.
  *
  * @global array $allowed_options
@@ -4096,7 +4096,7 @@ function add_option_whitelist( $new_options, $options = '' ) {
  * @return array
  */
 function remove_option_whitelist( $del_options, $options = '' ) {
-	_deprecated_function( __FUNCTION__, '5.5.0', 'remove_option_allowed_list()' );
+	_deprecated_function( __FUNCTION__, '5.5.0', 'remove_allowed_options()' );
 
-	return remove_option_allowed_list( $del_options, $options );
+	return remove_allowed_options( $del_options, $options );
 }
diff --git a/wp-includes/version.php b/wp-includes/version.php
index ce7fa803ab..92c3235e6d 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -13,7 +13,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '5.5-beta3-48565';
+$wp_version = '5.5-beta3-48566';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.