Ticket #50413: 50413.3.diff

src/js/_enqueues/wp/password-strength-meter.js

@@ -6 +6 @@
 window.wp = window.wp || {};
 
 (function($){
+        var __ = wp.i18n.__,
+                sprintf = wp.i18n.sprintf;
 
         /**
          * Contains functions to determine the password strength.
@@ -58 +60 @@
                  * @return {string[]} The array of words to be disallowed.
                  */
                 userInputBlacklist : function() {
-                        wp.deprecated( 'wp.passwordStrength.userInputBlacklist()', {
-                                alternative: 'wp.passwordStrength.userInputDisallowedList()',
-                                plugin: 'WordPress',
-                                hint: wp.i18n.__( 'Please consider writing more inclusive code.' )
-                        } );
+                        window.console.log(
+                                sprintf(
+                                        /* translators: 1: Deprecated  JSfunction name, 2: Version number, 3: Alternative function name. */
+                                        __( '%1$s is deprecated since version %2$s! Use %3$s instead. Please consider writing more inclusive code.' ),
+                                        'wp.passwordStrength.userInputBlacklist()',
+                                        '5.5.0',
+                                        'wp.passwordStrength.userInputDisallowedList()'
+                                )
+                        );
 
                         return wp.passwordStrength.userInputDisallowedList();
                 },

src/wp-admin/includes/plugin.php

@@ -2154 +2154 @@
         global $new_whitelist_options;
 
         if ( is_array( $new_whitelist_options ) ) {
-                $options = add_option_allowed_list( $new_whitelist_options, $options );
+                $options = add_allowed_options( $new_whitelist_options, $options );
         }
 
         return $options;
@@ -2171 +2171 @@
  * @param string|array $options
  * @return array
  */
-function add_option_allowed_list( $new_options, $options = '' ) {
+function add_allowed_options( $new_options, $options = '' ) {
         if ( '' === $options ) {
                 global $allowed_options;
         } else {

src/wp-includes/deprecated.php

@@ -4042 +4042 @@
  * Adds an array of options to the list of allowed options.
  *
  * @since 2.7.0
- * @deprecated 5.5.0 Use add_option_allowed_list() instead.
+ * @deprecated 5.5.0 Use add_allowed_options() instead.
  *                   Please consider writing more inclusive code.
  *
  * @global array $allowed_options
@@ -4052 +4052 @@
  * @return array
  */
 function add_option_whitelist( $new_options, $options = '' ) {
-        _deprecated_function( __FUNCTION__, '5.5.0', 'add_option_allowed_list()' );
+        _deprecated_function( __FUNCTION__, '5.5.0', 'add_allowed_options()' );
 
-        return add_option_allowed_list( $new_options, $options );
+        return add_allowed_options( $new_options, $options );
 }
 
 /**

src/wp-includes/script-loader.php

@@ -1064 +1064 @@
                 )
         );
 
-        $scripts->add( 'password-strength-meter', "/wp-admin/js/password-strength-meter$suffix.js", array( 'jquery', 'wp-deprecated', 'zxcvbn-async' ), false, 1 );
+        $scripts->add( 'password-strength-meter', "/wp-admin/js/password-strength-meter$suffix.js", array( 'jquery', 'zxcvbn-async' ), false, 1 );
         did_action( 'init' ) && $scripts->localize(
                 'password-strength-meter',
                 'pwsL10n',