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

Timestamp:

04/26/2011 10:49:00 AM (15 years ago)

Author:

dd32

Message:

Allow Taxonomies to be queried by $_GET parameters on non-taxonomy url's. See #17174

File:

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

trunk/wp-includes/canonical.php

@@ -165 +165 @@
                                         }
                                 }
+
+                                $tax_obj = get_taxonomy( $obj->taxonomy );
+                                $tax_query_vars = array_diff( array_keys( $wp_query->query ), array_keys( $_GET ), array( 'taxonomy', 'term', $tax_obj->query_var ) );
+
                                 $tax_url = parse_url($tax_url);
-                                if ( ! empty($tax_url['query']) ) { // Custom taxonomies may only be accessable via ?taxonomy=..&term=..
+                                if ( ! empty($tax_query_vars) ) {
+                                        foreach ( array( 'taxonomy', 'term', $tax_obj->query_var ) as $qv ) {
+                                                if ( !empty($wp_query->query[$qv]) )
+                                                        $redirect['query'] = add_query_arg($qv, $wp_query->query[$qv], $redirect['query']);
+                                        }
+                                                
+                                } elseif ( ! 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']);