Changeset 13441 for trunk/src/bp-core/bp-core-buddybar.php

Timestamp:

03/23/2023 07:35:38 PM (18 months ago)

Author:

imath

Message:

Make BP_Core_Nav generate "BP Rewrites ready" navigation links

• Remove all components $parent_url attributes when setting sub nav items.
• Only use the bp_core_create_nav_link() $link attribute argument & the bp_core_create_subnav_link() $parent_url attribute argument if specified to preserve backward compatibility.
• Migrates the Community search feature so that it uses BP Rewrites.
• Perform some bp_loggedin_user_domain() in favor of bp_loggedin_user_url().
• Update some PHPUnit tests.

Props r-a-y, johnjamesjacoby, boonebgorges

Closes ​https://github.com/buddypress/buddypress/pull/77
See #4954

File:

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

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

@@ -161 +161 @@
         'name'                    => $r['name'],
         'slug'                    => $r['slug'],
-        'link'                    => trailingslashit( bp_loggedin_user_domain() . $r['slug'] ),
         'css_id'                  => $r['item_css_id'],
         'show_for_displayed_user' => $r['show_for_displayed_user'],
@@ -561 +560 @@
 
     // If we don't have the required info we need, don't create this subnav item.
-    if ( empty( $r['name'] ) || empty( $r['slug'] ) || empty( $r['parent_slug'] ) || empty( $r['parent_url'] ) || empty( $r['screen_function'] ) )
-        return false;
-
-    // Link was not forced, so create one.
-    if ( empty( $r['link'] ) ) {
+    if ( empty( $r['name'] ) || empty( $r['slug'] ) || empty( $r['parent_slug'] ) || empty( $r['screen_function'] ) ) {
+        return false;
+    }
+
+    // Preserve backward compatibility for plugins forcing URLs.
+    if ( empty( $r['link'] ) && ! empty( $r['parent_url'] ) ) {
         $r['link'] = trailingslashit( $r['parent_url'] . $r['slug'] );
-
-        $parent_nav = $bp->{$component}->nav->get_primary( array( 'slug' => $r['parent_slug'] ), false );
-
-        // If this sub item is the default for its parent, skip the slug.
-        if ( $parent_nav ) {
-            $parent_nav_item = reset( $parent_nav );
-            if ( ! empty( $parent_nav_item->default_subnav_slug ) && $r['slug'] === $parent_nav_item->default_subnav_slug ) {
-                $r['link'] = trailingslashit( $r['parent_url'] );
-            }
-        }
     }
 
@@ -601 +591 @@
     );
 
+    // Add the item to the subnav.
     buddypress()->{$component}->nav->add_nav( $subnav_item );