Changeset 3441 for branches/1.2/bp-core/bp-core-signup.php

Timestamp:

11/18/2010 07:43:08 PM (15 years ago)

Author:

djpaul

Message:

Make sure core components' names get correctly added to the list of Banned Names in multisite.

File:

• branches/1.2/bp-core/bp-core-signup.php (modified) (1 diff)

branches/1.2/bp-core/bp-core-signup.php

@@ -286 +286 @@
         $db_illegal_names = implode( ' ', $names );
 
+    // Add the core components' slugs to the banned list even if their components aren't active.
+    $bp_component_slugs = array( 'groups', 'members', 'forums', 'blogs', 'activity', 'profile', 'friends', 'search', 'settings', 'register', 'activate' );
+
+    if ( defined( 'BP_GROUPS_SLUG' ) )
+        $bp_component_slugs[] = BP_GROUPS_SLUG;
+
+    if ( defined( 'BP_MEMBERS_SLUG' ) )
+        $bp_component_slugs[] = BP_MEMBERS_SLUG;
+
+    if ( defined( 'BP_FORUMS_SLUG' ) )
+        $bp_component_slugs[] = BP_FORUMS_SLUG;
+
+    if ( defined( 'BP_BLOGS_SLUG' ) )
+        $bp_component_slugs[] = BP_BLOGS_SLUG;
+
+    if ( defined( 'BP_ACTIVITY_SLUG' ) )
+        $bp_component_slugs[] = BP_ACTIVITY_SLUG;
+
+    if ( defined( 'BP_XPROFILE_SLUG' ) )
+        $bp_component_slugs[] = BP_XPROFILE_SLUG;
+
+    if ( defined( 'BP_FRIENDS_SLUG' ) )
+        $bp_component_slugs[] = BP_FRIENDS_SLUG;
+
+    if ( defined( 'BP_SEARCH_SLUG' ) )
+        $bp_component_slugs[] = BP_SEARCH_SLUG;
+
+    if ( defined( 'BP_SETTINGS_SLUG' ) )
+        $bp_component_slugs[] = BP_SETTINGS_SLUG;
+
+    if ( defined( 'BP_REGISTER_SLUG' ) )
+        $bp_component_slugs[] = BP_REGISTER_SLUG;
+
+    if ( defined( 'BP_ACTIVATION_SLUG' ) )
+        $bp_component_slugs[] = BP_ACTIVATION_SLUG;
+    
     // Add our slugs to the array and allow them to be filtered
-    $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_ACTIVITY_SLUG, BP_XPROFILE_SLUG, BP_FRIENDS_SLUG, BP_SEARCH_SLUG, BP_SETTINGS_SLUG, BP_REGISTER_SLUG, BP_ACTIVATION_SLUG ) );
+    $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