Changeset 5767

Timestamp:

02/13/2012 09:16:47 AM (13 years ago)

Author:

johnjamesjacoby

Message:

Use server info instead of wp_guess_url() in bp_core_no_access(). Fixes #3976. Props lackingpenguin, r-a-y.

File:

• trunk/bp-core/bp-core-catchuri.php (modified) (2 diffs)

trunk/bp-core/bp-core-catchuri.php

@@ -439 +439 @@
 function bp_core_no_access( $args = '' ) {
 
+    // Build the redirect URL 
+    $redirect_url  = is_ssl() ? 'https://' : 'http://';
+    $redirect_url .= $_SERVER['HTTP_HOST'];
+    $redirect_url .= $_SERVER['REQUEST_URI'];
+
     $defaults = array(
-        'mode'     => '1',              // 1 = $root, 2 = wp-login.php
-        'message'  => __( 'You must log in to access the page you requested.', 'buddypress' ),
-        'redirect' => wp_guess_url(),   // the URL you get redirected to when a user successfully logs in
-        'root'     => bp_get_root_domain()  // the landing page you get redirected to when a user doesn't have access
+        'mode'     => '1',                  // 1 = $root, 2 = wp-login.php
+        'redirect' => $redirect_url,        // the URL you get redirected to when a user successfully logs in
+        'root'     => bp_get_root_domain(), // the landing page you get redirected to when a user doesn't have access
+        'message'  => __( 'You must log in to access the page you requested.', 'buddypress' )
     );
 
@@ -460 +465 @@
 
     switch ( $mode ) {
+
         // Option to redirect to wp-login.php
         // Error message is displayed with bp_core_no_access_wp_login_error()
         case 2 :
-            if ( $redirect ) {
-                bp_core_redirect( wp_login_url( $redirect ) . '&action=bpnoaccess' );
+            if ( !empty( $redirect ) ) {
+                bp_core_redirect( add_query_arg( array( 'action' => 'bpnoaccess' ), wp_login_url( $redirect ) ) );
             } else {
                 bp_core_redirect( $root );