Changeset 13714 for trunk/src/bp-activity/screens/permalink.php

Timestamp:

01/27/2024 03:30:30 AM (11 months ago)

Author:

imath

Message:

Ensure single activity permalink router is reliable with plain links

When building the URL to redirect a single activity request to the member's activity single view, make sure to remove potential BP URI query variables relative to the Activity component before trying to transport extra query variables to the redirect URL.

Props johnjamesjacoby

See #9082
Closes ​https://github.com/buddypress/buddypress/pull/225

File:

• trunk/src/bp-activity/screens/permalink.php (modified) (1 diff)

trunk/src/bp-activity/screens/permalink.php

@@ -63 +63 @@
     }
 
-    // If set, add the original query string back onto the redirect URL.
-    if ( ! empty( $_SERVER['QUERY_STRING'] ) ) {
+    // Make sure current BP URI query variables are removed.
+    $current_url = remove_query_arg( array( 'bp_activities', 'bp_activity_action', 'bp_activity_action_variables' ) );
+    $extra_args  = wp_parse_url( $current_url, PHP_URL_QUERY );
+
+    // If there are query variables left, add them back onto the redirect URL.
+    if ( $extra_args ) {
         $query_frags = array();
-        wp_parse_str( $_SERVER['QUERY_STRING'], $query_frags );
+        wp_parse_str( $extra_args, $query_frags );
+
+        // Add extra arguments to the redirect URL.
         $redirect = add_query_arg( urlencode_deep( $query_frags ), $redirect );
     }