Make WordPress Core


Ignore:
Timestamp:
06/22/2020 05:24:34 PM (4 years ago)
Author:
desrosj
Message:

General: Remove “whitelist” and “blacklist” in favor of more clear and inclusive language.

“The WordPress open source community cares about diversity. We strive to maintain a welcoming environment where everyone can feel included.”

With this commit, all occurrences of “whitelist” and “blacklist” (with the single exception of the $new_whitelist_options global variable) are removed. A new ticket has been opened to explore renaming the $new_whitelist_options variable (#50434).

Changing to more specific names or rewording sentences containing these terms not only makes the code more inclusive, but also helps provide clarity. These terms are often ambiguous. What is being blocked or allowed is not always immediately clear. This can make it more difficult for non-native English speakers to read through the codebase.

Words matter. If one contributor feels more welcome because these terms are removed, this was worth the effort.

Props strangerstudios, jorbin, desrosj, joemcgill, timothyblynjacobs, ocean90, ayeshrajans, davidbaumwald, earnjam.
See #48900, #50434.
Fixes #50413.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/wp-includes/ms-site.php

    r48104 r48121  
    115115        }
    116116
    117         // Rebuild the data expected by the `wpmu_new_blog` hook prior to 5.1.0 using whitelisted keys.
    118         // The `$site_data_whitelist` matches the one used in `wpmu_create_blog()`.
    119         $site_data_whitelist = array( 'public', 'archived', 'mature', 'spam', 'deleted', 'lang_id' );
    120         $meta                = array_merge( array_intersect_key( $data, array_flip( $site_data_whitelist ) ), $meta );
     117        // Rebuild the data expected by the `wpmu_new_blog` hook prior to 5.1.0 using allowed keys.
     118        // The `$allowed_data_fields` matches the one used in `wpmu_create_blog()`.
     119        $allowed_data_fields = array( 'public', 'archived', 'mature', 'spam', 'deleted', 'lang_id' );
     120        $meta                = array_merge( array_intersect_key( $data, array_flip( $allowed_data_fields ) ), $meta );
    121121
    122122        /**
     
    493493    $data = apply_filters( 'wp_normalize_site_data', $data );
    494494
    495     $whitelist = array( 'domain', 'path', 'network_id', 'registered', 'last_updated', 'public', 'archived', 'mature', 'spam', 'deleted', 'lang_id' );
    496     $data      = array_intersect_key( wp_parse_args( $data, $defaults ), array_flip( $whitelist ) );
     495    $allowed_data_fields = array( 'domain', 'path', 'network_id', 'registered', 'last_updated', 'public', 'archived', 'mature', 'spam', 'deleted', 'lang_id' );
     496    $data                = array_intersect_key( wp_parse_args( $data, $defaults ), array_flip( $allowed_data_fields ) );
    497497
    498498    $errors = new WP_Error();
Note: See TracChangeset for help on using the changeset viewer.