Changeset 6440

Timestamp:

10/22/2012 07:24:55 AM (12 years ago)

Author:

johnjamesjacoby

Message:

Cleane up bp_core_redirect() to use wp_safe_redirect() instead of wp_redirect().

File:

• trunk/bp-core/bp-core-functions.php (modified) (1 diff)

trunk/bp-core/bp-core-functions.php

@@ -573 +573 @@
  *
  * @package BuddyPress Core
- * @global BuddyPress $bp Makes sure that there are no conflicts with
- *                         status_header() called in bp_core_do_catch_uri()
- * @uses wp_redirect()
+ * @uses wp_safe_redirect()
  */
 function bp_core_redirect( $location, $status = 302 ) {
-    global $bp;
-
-    // On some setups, passing the value of wp_get_referer() may result in an empty value for
-    // $location, which results in an error. Ensure that we have a valid URL.
-    if ( empty( $location ) ) {
+
+    // On some setups, passing the value of wp_get_referer() may result in an
+    // empty value for $location, which results in an error. Ensure that we
+    // have a valid URL.
+    if ( empty( $location ) )
         $location = bp_get_root_domain();
-    }
-
-    // Make sure we don't call status_header() in bp_core_do_catch_uri()
-    // as this conflicts with wp_redirect()
-    $bp->no_status_set = true;
-
-    wp_redirect( $location, $status );
+
+    // Make sure we don't call status_header() in bp_core_do_catch_uri() as this
+    // conflicts with wp_redirect() and wp_safe_redirect().
+    buddypress()->no_status_set = true;
+
+    wp_safe_redirect( $location, $status );
     die;
 }