Changeset 11747 for trunk/src/bp-members/bp-members-functions.php

Timestamp:

11/16/2017 08:00:41 PM (9 years ago)

Author:

boonebgorges

Message:

Members: Run BP's illegal user names through WP filter.

This ensures that user names added to the blacklist via the
'illegal_user_logins' filter are also blacklisted during BP registration.

Props espellcaste.
Fixes #7461.

File:

• trunk/src/bp-members/bp-members-functions.php (modified) (1 diff)

trunk/src/bp-members/bp-members-functions.php

@@ -1579 +1579 @@
         $filtered_illegal_names = apply_filters( 'bp_core_illegal_usernames', array_merge( array( 'www', 'web', 'root', 'admin', 'main', 'invite', 'administrator' ), $bp_component_slugs ) );
 
-        // Merge the arrays together.
-        $merged_names           = array_merge( (array) $filtered_illegal_names, (array) $db_illegal_names );
+        /**
+         * Filters the list of illegal usernames from WordPress.
+         *
+         * @since 3.0
+         *
+         * @param array Array of illegal usernames.
+         */
+        $wp_filtered_illegal_names = apply_filters( 'illegal_user_logins', array() );
+
+        // First merge BuddyPress illegal names.
+        $bp_merged_names           = array_merge( (array) $filtered_illegal_names, (array) $db_illegal_names );
+
+        // Then merge WordPress and BuddyPress illegal names.
+        $merged_names              = array_merge( (array) $wp_filtered_illegal_names, (array) $bp_merged_names );
 
         // Remove duplicates.
-        $illegal_names          = array_unique( (array) $merged_names );
+        $illegal_names             = array_unique( (array) $merged_names );
 
         /**