Skip to:
Content

BuddyPress.org

Changeset 6910


Ignore:
Timestamp:
04/15/2013 03:42:02 PM (9 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:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/bp-core/bp-core-loader.php

    r6585 r6910  
    7171
    7272            // Trim off namespace and filename
    73             foreach ( (array) $deactivated_components as $component => $value )
     73            foreach ( array_keys( (array) $deactivated_components ) as $component ) {
    7474                $trimmed[] = str_replace( '.php', '', str_replace( 'bp-', '', $component ) );
     75            }
    7576
    7677            // Set globals
     
    7879
    7980            // Setup the active components
    80             $active_components     = array_fill_keys( array_diff( array_values( array_merge( $optional_components, $required_components ) ), array_values( $deactivated_components ) ), '1' );
     81            $active_components     = array_fill_keys( array_diff( array_values( array_merge( $bp->optional_components, $bp->required_components ) ), array_values( $deactivated_components ) ), '1' );
    8182
    8283            // Set the active component global
Note: See TracChangeset for help on using the changeset viewer.