Changeset 9062

Timestamp:

10/05/2014 09:54:53 PM (12 years ago)

Author:

djpaul

Message:

Activity: when redirecting unauthenticated users away from a single activity permalink, make sure the value of the redirect_to parameter has been URL encoded.

Also improves the readability of this section of code by moving it out of the ternary operator.

See #5926

File:

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

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

@@ -232 +232 @@
 
                 // Redirect based on logged in status
-                is_user_logged_in() ?
-                        bp_core_redirect( bp_loggedin_user_domain() ) :
-                        bp_core_redirect( site_url( 'wp-login.php?redirect_to=' . esc_url( bp_get_root_domain() . '/' . bp_get_activity_root_slug() . '/p/' . bp_current_action() . '/' ) ) );
+                if ( is_user_logged_in() ) {
+                        $url = bp_loggedin_user_domain();
+
+                } else {
+                        $url = sprintf(
+                                site_url( 'wp-login.php?redirect_to=%s' ),
+                                urlencode( esc_url_raw( bp_activity_get_permalink( (int) bp_current_action() ) ) )
+                        );
+                }
+
+                bp_core_redirect( $url );
         }