Changeset 13726

Timestamp:

02/15/2024 03:53:11 AM (21 months ago)

Author:

imath

Message:

BP Nouveau: repair the customizer panel to sort Members nav items

Changes introduced by the BP Rewrites API about how the Members nav items are registered and then set up generated a regression about this customizer panel.

In short, the bp_parse_query action is not fired while building the customizer's panels.

To bring back the possibility to sort the Members nav items from the BP Nouveau > Members Navigation panel, we now need to force the generation of the primary nav using the bp_get_component_navigations() function.

NB: this commit also prevents a notice error when sanitizing the navigation setting to sort items.

Props nitinp544, vapvarun

See #9095 (trunk)
Closes ​https://github.com/buddypress/buddypress/pull/230

Location:

trunk/src/bp-templates/bp-nouveau/includes

Files:

• functions.php (modified) (2 diffs)
• members/functions.php (modified) (3 diffs)

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

@@ -4 +4 @@
  *
  * @since 3.0.0
- * @version 12.0.0
+ * @version 12.3.0
  */
 
@@ -753 +753 @@
  */
 function bp_nouveau_sanitize_nav_order( $option = '' ) {
-    $option = explode( ',', $option );
+    if ( ! is_array( $option ) ) {
+        $option = explode( ',', $option );
+    }
+
     return array_map( 'sanitize_key', $option );
 }

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

@@ -4 +4 @@
  *
  * @since 3.0.0
- * @version 10.0.0
+ * @version 12.3.0
  */
 
@@ -494 +494 @@
  */
 function bp_nouveau_member_customizer_nav() {
+    $nav = buddypress()->members->nav;
+
+    if ( ! $nav->get_primary() ) {
+        $nav_items = bp_get_component_navigations();
+
+        // Forces navigation generation.
+        foreach ( $nav_items as $nav_item ) {
+            $nav->add_nav( $nav_item['main_nav'] );
+        }
+    }
+
     add_filter( '_bp_nouveau_member_reset_front_template', 'bp_nouveau_member_restrict_user_front_templates', 10, 1 );
 
     if ( bp_displayed_user_get_front_template( buddypress()->loggedin_user ) ) {
-        buddypress()->members->nav->add_nav(
+        $nav->add_nav(
             array(
                 'name'     => _x( 'Home', 'Member Home page', 'buddypress' ),
@@ -508 +519 @@
     remove_filter( '_bp_nouveau_member_reset_front_template', 'bp_nouveau_member_restrict_user_front_templates', 10, 1 );
 
-    $nav = buddypress()->members->nav;
-
     // Eventually reset the order.
     bp_nouveau_set_nav_item_order( $nav, bp_nouveau_get_appearance_settings( 'user_nav_order' ) );