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

Timestamp:

10/04/2010 10:37:25 AM (15 years ago)

Author:

dd32

Message:

Introduce hierarchical taxonomy URL's, Can be enabled by setting 'hierarchical_url' to true upon taxonomy registration. See #12659

File:

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

trunk/wp-includes/canonical.php

@@ -155 +155 @@
 
             $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) && $redirect['query'] ) {
-                if ( is_category() ) {
-                    $redirect['query'] = remove_query_arg( array( 'category_name', 'category', 'cat'), $redirect['query']);
-                } elseif ( is_tag() ) {
-                    $redirect['query'] = remove_query_arg( array( 'tag', 'tag_id'), $redirect['query']);
-                } elseif ( is_tax() ) { // Custom taxonomies will have a custom query var, remove those too:
-                    $tax = get_taxonomy( $obj->taxonomy );
-                    if ( false !== $tax->query_var)
-                        $redirect['query'] = remove_query_arg($tax->query_var, $redirect['query']);
-                    else
-                        $redirect['query'] = remove_query_arg( array( 'term', 'taxonomy'), $redirect['query']);
+            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 ( !empty($redirect['query']) ) {
+                    if ( is_category() ) {
+                        $redirect['query'] = remove_query_arg( array( 'category_name', 'category', 'cat'), $redirect['query']);
+                    } elseif ( is_tag() ) {
+                        $redirect['query'] = remove_query_arg( array( 'tag', 'tag_id'), $redirect['query']);
+                    } elseif ( is_tax() ) { // Custom taxonomies will have a custom query var, remove those too:
+                        $tax = get_taxonomy( $obj->taxonomy );
+                        if ( false !== $tax->query_var)
+                            $redirect['query'] = remove_query_arg($tax->query_var, $redirect['query']);
+                        else
+                            $redirect['query'] = remove_query_arg( array( 'term', 'taxonomy'), $redirect['query']);
+                    }
                 }
-
                 $tax_url = parse_url($tax_url);
                 if ( ! empty($tax_url['query']) ) { // Custom taxonomies may only be accessable via ?taxonomy=..&term=..
@@ -177 +176 @@
                     $redirect['path'] = $tax_url['path'];
                 }
-
             }
         } elseif ( is_single() && strpos($wp_rewrite->permalink_structure, '%category%') !== false ) {