Changeset 2436

Timestamp:

03/13/2005 04:36:09 PM (20 years ago)

Author:

ryan

Message:

Introducing wp_redirect(), first cut. ​http://mosquito.wordpress.org/view.php?id=592 Props: Toby Simmons

Location:

trunk

Files:

• wp-admin/link-manager.php (modified) (2 diffs)
• wp-admin/options.php (modified) (1 diff)
• wp-admin/profile.php (modified) (1 diff)
• wp-comments-post.php (modified) (1 diff)
• wp-includes/functions.php (modified) (1 diff)
• wp-includes/vars.php (modified) (1 diff)
• wp-login.php (modified) (1 diff)
• wp-pass.php (modified) (1 diff)

trunk/wp-admin/link-manager.php

@@ -244 +244 @@
     } // 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
@@ -268 +268 @@
     $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

trunk/wp-admin/options.php

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

trunk/wp-admin/profile.php

@@ -87 +87 @@
     $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;
 

trunk/wp-comments-post.php

@@ -53 +53 @@
 $location = (empty($_POST['redirect_to'])) ? $_SERVER["HTTP_REFERER"] : $_POST['redirect_to']; 
 
-header("Location: $location");
-
+wp_redirect($location);
 ?>

trunk/wp-includes/functions.php

@@ -1712 +1712 @@
 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;

trunk/wp-includes/vars.php

@@ -36 +36 @@
 // 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

trunk/wp-login.php

@@ -185 +185 @@
             }
             do_action('wp_login', $user_login);
-            header("Location: $redirect_to");
+            wp_redirect($redirect_to);
             exit();
         } else {

trunk/wp-pass.php

@@ -8 +8 @@
 setcookie('wp-postpass_' . COOKIEHASH, $_POST['post_password'], time() + 864000, COOKIEPATH);
 
-header('Location: ' . $_SERVER['HTTP_REFERER']);
-
+wp_redirect($_SERVER['HTTP_REFERER']);
 ?>