Upstream
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

git-svn-id: http://svn.automattic.com/wordpress/trunk@17706 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
dd32 2011-04-26 10:49:00 +00:00
parent d01d27abc4
commit 04e5dc178d
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
wp-includes/canonical.php
View File

@ -164,8 +164,18 @@ function redirect_canonical( $requested_url = null, $do_redirect = true ) {
$redirect['query'] = remove_query_arg( array( 'term', 'taxonomy'), $redirect['query']);
}
}
$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']);
} else { // Taxonomy is accessable via a "pretty-URL"