Changeset 13441 for trunk/src/bp-blogs/classes/class-bp-blogs-component.php

Timestamp:

03/23/2023 07:35:38 PM (3 years 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-blogs/classes/class-bp-blogs-component.php (modified) (5 diffs)

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

@@ -219 +219 @@
                 }
 
-                // 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;
                 }
 
                 $slug       = bp_get_blogs_slug();
-                $parent_url = trailingslashit( $user_domain . $slug );
 
                 // Add 'Sites' to the main navigation.
@@ -255 +250 @@
                         'name'            => __( 'My Sites', 'buddypress' ),
                         'slug'            => 'my-sites',
-                        'parent_url'      => $parent_url,
                         'parent_slug'     => $slug,
                         'screen_function' => 'bp_blogs_screen_my_blogs',
@@ -290 +284 @@
 
                         // Setup the logged in user variables.
-                        $blogs_link = trailingslashit( bp_loggedin_user_domain() . bp_get_blogs_slug() );
+                        $blogs_slug        = bp_get_blogs_slug();
+                        $custom_blogs_slug = bp_rewrites_get_slug( 'members', 'member_' . $blogs_slug, $blogs_slug );
 
                         // Add the "Sites" sub menu.
@@ -297 +292 @@
                                 'id'     => 'my-account-' . $this->id,
                                 'title'  => __( 'Sites', 'buddypress' ),
-                                'href'   => $blogs_link
+                                'href'   => bp_loggedin_user_url(
+                                        array(
+                                                'single_item_component' => $custom_blogs_slug,
+                                        )
+                                ),
                         );
 
@@ -305 +304 @@
                                 'id'       => 'my-account-' . $this->id . '-my-sites',
                                 'title'    => __( 'My Sites', 'buddypress' ),
-                                'href'     => trailingslashit( $blogs_link . 'my-sites' ),
-                                'position' => 10
+                                'href'     => bp_loggedin_user_url(
+                                        array(
+                                                'single_item_component' => $custom_blogs_slug,
+                                                'single_item_action'    => bp_rewrites_get_slug( 'members', 'member_' . $blogs_slug . '_my_sites', 'my-sites' ),
+                                        )
+                                ),
+                                'position' => 10,
                         );