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

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

@@ -197 +197 @@
     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_messages_slug();
-        $messages_link = trailingslashit( $user_domain . $slug );
+        $access = bp_core_can_edit_settings();
+        $slug   = bp_get_messages_slug();
 
         // Only grab count if we're on a user page and current user has access.
@@ -242 +237 @@
             'name'            => __( 'Inbox', 'buddypress' ),
             'slug'            => 'inbox',
-            'parent_url'      => $messages_link,
             'parent_slug'     => $slug,
             'screen_function' => 'messages_screen_inbox',
@@ -253 +247 @@
                 'name'            => __( 'Starred', 'buddypress' ),
                 'slug'            => bp_get_messages_starred_slug(),
-                'parent_url'      => $messages_link,
                 'parent_slug'     => $slug,
                 'screen_function' => 'bp_messages_star_screen',
@@ -264 +257 @@
             'name'            => __( 'Sent', 'buddypress' ),
             'slug'            => 'sentbox',
-            'parent_url'      => $messages_link,
             'parent_slug'     => $slug,
             'screen_function' => 'messages_screen_sentbox',
@@ -275 +267 @@
             'name'            => __( 'Compose', 'buddypress' ),
             'slug'            => 'compose',
-            'parent_url'      => $messages_link,
             'parent_slug'     => $slug,
             'screen_function' => 'messages_screen_compose',
@@ -286 +277 @@
             'name'            => __( 'Notices', 'buddypress' ),
             'slug'            => 'notices',
-            'parent_url'      => $messages_link,
             'parent_slug'     => $slug,
             'screen_function' => 'messages_screen_notices',