Changeset 9555 for trunk/src/bp-core/admin/bp-core-admin-components.php

Timestamp:

02/24/2015 01:48:42 PM (11 years ago)

Author:

johnjamesjacoby

Message:

Core: Allow custom components to continue to have directory pages.

Fixes regression introduced in 2.2. Props imath. See #6244. (trunk)

File:

• trunk/src/bp-core/admin/bp-core-admin-components.php (modified) (3 diffs)

trunk/src/bp-core/admin/bp-core-admin-components.php

@@ -308 +308 @@
     }
 
-    $current_components = buddypress()->active_components;
+    $current_components       = buddypress()->active_components;
+    $packaged_components      = array_flip( bp_core_get_packaged_component_ids() );
+    $custom_active_components = array_diff_key( $current_components, $packaged_components );
 
     switch ( $current_action ) {
@@ -316 +318 @@
                 if ( ! isset( $submitted[ $retired_component ] ) ) {
                     unset( $current_components[ $retired_component ] );
+
+                    // Make sure custom components does not contain a retired component
+                    if ( isset( $custom_active_components[ $retired_component ] ) ) {
+                        unset( $custom_active_components[ $retired_component ] );
+                    }
                 }
             }
@@ -331 +338 @@
     }
 
-    return $components;
+    // Active components is the list of packaged and custom components
+    return array_merge( $components, $custom_active_components );
 }