Ticket #5737: 5737.01.patch

src/bp-core/bp-core-filters.php

@@ -503 +503 @@
                         if ( is_user_logged_in() ) {
                                 $menu_item->_invalid = true;
                         } else {
-                                $menu_item->url = wp_login_url( wp_guess_url() );
+                                $menu_item->url = wp_login_url( bp_get_requested_url() );
                         }
 
                         break;
@@ -512 +512 @@
                         if ( ! is_user_logged_in() ) {
                                 $menu_item->_invalid = true;
                         } else {
-                                $menu_item->url = wp_logout_url( wp_guess_url() );
+                                $menu_item->url = wp_logout_url( bp_get_requested_url() );
                         }
 
                         break;

src/bp-core/bp-core-widgets.php

@@ -69 +69 @@
 
                         <div class="bp-login-widget-user-links">
                                 <div class="bp-login-widget-user-link"><?php echo bp_core_get_userlink( bp_loggedin_user_id() ); ?></div>
-                                <div class="bp-login-widget-user-logout"><a class="logout" href="<?php echo wp_logout_url( wp_guess_url() ); ?>"><?php _e( 'Log Out', 'buddypress' ); ?></a></div>
+                                <div class="bp-login-widget-user-logout"><a class="logout" href="<?php echo wp_logout_url( bp_get_requested_url() ); ?>"><?php _e( 'Log Out', 'buddypress' ); ?></a></div>
                         </div>
 
                         <?php do_action( 'bp_after_login_widget_loggedin' ); ?>

src/bp-members/bp-members-adminbar.php

@@ -51 +51 @@
                 $wp_admin_bar->add_menu( array(
                         'id'    => 'bp-login',
                         'title' => __( 'Log in', 'buddypress' ),
-                        'href'  => wp_login_url( wp_guess_url() )
+                        'href'  => wp_login_url( bp_get_requested_url() )
                 ) );
 
                 // Sign up