Ticket #42108: pass_the_return_from_wp_redirect_on.patch

wp-includes/pluggable.php

@@ -1261 +1261 @@
 }
 endif;
 
-if ( !function_exists('wp_safe_redirect') ) :
+if ( ! function_exists( 'wp_safe_redirect' ) ) :
 /**
  * Performs a safe (local) redirect, using wp_redirect().
  *
@@ -1276 +1276 @@
  * @since 2.3.0
  *
  * @param string $location The path to redirect to.
- * @param int    $status   Status code to use.
+ * @param int $status Status code to use.
+ *
+ * @return bool $redirect   Pass the return from wp_redirect on
  */
-function wp_safe_redirect($location, $status = 302) {
+function wp_safe_redirect( $location, $status = 302 ) {
 
         // Need to look at the URL the way it will end up in wp_redirect()
-        $location = wp_sanitize_redirect($location);
+        $location = wp_sanitize_redirect( $location );
 
         /**
          * Filters the redirect fallback URL for when the provided redirect is not safe (local).
@@ -1289 +1291 @@
          * @since 4.3.0
          *
          * @param string $fallback_url The fallback URL to use by default.
-         * @param int    $status       The redirect status.
+         * @param int $status The redirect status.
          */
         $location = wp_validate_redirect( $location, apply_filters( 'wp_safe_redirect_fallback', admin_url(), $status ) );
 
-        wp_redirect($location, $status);
+        return wp_redirect( $location, $status );
 }
 endif;