From fdf0a096dbafaf7e024357c71069b0b676793557 Mon Sep 17 00:00:00 2001 From: ryan Date: Wed, 2 Mar 2011 15:33:42 +0000 Subject: [PATCH] Do not perform canonical redirects for IISto avoid redirect loops on some IIS setups. fixes #16639 for 3.1 git-svn-id: http://svn.automattic.com/wordpress/branches/3.1@17493 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/canonical.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/wp-includes/canonical.php b/wp-includes/canonical.php index 3641196881..ff8a495dd4 100644 --- a/wp-includes/canonical.php +++ b/wp-includes/canonical.php @@ -35,9 +35,9 @@ * not needed or the string of the URL */ function redirect_canonical( $requested_url = null, $do_redirect = true ) { - global $wp_rewrite, $is_iis7, $wp_query, $wpdb; + global $wp_rewrite, $is_IIS, $wp_query, $wpdb; - if ( is_trackback() || is_search() || is_comments_popup() || is_admin() || !empty($_POST) || is_preview() || is_robots() || ( $is_iis7 && !iis7_supports_permalinks() ) ) + if ( is_trackback() || is_search() || is_comments_popup() || is_admin() || !empty($_POST) || is_preview() || is_robots() || $is_IIS ) return; if ( !$requested_url ) {