Ticket #50434: 50434.2.patch

src/wp-admin/includes/plugin.php

@@ -2144 +2144 @@
  * See the {@see 'allowed_options'} filter.
  *
  * @since 2.7.0
+ * @since 5.5.0 `$new_whitelist_options` global variable has been renamed to `$new_allowlist_options`.
+ *              For compatibility with existing code, the old variable is now a reference to the new one.
+ *              Please consider writing more inclusive code.
  *
- * @global array $new_whitelist_options
+ * @global array $new_allowlist_options
  *
  * @param array $options
  * @return array
  */
 function option_update_filter( $options ) {
-        global $new_whitelist_options;
+        global $new_allowlist_options;
 
-        if ( is_array( $new_whitelist_options ) ) {
-                $options = add_option_allowed_list( $new_whitelist_options, $options );
+        if ( is_array( $new_allowlist_options ) ) {
+                $options = add_option_allowed_list( $new_allowlist_options, $options );
         }
 
         return $options;

src/wp-includes/option.php

@@ -2093 +2093 @@
  *
  * @since 2.7.0
  * @since 4.7.0 `$args` can be passed to set flags on the setting, similar to `register_meta()`.
+ * @since 5.5.0 `$new_whitelist_options` global variable has been renamed to `$new_allowlist_options`.
+ *              For compatibility with existing code, the old variable is now a reference to the new one.
+ *              Please consider writing more inclusive code.
  *
- * @global array $new_whitelist_options
+ * @global array $new_allowlist_options
  * @global array $wp_registered_settings
  *
  * @param string $option_group A settings group name. Should correspond to an allowed option key name.
@@ -2115 +2118 @@
  * }
  */
 function register_setting( $option_group, $option_name, $args = array() ) {
-        global $new_whitelist_options, $wp_registered_settings;
+        global $new_allowlist_options, $wp_registered_settings;
+
+        /**
+         * @deprecated `$new_whitelist_options` is renamed to `$new_allowlist_options. Please use `$new_allowlist_options`.
+         */
+        $GLOBALS['new_whitelist_options'] = &$new_allowlist_options;
 
         $defaults = array(
                 'type'              => 'string',
@@ -2180 +2188 @@
                 $option_group = 'reading';
         }
 
-        $new_whitelist_options[ $option_group ][] = $option_name;
+        $new_allowlist_options[ $option_group ][] = $option_name;
         if ( ! empty( $args['sanitize_callback'] ) ) {
                 add_filter( "sanitize_option_{$option_name}", $args['sanitize_callback'] );
         }
@@ -2197 +2205 @@
  * @since 2.7.0
  * @since 4.7.0 `$sanitize_callback` was deprecated. The callback from `register_setting()` is now used instead.
  *
- * @global array $new_whitelist_options
+ * @global array $new_allowlist_options
  * @global array $wp_registered_settings
  *
  * @param string   $option_group      The settings group name used during registration.
@@ -2205 +2213 @@
  * @param callable $deprecated        Deprecated.
  */
 function unregister_setting( $option_group, $option_name, $deprecated = '' ) {
-        global $new_whitelist_options, $wp_registered_settings;
+        global $new_allowlist_options, $wp_registered_settings;
+
+        /**
+         * @deprecated `$new_whitelist_options` is renamed to `$new_allowlist_options.
+         */
+        $GLOBALS['new_whitelist_options'] = &$new_allowlist_options;
 
         if ( 'misc' === $option_group ) {
                 _deprecated_argument(
@@ -2233 +2246 @@
                 $option_group = 'reading';
         }
 
-        $pos = array_search( $option_name, (array) $new_whitelist_options[ $option_group ], true );
+        $pos = array_search( $option_name, (array) $new_allowlist_options[ $option_group ], true );
         if ( false !== $pos ) {
-                unset( $new_whitelist_options[ $option_group ][ $pos ] );
+                unset( $new_allowlist_options[ $option_group ][ $pos ] );
         }
         if ( '' !== $deprecated ) {
                 _deprecated_argument(