From 66d34fa7102fbb40fec19b15f9902c0effa6b18f Mon Sep 17 00:00:00 2001 From: ryan Date: Sat, 20 Nov 2010 21:43:19 +0000 Subject: [PATCH] array_unique() category__in and category__not_in to eliminate dupes from multiple runs of parse_tax_query(). Fixes canonical redirects for cat, category__in, and category__not_in requests. see #12891 #15487 git-svn-id: http://svn.automattic.com/wordpress/trunk@16513 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-blog-header.php | 1 + wp-includes/query.php | 2 ++ 2 files changed, 3 insertions(+) diff --git a/wp-blog-header.php b/wp-blog-header.php index 0f7118f3c1..7120010419 100644 --- a/wp-blog-header.php +++ b/wp-blog-header.php @@ -12,6 +12,7 @@ if ( !isset($wp_did_header) ) { require_once( dirname(__FILE__) . '/wp-load.php' ); wp(); +//echo '
';  print_r($wp_query); echo '
'; exit; require_once( ABSPATH . WPINC . '/template-loader.php' ); diff --git a/wp-includes/query.php b/wp-includes/query.php index 756e5e5c52..2af594d47a 100644 --- a/wp-includes/query.php +++ b/wp-includes/query.php @@ -1546,6 +1546,7 @@ class WP_Query { } if ( !empty($q['category__in']) ) { + $q['category__in'] = array_unique( $q['category__in'] ); $tax_query[] = array( 'taxonomy' => 'category', 'terms' => $q['category__in'], @@ -1555,6 +1556,7 @@ class WP_Query { } if ( !empty($q['category__not_in']) ) { + $q['category__not_in'] = array_unique( $q['category__not_in'] ); $tax_query[] = array( 'taxonomy' => 'category', 'terms' => $q['category__not_in'],