Changeset 8830

Timestamp:

08/13/2014 07:56:31 PM (10 years ago)

Author:

r-a-y

Message:

Fix bp_is_current_component_core() to reference BP core components.

bp_is_current_component_core() is a function that is meant to check
whether the current component is a BP bundled core component. This is done
by grabbing bp_get_option( 'bp-active-components' ), which is supposed to
hold only BP core components. However, if a plugin manually saves its
component in the 'bp-active-components' DB option, our function will
now check this 3rd-party component as well, which is incorrect.

To address this issue, this commit introduces bp_core_get_components(),
which is a hardcoded array of BP core components, and references this
function in bp_is_current_component_core(). This ensures that only
BP core components are checked.

See #5552.

Location:

trunk/src/bp-core

Files:

• bp-core-functions.php (modified) (1 diff)
• bp-core-template.php (modified) (1 diff)

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

@@ -337 +337 @@
 
 /** Directory *****************************************************************/
+
+/**
+ * Returns an array of core components.
+ *
+ * @since BuddyPress (2.1.0)
+ *
+ * @return array
+ */
+function bp_core_get_components() {
+    return array(
+        'activity',
+        'members',
+        'groups',
+        'blogs',
+        'xprofile',
+        'friends',
+        'messages',
+        'settings',
+        'notifications',
+        'forums',
+    );
+}
 
 /**

trunk/src/bp-core/bp-core-template.php

@@ -1538 +1538 @@
  */
 function bp_is_current_component_core() {
-    $retval            = false;
-    $active_components = apply_filters( 'bp_active_components', bp_get_option( 'bp-active-components' ) );
-
-    foreach ( array_keys( $active_components ) as $active_component ) {
+    $retval = false;
+
+    foreach ( bp_core_get_components() as $active_component ) {
         if ( bp_is_current_component( $active_component ) ) {
             $retval = true;