Changeset 48142

Timestamp:

06/23/2020 06:53:00 PM (4 years ago)

Author:

desrosj

Message:

General: Rename (add|remove)_option_allowed_list() to (add|remove)_allowed_option().

The new names make the purpose more clear. It also adds consistency with the $allowed_options global variable.

Also in this change, the wp-deprecated dependency has been removed from the password strength meter in favor of a window.console.log() call to avoid adding 3 dependencies for one deprecated notice.

Props SergeyBiryukov, ocean90, desrosj
Fixes #50413.

Location:

trunk/src

Files:

• js/_enqueues/wp/password-strength-meter.js (modified) (2 diffs)
• wp-admin/includes/plugin.php (modified) (2 diffs)
• wp-includes/deprecated.php (modified) (2 diffs)
• wp-includes/script-loader.php (modified) (1 diff)

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

@@ -7 +7 @@
 
 (function($){
+    var __ = wp.i18n.__,
+        sprintf = wp.i18n.sprintf;
 
     /**
@@ -59 +61 @@
          */
         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();

trunk/src/wp-admin/includes/plugin.php

@@ -2155 +2155 @@
 
     if ( is_array( $new_whitelist_options ) ) {
-        $options = add_option_allowed_list( $new_whitelist_options, $options );
+        $options = add_allowed_options( $new_whitelist_options, $options );
     }
 
@@ -2172 +2172 @@
  * @return array
  */
-function add_option_allowed_list( $new_options, $options = '' ) {
+function add_allowed_options( $new_options, $options = '' ) {
     if ( '' === $options ) {
         global $allowed_options;

trunk/src/wp-includes/deprecated.php

@@ -4043 +4043 @@
  *
  * @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.
  *
@@ -4053 +4053 @@
  */
 function add_option_whitelist( $new_options, $options = '' ) {
-    _deprecated_function( __FUNCTION__, '5.5.0', 'add_option_allowed_list()' );
-
-    return add_option_allowed_list( $new_options, $options );
+    _deprecated_function( __FUNCTION__, '5.5.0', 'add_allowed_options()' );
+
+    return add_allowed_options( $new_options, $options );
 }
 

trunk/src/wp-includes/script-loader.php

@@ -1065 +1065 @@
     );
 
-    $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',