Skip to:
Content

BuddyPress.org

Ticket #2310: 2310.001.diff

File 2310.001.diff, 1.3 KB (added by cnorris23, 16 years ago)

  • Users/Genesis/Sites/wp-2.9-bp/wp-content/plugins/buddypress/bp-core/bp-core-signup.php

     
    271271        $filtered_illegal_names = apply_filters( 'bp_core_illegal_usernames', array( 'www', 'web', 'root', 'admin', 'main', 'invite', 'administrator', BP_GROUPS_SLUG, BP_MEMBERS_SLUG, BP_FORUMS_SLUG, BP_BLOGS_SLUG, BP_REGISTER_SLUG, BP_ACTIVATION_SLUG ) );
    272272
    273273        /* Safely merge our illegal names into existing site_option */
    274         $common_names                   = array_intersect( (array)$db_illegal_names, (array)$filtered_illegal_names );
    275         $diff_names                             = array_diff( (array)$db_illegal_names, (array)$filtered_illegal_names );
    276         $illegal_names                  = array_merge( (array)$diff_names, (array)$common_names );
    277 
     274        $illegal_names = array_merge( (array)$db_illegal_names, (array)$filtered_illegal_names );
     275        $illegal_names = array_unique( $illegal_names );
     276       
    278277        update_site_option( 'illegal_names', $illegal_names );
    279278
    280279        if ( !validate_username( $user_name ) || in_array( $user_name, (array)$illegal_names ) || $user_name != $maybe[0] )