Changeset 4556 for trunk/bp-core/bp-core-loader.php

Timestamp:

06/24/2011 05:12:13 PM (15 years ago)

Author:

boonebgorges

Message:

Ensures that upgrades from BP 1.2.x are recognized as upgrades, and previous component settings are saved. Fixes #3153. Props cnorris23

File:

• trunk/bp-core/bp-core-loader.php (modified) (3 diffs)

trunk/bp-core/bp-core-loader.php

@@ -54 +54 @@
                 /** Components ********************************************************/
 
-                // Set the included and optional components
-                $bp->optional_components    = apply_filters( 'bp_optional_components',    array( 'activity', 'blogs', 'forums', 'friends', 'groups', 'messages', 'settings', 'xprofile', ) );
+                // Set the included and optional components.
+                $bp->optional_components = array( 'activity', 'forums', 'friends', 'groups', 'messages', 'settings', 'xprofile', );
+
+                // Blogs component only available for multisite
+                if ( is_multisite() )
+                        $bp->optional_components[] = 'blogs';
+
+                $bp->optional_components    = apply_filters( 'bp_optional_components', $bp->optional_components );
 
                 // Set the required components
-                $bp->required_components    = apply_filters( 'bp_required_components',    array( 'members', ) );
+                $bp->required_components    = apply_filters( 'bp_required_components', array( 'members' ) );
 
                 // Get a list of activated components
                 if ( $active_components = get_site_option( 'bp-active-components' ) ) {
-                        $bp->active_components      = apply_filters( 'bp_active_components',      $active_components );
+                        $bp->active_components      = apply_filters( 'bp_active_components', $active_components );
                         $bp->deactivated_components = apply_filters( 'bp_deactivated_components', array_values( array_diff( array_values( array_merge( $bp->optional_components, $bp->required_components ) ), array_keys( $bp->active_components ) ) ) );
 
@@ -68 +74 @@
                 } 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 ) );
 
@@ -75 +81 @@
 
                         // 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 );
                 }