Changeset 21207

Timestamp:

07/05/2012 01:23:39 PM (12 years ago)

Author:

markjaquith

Message:

Reënable canonical redirects for IIS. Let's work out any remaining bugs in this cycle. fixes #20484. reverts [17492]. see #16639

File:

• trunk/wp-includes/canonical.php (modified) (3 diffs)

trunk/wp-includes/canonical.php

@@ -19 +19 @@
  *
  * Prevents redirection for feeds, trackbacks, searches, comment popup, and
- * admin URLs. Does not redirect on IIS, page/post previews, and on form data.
+ * admin URLs. Does not redirect on non-pretty-permalink-supporting IIS 7, 
+ * page/post previews, WP admin, Trackbacks, robots.txt, searches, or on POST
+ * requests.
  *
  * Will also attempt to find the correct link when a user enters a URL that does
@@ -27 +29 @@
  * @since 2.3.0
  * @uses $wp_rewrite
- * @uses $is_IIS
+ * @uses $is_iis7
  *
  * @param string $requested_url Optional. The URL that was requested, used to
@@ -36 +38 @@
  */
 function redirect_canonical( $requested_url = null, $do_redirect = true ) {
-    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_IIS )
+    global $wp_rewrite, $is_iis7, $wp_query, $wpdb;
+
+    if ( is_trackback() || is_search() || is_comments_popup() || is_admin() || !empty($_POST) || is_preview() || is_robots() || ( $is_iis7 && !iis7_supports_permalinks() ) )
         return;