From 9b8ca25445dbc3122a23ba3a15a2d74ec56e97b0 Mon Sep 17 00:00:00 2001
From: markjaquith <markjaquith@1a063a9b-81f0-0310-95a4-ce76da25c4cd>
Date: Thu, 5 Jul 2012 19:59:35 +0000
Subject: [PATCH] =?UTF-8?q?Implement=20the=20IIS=20logic=20test=20that=20#?=
 =?UTF-8?q?16639=20should=20have=20gotten=20back=20in=20the=20day,=20befor?=
 =?UTF-8?q?e=20it=20was=20disabled=20altogether.=20IIS=20canonical=20redir?=
 =?UTF-8?q?ects=20now=20only=20supported=20for=20pretty=20permalink?=
 =?UTF-8?q?=E2=80=93supporting=20IIS7=20installs.=20props=20nacin.=20fixes?=
 =?UTF-8?q?=20#20484.=20see=20#16639?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: http://core.svn.wordpress.org/trunk@21215 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 77a523923e..36b28c6d89 100644
--- a/wp-includes/canonical.php
+++ b/wp-includes/canonical.php
@@ -37,9 +37,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 && !iis7_supports_permalinks() ) )
 		return;
 
 	if ( !$requested_url ) {