Changeset 16555 for trunk/wp-includes/taxonomy.php

Timestamp:

11/23/2010 08:22:27 PM (16 years ago)

Author:

scribu

Message:

Introduce 'relation' operator between tax queries. Props Otto42 for initial patch. See #12891

File:

• trunk/wp-includes/taxonomy.php (modified) (4 diffs)

trunk/wp-includes/taxonomy.php

@@ -525 +525 @@
 
         $join = '';
-        $where = '';
+        $where = array();
         $i = 0;
+
+        if ( isset( $tax_query['relation'] ) && strtoupper( $tax_query['relation'] ) == 'OR' ) {
+                $relation = 'OR';
+        } else {
+                $relation = 'AND';
+        }
+
         foreach ( $tax_query as $query ) {
+                if ( ! is_array( $query ) )
+                        continue;
+
                 extract( wp_parse_args( $query, array(
                         'taxonomy' => array(),
@@ -567 +577 @@
 
                 if ( 'IN' == $operator ) {
-                        if ( empty( $terms ) )
-                                return array( 'join' => '', 'where' => ' AND 0 = 1');
+
+                        if ( empty( $terms ) ) {
+                                if ( 'OR' == $relation )
+                                        continue;
+                                else
+                                        return array( 'join' => '', 'where' => ' AND 0 = 1' );
+                        }
 
                         $terms = implode( ',', $terms );
@@ -578 +593 @@
                         $join .= " ON ($primary_table.$primary_id_column = $alias.object_id)";
 
-                        $where .= " AND $alias.term_taxonomy_id $operator ($terms)";
-
-                        $i++;
+                        $where[] = "$alias.term_taxonomy_id $operator ($terms)";
                 }
                 elseif ( 'NOT IN' == $operator ) {
+
                         if ( empty( $terms ) )
                                 continue;
@@ -588 +602 @@
                         $terms = implode( ',', $terms );
 
-                        $where .= " AND $primary_table.$primary_id_column NOT IN (
-                                SELECT object_id 
-                                FROM $wpdb->term_relationships 
+                        $where[] = "$primary_table.$primary_id_column NOT IN (
+                                SELECT object_id
+                                FROM $wpdb->term_relationships
                                 WHERE term_taxonomy_id IN ($terms)
                         )";
                 }
-        }
+
+                $i++;
+        }
+
+        if ( !empty( $where ) )
+                $where = ' AND ( ' . implode( " $relation ", $where ) . ' )';
+        else
+                $where = '';
 
         return compact( 'join', 'where' );