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

Timestamp:

02/16/2010 09:08:26 AM (15 years ago)

Author:

dd32

Message:

2nd pass at Taxonomy Term canonicalisation. Fix get_term_link() to expect null|false

WP_Error failure from get_term() family. See #12245, #8948

File:

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

trunk/wp-includes/canonical.php

@@ -131 +131 @@
             if ( $redirect_url = get_year_link(get_query_var('year')) )
                 $redirect['query'] = remove_query_arg('year', $redirect['query']);
-        } elseif ( is_category() && !empty($_GET['cat']) && preg_match( '|^[0-9]+$|', $_GET['cat'] ) ) {
-            if ( $redirect_url = get_category_link(get_query_var('cat')) )
-                $redirect['query'] = remove_query_arg('cat', $redirect['query']);
         } elseif ( is_author() && !empty($_GET['author']) && preg_match( '|^[0-9]+$|', $_GET['author'] ) ) {
             $author = get_userdata(get_query_var('author'));
@@ -140 +137 @@
         }
 
-        // redirect sub-terms of taxonomies to their correct urls
-        if ( is_category() || is_tax() ) {
-            if ( is_category() ) {
-                $taxonomy = 'category';
-                $slug = get_query_var('category_name');
-            } else {
-                $taxonomy = get_query_var('taxonomy');
-                $slug = get_query_var('term');
-            }
-            if ( $tax_url = get_term_link($slug, $taxonomy) ) {
+        // Terms (Tags/categories)
+        if ( is_category() || is_tag() || is_tax() ) {
+            $obj = $wp_query->get_queried_object();
+            if ( !empty($obj->term_id) && ( $tax_url = get_term_link((int)$obj->term_id, $obj->taxonomy) ) && !is_wp_error($tax_url) ) {
+
+                $redirect['query'] = remove_query_arg( array( 'category_name', 'tag', 'cat', 'tag_id', 'term', 'taxonomy'), $redirect['query']);
+                if ( 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']);
+                }
+
                 $tax_url = parse_url($tax_url);
-                $redirect['path'] = $tax_url['path'];
+                if ( ! empty($tax_url['query']) ) { // Custom taxonomies may only be accessable via ?taxonomy=..&term=..
+                    parse_str($tax_url['query'], $query_vars);
+                    $redirect['query'] = add_query_arg($query_vars, $redirect['query']);
+                } else { // Taxonomy is accessable via a "pretty-URL"
+                    $redirect['path'] = $tax_url['path'];
+                }
+
             }
         }