Commit 40858650 authored by Jonathan Desrosiers's avatar Jonathan Desrosiers
Browse files

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: https://core.svn.wordpress.org/trunk@48328 1a063a9b-81f0-0310-95a4-ce76da25c4cd
parent c3006eab

wp-admin/includes/plugin.php

+1 −1
Original line number Diff line number Diff line
@@ -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 {

wp-includes/deprecated.php

+3 −3
Original line number Diff line number Diff line
@@ -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 );

}

wp-includes/version.php

+1 −1
Original line number Diff line number Diff line
@@ -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.