Changeset 17245 for trunk/wp-includes/query.php

Timestamp:

01/09/2011 04:42:01 PM (16 years ago)

Author:

ryan

Message:

Cast category and tag query args to array to allow passing a single ID or slug. Props SergeyBiryukov. fixes #14892

File:

• trunk/wp-includes/query.php (modified) (8 diffs)

trunk/wp-includes/query.php

@@ -1693 +1693 @@
 
                 if ( !empty($q['category__in']) ) {
-                        $q['category__in'] = array_map('absint', array_unique( $q['category__in'] ) );
+                        $q['category__in'] = array_map('absint', array_unique( (array) $q['category__in'] ) );
                         $tax_query[] = array(
                                 'taxonomy' => 'category',
@@ -1702 +1702 @@
 
                 if ( !empty($q['category__not_in']) ) {
-                        $q['category__not_in'] = array_map('absint', array_unique( $q['category__not_in'] ) );
+                        $q['category__not_in'] = array_map('absint', array_unique( (array) $q['category__not_in'] ) );
                         $tax_query[] = array(
                                 'taxonomy' => 'category',
@@ -1711 +1711 @@
 
                 if ( !empty($q['category__and']) ) {
-                        $q['category__and'] = array_map('absint', array_unique( $q['category__and'] ) );
+                        $q['category__and'] = array_map('absint', array_unique( (array) $q['category__and'] ) );
                         $tax_query[] = array(
                                 'taxonomy' => 'category',
@@ -1730 +1730 @@
 
                 if ( !empty($q['tag__in']) ) {
-                        $q['tag__in'] = array_map('absint', array_unique( $q['tag__in'] ) );
+                        $q['tag__in'] = array_map('absint', array_unique( (array) $q['tag__in'] ) );
                         $tax_query[] = array(
                                 'taxonomy' => 'post_tag',
@@ -1738 +1738 @@
 
                 if ( !empty($q['tag__not_in']) ) {
-                        $q['tag__not_in'] = array_map('absint', array_unique( $q['tag__not_in'] ) );
+                        $q['tag__not_in'] = array_map('absint', array_unique( (array) $q['tag__not_in'] ) );
                         $tax_query[] = array(
                                 'taxonomy' => 'post_tag',
@@ -1747 +1747 @@
 
                 if ( !empty($q['tag__and']) ) {
-                        $q['tag__and'] = array_map('absint', array_unique( $q['tag__and'] ) );
+                        $q['tag__and'] = array_map('absint', array_unique( (array) $q['tag__and'] ) );
                         $tax_query[] = array(
                                 'taxonomy' => 'post_tag',
@@ -1756 +1756 @@
 
                 if ( !empty($q['tag_slug__in']) ) {
-                        $q['tag_slug__in'] = array_map('sanitize_title', $q['tag_slug__in']);
+                        $q['tag_slug__in'] = array_map('sanitize_title', (array) $q['tag_slug__in']);
                         $tax_query[] = array(
                                 'taxonomy' => 'post_tag',
@@ -1765 +1765 @@
 
                 if ( !empty($q['tag_slug__and']) ) {
-                        $q['tag_slug__and'] = array_map('sanitize_title', $q['tag_slug__and']);
+                        $q['tag_slug__and'] = array_map('sanitize_title', (array) $q['tag_slug__and']);
                         $tax_query[] = array(
                                 'taxonomy' => 'post_tag',