Changeset 12892 for trunk/src/bp-templates/bp-nouveau/includes/functions.php

Timestamp:

04/18/2021 10:18:06 AM (4 years ago)

Author:

imath

Message:

Nouveau: improve the way customizable slugs are handled

BuddyPress uses constants such as BP_FRIENDS_SLUG to let advanced users customize component URL slugs. The Nouveau template pack was wrongly checking hardcoded component names at various places into its code, in particular into the following functions and template tags:

• bp_nouveau_current_object()
• bp_nouveau_filter_options()
• bp_nouveau_wrapper()

This commit also introduces a new BP Core function to get the active BP Component objects: bp_core_get_active_components(). The $args argument can be used to filter the active components according to their slugs, names, ids or root slugs. Nouveau uses it to determine the component ID out of its slug and use this component ID instead of slugs to create its needed dynamic selectors, classes and data attributes.

Props mattneil

Fixes #8133

File:

• trunk/src/bp-templates/bp-nouveau/includes/functions.php (modified) (5 diffs)

trunk/src/bp-templates/bp-nouveau/includes/functions.php

@@ -4 +4 @@
  *
  * @since 3.0.0
- * @version 3.1.0
+ * @version 8.0.0
  */
 
@@ -238 +238 @@
  */
 function bp_nouveau_wrapper( $args = array() ) {
- /**
-    * Classes need to be determined & set by component to a certain degree
-    *
-    * Check the component to find a default container_class to add
-    */
-    $current_component_class = bp_current_component() . '-meta';
+    /**
+     * Classes need to be determined & set by component to a certain degree.
+     *
+     * Check the component to find a default container_class based on the component ID to add.
+     * We need to to this because bp_current_component() is using the component slugs which can differ
+     * from the component ID.
+     */
+    $current_component_id = bp_core_get_active_components( array( 'slug' => bp_current_component() ) );
+    if ( $current_component_id && 1 === count( $current_component_id ) ) {
+        $current_component_id = reset( $current_component_id );
+    } else {
+        $current_component_id = bp_current_component();
+    }
+
+    $current_component_class = $current_component_id . '-meta';
 
     if ( bp_is_group_activity() ) {
@@ -256 +265 @@
             'container'         => 'div',
             'container_id'      => '',
-            'container_classes' => array( $generic_class, $current_component_class   ),
+            'container_classes' => array( $generic_class, $current_component_class ),
             'output'            => '',
         ),
@@ -533 +542 @@
 
     if ( empty( $component ) ) {
-        if ( 'directory' === $context || 'user' === $context ) {
-            $component = bp_current_component();
+        if ( 'user' === $context ) {
+            $component = bp_core_get_active_components( array( 'slug' => bp_current_component() ) );
+            $component = reset( $component );
 
             if ( 'friends' === $component ) {
@@ -544 +554 @@
         } elseif ( 'group' === $context && bp_is_group_members() ) {
             $component = 'members';
+        } else {
+            $component = bp_current_component();
         }
     }