Changeset 3208

Timestamp:

05/24/2011 05:54:19 AM (15 years ago)

Author:

johnjamesjacoby

Message:

Use the raw_url on login redirect if one is passed. Otherwise check if $url both empty or is sending the user to admin_url(), and default to home_url() to prevent users from being bounced into the admin area unexpectedly. See #1530.

File:

• branches/plugin/bbp-includes/bbp-user-functions.php (modified) (1 diff)

branches/plugin/bbp-includes/bbp-user-functions.php

@@ -26 +26 @@
  */
 function bbp_redirect_login( $url = '', $raw_url = '', $user = '' ) {
-    if ( is_wp_error( $user ) )
-        return $url;
-
-    if ( empty( $url ) && !empty( $raw_url ) )
+
+    // Raw redirect_to was passed, so use it
+    if ( !empty( $raw_url ) )
         $url = $raw_url;
 
-    if ( empty( $url ) || $url == admin_url() )
+    // $url was manually set in wp-login.php to redirect to admin
+    elseif ( admin_url() == $url )
         $url = home_url();
 
-    wp_safe_redirect( esc_url( $url ) );
-    exit;
+    // $url is empty
+    elseif ( empty( $url ) )
+        $url = home_url();
+
+    return apply_filters( 'bbp_redirect_login', $url, $raw_url, $user );
 }