Ticket #592: redirect.diff

wp-pass.php

@@ -7 +7 @@
 // 10 days
 setcookie('wp-postpass_' . COOKIEHASH, $_POST['post_password'], time() + 864000, COOKIEPATH);
 
-header('Location: ' . $_SERVER['HTTP_REFERER']);
-
+wp_redirect($_SERVER['HTTP_REFERER']);
 ?>
+ No newline at end of file

wp-login.php

@@ -184 +184 @@
                                 wp_setcookie($user_login, $user_pass);
                         }
                         do_action('wp_login', $user_login);
-                        header("Location: $redirect_to");
+                        wp_redirect($redirect_to);
                         exit();
                 } else {
                         if ($using_cookie)                      

wp-comments-post.php

@@ -52 +52 @@
 
 $location = (empty($_POST['redirect_to'])) ? $_SERVER["HTTP_REFERER"] : $_POST['redirect_to']; 
 
-header("Location: $location");
-
+wp_redirect($location);
 ?>
+ No newline at end of file

wp-includes/functions.php

@@ -1711 +1711 @@
 }
 endif;
 
+// Cookie safe redirect.  Works around IIS Set-Cookie bug.
+// http://support.microsoft.com/kb/q176113/
+if ( !function_exists('wp_redirect') ) :
+function wp_redirect($location) {
+        global $is_IIS;
+
+        if ($is_IIS)
+                header("Refresh: 0;url=$location");
+        else
+                header("Location: $location");
+}
+endif;
+
 function is_plugin_page() {
         global $plugin_page;
 

wp-includes/vars.php

@@ -35 +35 @@
 
 // Server detection
 $is_apache = strstr($_SERVER['SERVER_SOFTWARE'], 'Apache') ? 1 : 0;
+$is_IIS = strstr($_SERVER['SERVER_SOFTWARE'], 'Microsoft-IIS') ? 1 : 0;
 
 // if the config file does not provide the smilies array, let's define it here
 if (!isset($wpsmiliestrans)) {

wp-admin/options.php

@@ -84 +84 @@
                 $referred = remove_query_arg('updated' , $_SERVER['HTTP_REFERER']);
                 $goback = add_query_arg('updated', 'true', $_SERVER['HTTP_REFERER']);
                 $goback = preg_replace('|[^a-z0-9-~+_.?#=&;,/:]|i', '', $goback);
-    header('Location: ' . $goback);
+                wp_redirect($goback);
     break;
 
 default:

wp-admin/profile.php

@@ -86 +86 @@
 
         $result = $wpdb->query("UPDATE $wpdb->users SET user_firstname='$newuser_firstname', $updatepassword user_lastname='$newuser_lastname', user_nickname='$newuser_nickname', user_icq='$newuser_icq', user_email='$newuser_email', user_url='$newuser_url', user_aim='$newuser_aim', user_msn='$newuser_msn', user_yim='$newuser_yim', user_idmode='$newuser_idmode', user_description = '$user_description', user_nicename = '$newuser_nicename' WHERE ID = $user_ID");
 
-        header('Location: profile.php?updated=true');
+        wp_redirect('profile.php?updated=true');
 break;
 
 case 'IErightclick':

wp-admin/link-manager.php

@@ -243 +243 @@
           WHERE link_id=$link_id");
     } // end if save
     setcookie('links_show_cat_id_' . COOKIEHASH, $links_show_cat_id, time()+600);
-    header('Location: ' . $this_file);
+    wp_redirect($this_file);
     break;
   } // end Save
 
@@ -267 +267 @@
     }
     $links_show_cat_id = $cat_id;
     setcookie('links_show_cat_id_' . COOKIEHASH, $links_show_cat_id, time()+600);
-    header('Location: '.$this_file);
+    wp_redirect($this_file);
     break;
   } // end Delete