Changes from trunk/wp-includes/canonical.php at r17031 to branches/3.1/wp-includes/canonical.php at r17549

File:

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

branches/3.1/wp-includes/canonical.php

@@ -36 +36 @@
  */
 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 )
         return;
 
@@ -151 +151 @@
 
             $obj = $wp_query->get_queried_object();
-            if ( $term_count <= 1 && !empty($obj->term_id) && ( $tax_url = get_term_link((int)$obj->term_id, $obj->taxonomy) ) && !is_wp_error($tax_url) ) {
+            if ( $term_count <= 1 && !empty($obj->term_id) && ( $tax_url = get_term_link((int)$obj->term_id, $obj->taxonomy) ) && !is_wp_error($tax_url) && !empty($redirect['query']) ) {
                 if ( !empty($redirect['query']) ) {
                     if ( is_category() ) {
@@ -196 +196 @@
 
             $addl_path = '';
-            if ( is_feed() ) {
+            if ( is_feed() && in_array( get_query_var('feed'), $wp_rewrite->feeds ) ) {
                 $addl_path = !empty( $addl_path ) ? trailingslashit($addl_path) : '';
                 if ( get_query_var( 'withcomments' ) )