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

Timestamp:

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

Author:

ryan

Message:

categoryand, tagand, tag_slugin, tag_slugand support. fixes #16157

File:

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

trunk/wp-includes/query.php

@@ -1693 +1693 @@
 
                 if ( !empty($q['category__in']) ) {
-                        $q['category__in'] = array_unique( $q['category__in'] );
+                        $q['category__in'] = array_map('absint', array_unique( $q['category__in'] ) );
                         $tax_query[] = array(
                                 'taxonomy' => 'category',
@@ -1702 +1702 @@
 
                 if ( !empty($q['category__not_in']) ) {
-                        $q['category__not_in'] = array_unique( $q['category__not_in'] );
+                        $q['category__not_in'] = array_map('absint', array_unique( $q['category__not_in'] ) );
                         $tax_query[] = array(
                                 'taxonomy' => 'category',
                                 'terms' => $q['category__not_in'],
-                                'operator' => 'NOT IN',
+                                'operator' => 'NOT IN'
+                        );
+                }
+
+                if ( !empty($q['category__and']) ) {
+                        $q['category__and'] = array_map('absint', array_unique( $q['category__and'] ) );
+                        $tax_query[] = array(
+                                'taxonomy' => 'category',
+                                'terms' => $q['category__and'],
+                                'field' => 'term_id',
+                                'operator' => 'AND'
                         );
                 }
@@ -1712 +1722 @@
                 // Tag stuff
                 if ( !empty($q['tag_id']) ) {
+                        $q['tag_id'] = absint( $q['tag_id'] );
                         $tax_query[] = array(
                                 'taxonomy' => 'post_tag',
-                                'terms' => $q['tag_id'],
+                                'terms' => $q['tag_id']
                         );
                 }
 
                 if ( !empty($q['tag__in']) ) {
+                        $q['tag__in'] = array_map('absint', array_unique( $q['tag__in'] ) );
                         $tax_query[] = array(
                                 'taxonomy' => 'post_tag',
-                                'terms' => $q['tag__in'],
+                                'terms' => $q['tag__in']
                         );
                 }
 
                 if ( !empty($q['tag__not_in']) ) {
+                        $q['tag__not_in'] = array_map('absint', array_unique( $q['tag__not_in'] ) );
                         $tax_query[] = array(
                                 'taxonomy' => 'post_tag',
                                 'terms' => $q['tag__not_in'],
-                                'operator' => 'NOT IN',
+                                'operator' => 'NOT IN'
+                        );
+                }
+
+                if ( !empty($q['tag__and']) ) {
+                        $q['tag__and'] = array_map('absint', array_unique( $q['tag__and'] ) );
+                        $tax_query[] = array(
+                                'taxonomy' => 'post_tag',
+                                'terms' => $q['tag__and'],
+                                'operator' => 'AND'
+                        );
+                }
+
+                if ( !empty($q['tag_slug__in']) ) {
+                        $q['tag_slug__in'] = array_map('sanitize_title', $q['tag_slug__in']);
+                        $tax_query[] = array(
+                                'taxonomy' => 'post_tag',
+                                'terms' => $q['tag_slug__in'],
+                                'field' => 'slug'
+                        );
+                }
+
+                if ( !empty($q['tag_slug__and']) ) {
+                        $q['tag_slug__and'] = array_map('sanitize_title', $q['tag_slug__and']);
+                        $tax_query[] = array(
+                                'taxonomy' => 'post_tag',
+                                'terms' => $q['tag_slug__and'],
+                                'field' => 'slug',
+                                'operator' => 'AND'
                         );
                 }