Changeset 13441 for trunk/src/bp-friends/bp-friends-notifications.php

Timestamp:

03/23/2023 07:35:38 PM (4 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-friends/bp-friends-notifications.php (modified) (2 diffs)

trunk/src/bp-friends/bp-friends-notifications.php

@@ -29 +29 @@
  */
 function friends_format_notifications( $action, $item_id, $secondary_item_id, $total_items, $format = 'string' ) {
+        $friends_slug        = bp_get_friends_slug();
+        $custom_friends_slug = bp_rewrites_get_slug( 'members', 'member_' . $friends_slug, $friends_slug );
 
         switch ( $action ) {
                 case 'friendship_accepted':
-                        $link = trailingslashit( bp_loggedin_user_domain() . bp_get_friends_slug() . '/my-friends' );
+                        $link = 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' ),
+                                )
+                        );
 
                         // $action and $amount are used to generate dynamic filter names.
@@ -51 +58 @@
 
                 case 'friendship_request':
-                        $link = bp_loggedin_user_domain() . bp_get_friends_slug() . '/requests/?new';
+                        $link = add_query_arg(
+                                'new',
+                                1,
+                                bp_loggedin_user_url(
+                                        array(
+                                                'single_item_component' => $custom_friends_slug,
+                                                'single_item_action'    => bp_rewrites_get_slug( 'members', 'member_' . $friends_slug . '_requests', 'requests' ),
+                                        )
+                                )
+                        );
 
                         $action = 'request';