Changeset 13441 for trunk/src/bp-friends/screens/requests.php

Timestamp:

03/23/2023 07:35:38 PM (19 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/screens/requests.php (modified) (3 diffs)

trunk/src/bp-friends/screens/requests.php

@@ -14 +14 @@
  */
 function friends_screen_requests() {
+    $redirect = false;
+
     if ( bp_is_action_variable( 'accept', 0 ) && is_numeric( bp_action_variable( 1 ) ) ) {
         // Check the nonce.
         check_admin_referer( 'friends_accept_friendship' );
 
-        if ( friends_accept_friendship( bp_action_variable( 1 ) ) )
+        if ( friends_accept_friendship( bp_action_variable( 1 ) ) ) {
             bp_core_add_message( __( 'Friendship accepted', 'buddypress' ) );
-        else
+        } else {
             bp_core_add_message( __( 'Friendship could not be accepted', 'buddypress' ), 'error' );
+        }
 
-        bp_core_redirect( trailingslashit( bp_loggedin_user_domain() . bp_current_component() . '/' . bp_current_action() ) );
+        $redirect = true;
 
     } elseif ( bp_is_action_variable( 'reject', 0 ) && is_numeric( bp_action_variable( 1 ) ) ) {
@@ -29 +32 @@
         check_admin_referer( 'friends_reject_friendship' );
 
-        if ( friends_reject_friendship( bp_action_variable( 1 ) ) )
+        if ( friends_reject_friendship( bp_action_variable( 1 ) ) ) {
             bp_core_add_message( __( 'Friendship rejected', 'buddypress' ) );
-        else
+        } else {
             bp_core_add_message( __( 'Friendship could not be rejected', 'buddypress' ), 'error' );
+        }
 
-        bp_core_redirect( trailingslashit( bp_loggedin_user_domain() . bp_current_component() . '/' . bp_current_action() ) );
+        $redirect = true;
 
     } elseif ( bp_is_action_variable( 'cancel', 0 ) && is_numeric( bp_action_variable( 1 ) ) ) {
@@ -40 +44 @@
         check_admin_referer( 'friends_withdraw_friendship' );
 
-        if ( friends_withdraw_friendship( bp_loggedin_user_id(), bp_action_variable( 1 ) ) )
+        if ( friends_withdraw_friendship( bp_loggedin_user_id(), bp_action_variable( 1 ) ) ) {
             bp_core_add_message( __( 'Friendship request withdrawn', 'buddypress' ) );
-        else
+        } else {
             bp_core_add_message( __( 'Friendship request could not be withdrawn', 'buddypress' ), 'error' );
+        }
 
-        bp_core_redirect( trailingslashit( bp_loggedin_user_domain() . bp_current_component() . '/' . bp_current_action() ) );
+        $redirect = true;
+    }
+
+    if ( $redirect ) {
+        $friends_slug = bp_get_friends_slug();
+
+        bp_core_redirect(
+            bp_loggedin_user_url(
+                array(
+                    'single_item_component' => bp_rewrites_get_slug( 'members', 'member_' . $friends_slug, $friends_slug ),
+                    'single_item_action'    => bp_rewrites_get_slug( 'members', 'member_' . $friends_slug . '_requests', 'requests' ),
+                )
+            )
+        );
     }