Changeset 48575 for trunk/src/wp-admin/includes/upgrade.php

Timestamp:

07/23/2020 03:12:49 AM (6 years ago)

Author:

jorbin

Message:

General: Update code for readability and inclusion

There are two pieces in here:

1) The update to change blacklist to blocklist is moved to disallowed_list. "Block" has a meaning in our code, and there could be ambiguity between this code and code related to blocks.

2) This improves backwards compatibility for code that was accessing the now deprecated code.

Previously: [48477], [48405], [48400], [48121], [48122], [48124], [48142], [48566]

Props: desrosj, SergeyBiryukov, johnjamesjacoby
Fixes: #50413

File:

• trunk/src/wp-admin/includes/upgrade.php (modified) (1 diff)

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

@@ -2178 +2178 @@
         wp_schedule_single_event( time() + ( 1 * MINUTE_IN_SECONDS ), 'wp_update_comment_type_batch' );
 
-        // Use more clear and inclusive language.
-        $blocklist = get_option( 'blacklist_keys', '' );
-        update_option( 'blocklist_keys', $blocklist );
-        delete_option( 'blacklist_keys' );
-
         $comment_previously_approved = get_option( 'comment_whitelist', '' );
         update_option( 'comment_previously_approved', $comment_previously_approved );
         delete_option( 'comment_whitelist' );
+    }
+
+    if ( $wp_current_db_version < 48572 ) {
+        // Use more clear and inclusive language.
+        $disallowed_list = get_option( 'blacklist_keys' );
+
+        if ( false === $disallowed_list ) {
+            $disallowed_list = get_option( 'blocklist_keys' );
+        }
+
+        update_option( 'disallowed_keys', $disallowed_list );
+        delete_option( 'blacklist_keys' );
+        delete_option( 'blocklist_keys' );
     }
 }