Changeset 6910

Timestamp:

04/15/2013 03:42:02 PM (14 years ago)

Author:

johnjamesjacoby

Message:

Use correct $bp global variables in BP_Core::bootstrap() when updating from a pre-1.5 version. Fixes #4935.

File:

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

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

@@ -71 +71 @@
 
                         // Trim off namespace and filename
-                        foreach ( (array) $deactivated_components as $component => $value )
+                        foreach ( array_keys( (array) $deactivated_components ) as $component ) {
                                 $trimmed[] = str_replace( '.php', '', str_replace( 'bp-', '', $component ) );
+                        }
 
                         // Set globals
@@ -78 +79 @@
 
                         // Setup the active components
-                        $active_components     = array_fill_keys( array_diff( array_values( array_merge( $optional_components, $required_components ) ), array_values( $deactivated_components ) ), '1' );
+                        $active_components     = array_fill_keys( array_diff( array_values( array_merge( $bp->optional_components, $bp->required_components ) ), array_values( $deactivated_components ) ), '1' );
 
                         // Set the active component global