Changeset 6835

Timestamp:

07/05/2018 06:25:04 PM (7 years ago)

Author:

johnjamesjacoby

Message:

Login: Do not prematurely escape $redirect_to in bbp_logout_url().

This change fixes a bug causing the redirect URL to be escaped before it's encoded.

Props nevis2us. Fixes #3199.

File:

• trunk/src/includes/common/functions.php (modified) (1 diff)

trunk/src/includes/common/functions.php

@@ -1446 +1446 @@
 
     // Make sure we are directing somewhere
-    if ( empty( $redirect_to ) && !strstr( $url, 'redirect_to' ) ) {
+    if ( empty( $redirect_to ) && ! strstr( $url, 'redirect_to' ) ) {
 
         // Rejig the $redirect_to
         if ( ! isset( $_SERVER['REDIRECT_URL'] ) || ( $redirect_to !== home_url( $_SERVER['REDIRECT_URL'] ) ) ) {
-            $redirect_to = isset( $_SERVER['HTTP_REFERER'] ) ? $_SERVER['HTTP_REFERER'] : '';
+            $redirect_to = isset( $_SERVER['HTTP_REFERER'] )
+                ? $_SERVER['HTTP_REFERER']
+                : '';
         }
 
+        // Rebuild a basic redirect URL
         $redirect_to = bbp_get_url_scheme() . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'];
 
         // Sanitize $redirect_to and add it to full $url
-        $redirect_to = add_query_arg( array( 'loggedout'   => 'true'                    ), esc_url( $redirect_to ) );
-        $url         = add_query_arg( array( 'redirect_to' => urlencode( $redirect_to ) ), $url                    );
+        $redirect_to = add_query_arg( array( 'loggedout'   => 'true'                    ), $redirect_to );
+        $url         = add_query_arg( array( 'redirect_to' => urlencode( $redirect_to ) ), $url         );
     }