Changeset 17549

Timestamp:

03/24/2011 01:18:41 AM (14 years ago)

Author:

dd32

Message:

Reinstate [15462] for 3.1; Prevents canonical redirects for custom rewrite rules for taxonomies. See #16627

File:

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

branches/3.1/wp-includes/canonical.php

@@ -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() ) {