Ticket #7654: 7654-2.diff

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

@@ -51 +51 @@
 
         // Declare local variables.
         $deactivated_components = array();
-
-        /**
-         * Filters the array of available components.
-         *
-         * @since 1.5.0
-         *
-         * @param mixed $value Active components.
-         */
-        $active_components      = apply_filters( 'bp_active_components', bp_get_option( 'bp-active-components' ) );
+        $active_components = bp_core_get_active_components();
 
         // The default components (if none are previously selected).
         $default_components = array(

src/bp-core/admin/bp-core-admin-schema.php

@@ -26 +26 @@
 
         // If no components passed, get all the active components from the main site.
         if ( empty( $active_components ) ) {
-
-                /** This filter is documented in bp-core/admin/bp-core-admin-components.php */
-                $active_components = apply_filters( 'bp_active_components', bp_get_option( 'bp-active-components' ) );
+                $active_components = bp_core_get_active_components();
         }
 
         // Install Activity Streams even when inactive (to store last_activity data).

src/bp-core/bp-core-functions.php

@@ -2527 +2527 @@
         return apply_filters( 'bp_core_get_components', $components, $type );
 }
 
+/**
+ * Return a list of active components.
+ *
+ * @since 3.0.0
+ *
+ * @return array Active components.
+ */
+function bp_core_get_active_components() {
+        $active_components = bp_get_option( 'bp-active-components' );
+
+        /**
+         * Filters the list of active components.
+         *
+         * @since 1.5.0
+         *
+         * @param array $active_components Array of active component information.
+         */
+        return apply_filters( 'bp_active_components', $active_components );
+}
+
+/**
+ * Return a list of inactive (or "deactivated") components.
+ *
+ * @since 3.0.0
+ *
+ * @return array Inactive components.
+ */
+function bp_core_get_inactive_components() {
+        $inactive_components = array_values(
+                array_diff(
+                        array_values(
+                                array_merge( $bp->optional_components, $bp->required_components )
+                        ),
+                        array_keys(
+                                bp_core_get_active_components()
+                        )
+                )
+        );
+
+        /**
+         * Filters the list of inactive (or "deactivated") components.
+         *
+         * The filter is named "deactivated" rather than "inactive" for backwards compatibility reasons.
+         *
+         * @since 3.0.0
+         *
+         * @param array $inactive_components Inactive components.
+         */
+        return apply_filters( 'bp_deactivated_components', $inactive_components );
+}
+
 /** Nav Menu ******************************************************************/
 
 /**

src/bp-core/classes/class-bp-core.php

@@ -76 +76 @@
                  */
                 $bp->required_components = apply_filters( 'bp_required_components', array( 'members' ) );
 
-                // Get a list of activated components.
-                if ( $active_components = bp_get_option( 'bp-active-components' ) ) {
+                $active_components      = bp_core_get_active_components();
+                $deactivated_components = bp_get_option( 'bp-deactivated-components' );
 
-                        /** This filter is documented in bp-core/admin/bp-core-admin-components.php */
-                        $bp->active_components      = apply_filters( 'bp_active_components', $active_components );
+                if ( $active_components ) {
+                        $bp->active_components = $active_components;
 
                         /**
                          * Filters the deactivated components.
@@ -92 +92 @@
                         $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 ) ) ) );
 
                 // Pre 1.5 Backwards compatibility.
-                } elseif ( $deactivated_components = bp_get_option( 'bp-deactivated-components' ) ) {
+                } elseif ( $deactivated_components ) {
 
                         // Trim off namespace and filename.
                         foreach ( array_keys( (array) $deactivated_components ) as $component ) {
                                 $trimmed[] = str_replace( '.php', '', str_replace( 'bp-', '', $component ) );
                         }
 
-                        /** This filter is documented in bp-core/bp-core-loader.php */
+                        /** This filter is documented in bp-core/bp-core-functions.php */
                         $bp->deactivated_components = apply_filters( 'bp_deactivated_components', $trimmed );
 
                         // Setup the active components.
                         $active_components     = array_fill_keys( array_diff( array_values( array_merge( $bp->optional_components, $bp->required_components ) ), array_values( $bp->deactivated_components ) ), '1' );
 
-                        /** This filter is documented in bp-core/admin/bp-core-admin-components.php */
+                        /** This filter is documented in bp-core/bp-core-functions.php */
                         $bp->active_components = apply_filters( 'bp_active_components', $bp->active_components );
 
                 // Default to all components active.
@@ -117 +117 @@
                         // Setup the active components.
                         $active_components     = array_fill_keys( array_values( array_merge( $bp->optional_components, $bp->required_components ) ), '1' );
 
-                        /** This filter is documented in bp-core/admin/bp-core-admin-components.php */
+                        /** This filter is documented in bp-core/bp-core-functions.php */
                         $bp->active_components = apply_filters( 'bp_active_components', $bp->active_components );
                 }