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

Timestamp:

03/23/2023 07:35:38 PM (22 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-activity/classes/class-bp-activity-component.php (modified) (13 diffs)

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

@@ -255 +255 @@
         }
 
-        // 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 {
-            return;
-        }
-
-        $slug          = bp_get_activity_slug();
-        $activity_link = trailingslashit( $user_domain . $slug );
+        $slug = bp_get_activity_slug();
 
         // Add 'Activity' to the main navigation.
@@ -281 +271 @@
             'name'            => _x( 'Personal', 'Profile activity screen sub nav', 'buddypress' ),
             'slug'            => 'just-me',
-            'parent_url'      => $activity_link,
             'parent_slug'     => $slug,
             'screen_function' => 'bp_activity_screen_my_activity',
@@ -292 +281 @@
                 'name'            => _x( 'Mentions', 'Profile activity screen sub nav', 'buddypress' ),
                 'slug'            => 'mentions',
-                'parent_url'      => $activity_link,
                 'parent_slug'     => $slug,
                 'screen_function' => 'bp_activity_screen_mentions',
@@ -305 +293 @@
                 'name'            => _x( 'Favorites', 'Profile activity screen sub nav', 'buddypress' ),
                 'slug'            => 'favorites',
-                'parent_url'      => $activity_link,
                 'parent_slug'     => $slug,
                 'screen_function' => 'bp_activity_screen_favorites',
@@ -318 +305 @@
                 'name'            => _x( 'Friends', 'Profile activity screen sub nav', 'buddypress' ),
                 'slug'            => bp_get_friends_slug(),
-                'parent_url'      => $activity_link,
                 'parent_slug'     => $slug,
                 'screen_function' => 'bp_activity_screen_friends',
@@ -331 +317 @@
                 'name'            => _x( 'Groups', 'Profile activity screen sub nav', 'buddypress' ),
                 'slug'            => bp_get_groups_slug(),
-                'parent_url'      => $activity_link,
                 'parent_slug'     => $slug,
                 'screen_function' => 'bp_activity_screen_groups',
@@ -359 +344 @@
 
             // Setup the logged in user variables.
-            $activity_link = trailingslashit( bp_loggedin_user_domain() . bp_get_activity_slug() );
+            $activity_slug        = bp_get_activity_slug();
+            $custom_activity_slug = bp_rewrites_get_slug( 'members', 'member_' . $activity_slug, $activity_slug );
 
             // Unread message count.
@@ -380 +366 @@
                 'id'     => 'my-account-' . $this->id,
                 'title'  => _x( 'Activity', 'My Account Activity sub nav', 'buddypress' ),
-                'href'   => $activity_link
+                'href'   => bp_loggedin_user_url(
+                    array(
+                        'single_item_component' => $custom_activity_slug,
+                    )
+                ),
             );
 
@@ -388 +378 @@
                 'id'       => 'my-account-' . $this->id . '-personal',
                 'title'    => _x( 'Personal', 'My Account Activity sub nav', 'buddypress' ),
-                'href'     => trailingslashit( $activity_link . 'just-me' ),
-                'position' => 10
+                'href'     => bp_loggedin_user_url(
+                    array(
+                        'single_item_component' => $custom_activity_slug,
+                        'single_item_action'    => bp_rewrites_get_slug( 'members', 'member_' . $activity_slug . '_just_me', 'just-me' ),
+                    )
+                ),
+                'position' => 10,
             );
 
@@ -398 +393 @@
                     'id'       => 'my-account-' . $this->id . '-mentions',
                     'title'    => $title,
-                    'href'     => trailingslashit( $activity_link . 'mentions' ),
-                    'position' => 20
+                    'href'     => bp_loggedin_user_url(
+                        array(
+                            'single_item_component' => $custom_activity_slug,
+                            'single_item_action'    => bp_rewrites_get_slug( 'members', 'member_' . $activity_slug . '_mentions', 'mentions' ),
+                        )
+                    ),
+                    'position' => 20,
                 );
             }
@@ -409 +409 @@
                     'id'       => 'my-account-' . $this->id . '-favorites',
                     'title'    => _x( 'Favorites', 'My Account Activity sub nav', 'buddypress' ),
-                    'href'     => trailingslashit( $activity_link . 'favorites' ),
-                    'position' => 30
+                    'href'     => bp_loggedin_user_url(
+                        array(
+                            'single_item_component' => $custom_activity_slug,
+                            'single_item_action'    => bp_rewrites_get_slug( 'members', 'member_' . $activity_slug . '_favorites', 'favorites' ),
+                        )
+                    ),
+                    'position' => 30,
                 );
             }
@@ -416 +421 @@
             // Friends?
             if ( bp_is_active( 'friends' ) ) {
+                $friends_slug   = bp_get_friends_slug();
                 $wp_admin_nav[] = array(
                     'parent'   => 'my-account-' . $this->id,
                     'id'       => 'my-account-' . $this->id . '-friends',
                     'title'    => _x( 'Friends', 'My Account Activity sub nav', 'buddypress' ),
-                    'href'     => trailingslashit( $activity_link . bp_get_friends_slug() ),
-                    'position' => 40
+                    'href'     => bp_loggedin_user_url(
+                        array(
+                            'single_item_component' => $custom_activity_slug,
+                            'single_item_action'    => bp_rewrites_get_slug( 'members', 'member_' . $activity_slug . '_' . $friends_slug, $friends_slug ),
+                        )
+                    ),
+                    'position' => 40,
                 );
             }
@@ -427 +438 @@
             // Groups?
             if ( bp_is_active( 'groups' ) ) {
+                $groups_slug    = bp_get_groups_slug();
                 $wp_admin_nav[] = array(
                     'parent'   => 'my-account-' . $this->id,
                     'id'       => 'my-account-' . $this->id . '-groups',
                     'title'    => _x( 'Groups', 'My Account Activity sub nav', 'buddypress' ),
-                    'href'     => trailingslashit( $activity_link . bp_get_groups_slug() ),
+                    'href'     => bp_loggedin_user_url(
+                        array(
+                            'single_item_component' => $custom_activity_slug,
+                            'single_item_action'    => bp_rewrites_get_slug( 'members', 'member_' . $activity_slug . '_' . $groups_slug, $groups_slug ),
+                        )
+                    ),
                     'position' => 50
                 );