Ticket #1580: 1580.01.patch

bbpress/bbp-includes/bbp-common-functions.php

@@ -887 +887 @@
 function bbp_logout_url( $url = '', $redirect_to = '' ) {
 
         // Rejig the $redirect_to
-        if ( !isset( $_SERVER['REDIRECT_URL'] ) || ( !$redirect_to = home_url( $_SERVER['REDIRECT_URL'] ) ) )
+        if ( !isset( $_SERVER['REDIRECT_URL'] ) || ( $redirect_to != wp_guess_url() ) )
                 $redirect_to = isset( $_SERVER['HTTP_REFERER'] ) ? $_SERVER['HTTP_REFERER'] : '';
 
         // Make sure we are directing somewhere
-        if ( empty( $redirect_to ) )
+        if ( empty( $redirect_to ) ) {
                 $redirect_to = home_url( isset( $_SERVER['REQUEST_URI'] ) ? $_SERVER['REQUEST_URI'] : '' );
 
-        // Sanitize $redirect_to and add it to full $url
-        $redirect_to = esc_url( add_query_arg( array( 'loggedout'   => 'true'       ), $redirect_to ) );
-        $url         =          add_query_arg( array( 'redirect_to' => $redirect_to ), $url           );
+                // Sanitize $redirect_to and add it to full $url
+                $redirect_to = esc_url( add_query_arg( array( 'loggedout'   => 'true'       ), $redirect_to ) );
+                $url         =          add_query_arg( array( 'redirect_to' => $redirect_to ), $url           );
+        }
 
         // Filter and return
         return apply_filters( 'bbp_logout_url', $url, $redirect_to );
@@ -951 +952 @@
 
                                 // Get any existing meta queries
                                 $meta_query   = $posts_query->get( 'meta_query' );
-                                
+
                                 // Add our meta query to existing
                                 $meta_query[] = $forum_ids;