Changeset 8680

Timestamp:

07/23/2014 07:16:53 PM (10 years ago)

Author:

r-a-y

Message:

Replace wp_guess_url() with bp_get_requested_url().

wp_guess_url() doesn't work well with subdirectory installs and anyway,
bp_get_requested_url() is superior!

Fixes #5737.

Location:

trunk/src

Files:

• bp-core/bp-core-filters.php (modified) (2 diffs)
• bp-core/bp-core-widgets.php (modified) (1 diff)
• bp-members/bp-members-adminbar.php (modified) (1 diff)

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

@@ -504 +504 @@
                 $menu_item->_invalid = true;
             } else {
-                $menu_item->url = wp_login_url( wp_guess_url() );
+                $menu_item->url = wp_login_url( bp_get_requested_url() );
             }
 
@@ -513 +513 @@
                 $menu_item->_invalid = true;
             } else {
-                $menu_item->url = wp_logout_url( wp_guess_url() );
+                $menu_item->url = wp_logout_url( bp_get_requested_url() );
             }
 

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

@@ -70 +70 @@
             <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>
 

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

@@ -52 +52 @@
             'id'    => 'bp-login',
             'title' => __( 'Log in', 'buddypress' ),
-            'href'  => wp_login_url( wp_guess_url() )
+            'href'  => wp_login_url( bp_get_requested_url() )
         ) );