Changeset 21215 for trunk/wp-includes/canonical.php

Timestamp:

07/05/2012 07:59:35 PM (12 years ago)

Author:

markjaquith

Message:

Implement the IIS logic test that #16639 should have gotten back in the day, before it was disabled altogether. IIS canonical redirects now only supported for pretty permalink–supporting IIS7 installs. props nacin. fixes #20484. see #16639

File:

• trunk/wp-includes/canonical.php (modified) (1 diff)

trunk/wp-includes/canonical.php

@@ -38 +38 @@
  */
 function redirect_canonical( $requested_url = null, $do_redirect = true ) {
-    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() ) )
+    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 && !iis7_supports_permalinks() ) )
         return;