Changeset 6096

Timestamp:

06/14/2012 06:12:35 PM (13 years ago)

Author:

boonebgorges

Message:

Ensures consistent typing when core components register themselves in active array

When core components register themselves in the active_components array using
a boolean, it causes problems with the array_search() logic in
bp_is_current_component(). By using the int 1 instead, we avoid false positives
from array_search(), and thus from bp_is_current_component().

Fixes #4081.

Props chrisbliss18, cnorris23

File:

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

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

@@ -78 +78 @@
 
             // 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 ) ) );
-
-            // Loop through active components and set the values
-            $bp->active_components = array_map( '__return_true', $active_components );
+            $active_components     = array_fill_keys( array_diff( array_values( array_merge( $optional_components, $required_components ) ), array_values( $deactivated_components ) ), '1' );
 
             // Set the active component global
@@ -93 +90 @@
 
             // 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 );
+            $active_components     = array_fill_keys( array_values( array_merge( $bp->optional_components, $bp->required_components ) ), '1' );
 
             // Set the active component global