Changeset 6131

Timestamp:

09/18/2007 10:23:16 PM (17 years ago)

Author:

markjaquith

Message:

Introducing wp_safe_redirect(). fixes #4606 for trunk

Location:

trunk

Files:

• wp-includes/pluggable.php (modified) (1 diff)
• wp-login.php (modified) (2 diffs)
• wp-pass.php (modified) (1 diff)

trunk/wp-includes/pluggable.php

@@ -397 +397 @@
         header("Location: $location");
     }
+}
+endif;
+
+if ( !function_exists('wp_safe_redirect') ) :
+/**
+ * performs a safe (local) redirect, using wp_redirect()
+ * @return void
+ **/
+function wp_safe_redirect($location, $status = 302) {
+    if ( $location{0} == '/' ) {
+        if ( $location{1} == '/' )
+            $location = get_option('home') . '/';
+    } else {
+        if ( substr($location, 0, strlen(get_option('home'))) != get_option('home') )
+            $location = get_option('home') . '/';
+    }
+
+    wp_redirect($location, $status);
 }
 endif;

trunk/wp-login.php

@@ -79 +79 @@
         $redirect_to = $_REQUEST['redirect_to'];
 
-    wp_redirect($redirect_to);
+    wp_safe_redirect($redirect_to);
     exit();
 
@@ -325 +325 @@
                 wp_setcookie($user_login, $user_pass, false, '', '', $rememberme);
             do_action('wp_login', $user_login);
-            wp_redirect($redirect_to);
+            wp_safe_redirect($redirect_to);
             exit();
         } else {

trunk/wp-pass.php

@@ -8 +8 @@
 setcookie('wp-postpass_' . COOKIEHASH, $_POST['post_password'], time() + 864000, COOKIEPATH);
 
-wp_redirect(wp_get_referer());
+wp_safe_redirect(wp_get_referer());
 ?>