Ticket #3153: 3153.003.diff

bp-core/bp-core-loader.php

@@ -67 +67 @@
                 // Pre 1.3 Backwards compatibility
                 } elseif ( $deactivated_components = get_site_option( 'bp-deactivated-components' ) ) {
                         // Trim off namespace and filename
-                        foreach ( $deactivated_components as $component => $value )
+                        foreach ( (array) $deactivated_components as $component => $value )
                                 $trimmed[] = str_replace( '.php', '', str_replace( 'bp-', '', $component ) );
 
                         // Set globals
                         $bp->deactivated_components = apply_filters( 'bp_deactivated_components', $trimmed );
 
                         // Setup the active components
-                        $active_components          = array_flip( array_diff( array_values( array_merge( $bp->optional_components, $bp->required_components ) ), array_values( $bp->deactivated_components ) ) );
+                        $active_components     = array_flip( array_diff( array_values( array_merge( $bp->optional_components, $bp->required_components ) ), array_values( $bp->deactivated_components ) ) );
 
                         // Loop through active components and set the values
-                        foreach( $active_components as $component => $value )
-                                $bp->active_components[$component] = 1;
+                        $bp->active_components = array_map( '__return_true', $active_components );
 
                         // Set the active component global
-                        $bp->active_components      = apply_filters( 'bp_active_components', $bp->active_components );
+                        $bp->active_components = apply_filters( 'bp_active_components', $bp->active_components );
+
+                // Default to all components active
+                } else {
+                        // Set globals
+                        $bp->deactivated_components = array();
+
+                        // Setup the active components
+                        $active_components     = array_flip( array_values( array_merge( $bp->optional_components, $bp->required_components ) ) );
+
+                        // Loop through active components and set the values
+                        $bp->active_components = array_map( '__return_true', $active_components );
+
+                        // Set the active component global
+                        $bp->active_components = apply_filters( 'bp_active_components', $bp->active_components );
                 }
 
                 // Loop through optional components
@@ -195 +208 @@
                                 'parent_slug'     => $bp->core->profile->slug,
                                 'screen_function' => 'bp_core_catch_profile_uri'
                         );
+
                 }
         }
 }