Changeset 13441 for trunk/src/bp-friends/classes/class-bp-friends-component.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-friends/classes/class-bp-friends-component.php (modified) (7 diffs)

trunk/src/bp-friends/classes/class-bp-friends-component.php

@@ -162 +162 @@
     public function setup_nav( $main_nav = array(), $sub_nav = array() ) {
 
-        // Determine user to use.
-        if ( bp_displayed_user_domain() ) {
-            $user_domain = bp_displayed_user_domain();
-        } elseif ( bp_loggedin_user_domain() ) {
-            $user_domain = bp_loggedin_user_domain();
-        } else {
+        // Stop if there is no user displayed or logged in.
+        if ( ! is_user_logged_in() && ! bp_displayed_user_id() ) {
             return;
         }
 
-        $access       = bp_core_can_edit_settings();
-        $slug         = bp_get_friends_slug();
-        $friends_link = trailingslashit( $user_domain . $slug );
+        $access = bp_core_can_edit_settings();
+        $slug   = bp_get_friends_slug();
 
         // Add 'Friends' to the main navigation.
@@ -202 +197 @@
             'name'            => _x( 'Friendships', 'Friends screen sub nav', 'buddypress' ),
             'slug'            => 'my-friends',
-            'parent_url'      => $friends_link,
             'parent_slug'     => $slug,
             'screen_function' => 'friends_screen_my_friends',
@@ -212 +206 @@
             'name'            => _x( 'Requests', 'Friends screen sub nav', 'buddypress' ),
             'slug'            => 'requests',
-            'parent_url'      => $friends_link,
             'parent_slug'     => $slug,
             'screen_function' => 'friends_screen_requests',
@@ -238 +231 @@
 
             // Setup the logged in user variables.
-            $friends_link = trailingslashit( bp_loggedin_user_domain() . bp_get_friends_slug() );
+            $friends_slug        = bp_get_friends_slug();
+            $custom_friends_slug = bp_rewrites_get_slug( 'members', 'member_' . $friends_slug, $friends_slug );
 
             // Pending friend requests.
@@ -263 +257 @@
                 'id'     => 'my-account-' . $this->id,
                 'title'  => $title,
-                'href'   => $friends_link,
+                'href'   => bp_loggedin_user_url(
+                    array(
+                        'single_item_component' => $custom_friends_slug,
+                    )
+                ),
             );
 
@@ -271 +269 @@
                 'id'       => 'my-account-' . $this->id . '-friendships',
                 'title'    => _x( 'Friendships', 'My Account Friends menu sub nav', 'buddypress' ),
-                'href'     => trailingslashit( $friends_link . 'my-friends' ),
+                'href'     => bp_loggedin_user_url(
+                    array(
+                        'single_item_component' => $custom_friends_slug,
+                        'single_item_action'    => bp_rewrites_get_slug( 'members', 'member_' . $friends_slug . '_my_friends', 'my-friends' ),
+                    )
+                ),
                 'position' => 10,
             );
@@ -280 +283 @@
                 'id'       => 'my-account-' . $this->id . '-requests',
                 'title'    => $pending,
-                'href'     => trailingslashit( $friends_link . 'requests' ),
+                'href'     => bp_loggedin_user_url(
+                    array(
+                        'single_item_component' => $custom_friends_slug,
+                        'single_item_action'    => bp_rewrites_get_slug( 'members', 'member_' . $friends_slug . '_requests', 'requests' ),
+                    )
+                ),
                 'position' => 20,
             );