From f96d26ff97e05ad539d3de724eafec31a189443d Mon Sep 17 00:00:00 2001 From: Dion Hulse Date: Sat, 2 Oct 2010 04:02:24 +0000 Subject: [PATCH] Retire IIS 3,4,5 Set-Cookie redirection workaround. See [2436] for original implementation. See #10187 git-svn-id: https://develop.svn.wordpress.org/trunk@15682 602fd350-edb4-49c9-b593-d223f7449a82 --- wp-includes/pluggable.php | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/wp-includes/pluggable.php b/wp-includes/pluggable.php index e4073a7fd8..ba13617835 100644 --- a/wp-includes/pluggable.php +++ b/wp-includes/pluggable.php @@ -861,9 +861,8 @@ endif; if ( !function_exists('wp_redirect') ) : /** - * Redirects to another page, with a workaround for the IIS Set-Cookie bug. + * Redirects to another page. * - * @link http://support.microsoft.com/kb/q176113/ * @since 1.5.1 * @uses apply_filters() Calls 'wp_redirect' hook on $location and $status. * @@ -872,8 +871,6 @@ if ( !function_exists('wp_redirect') ) : * @return bool False if $location is not set */ function wp_redirect($location, $status = 302) { - global $is_IIS; - $location = apply_filters('wp_redirect', $location, $status); $status = apply_filters('wp_redirect_status', $status, $location); @@ -882,13 +879,9 @@ function wp_redirect($location, $status = 302) { $location = wp_sanitize_redirect($location); - if ( $is_IIS ) { - header("Refresh: 0;url=$location"); - } else { - if ( php_sapi_name() != 'cgi-fcgi' ) - status_header($status); // This causes problems on IIS and some FastCGI setups - header("Location: $location", true, $status); - } + if ( php_sapi_name() != 'cgi-fcgi' ) + status_header($status); // This causes problems on IIS and some FastCGI setups + header("Location: $location", true, $status); } endif;