Ticket #12891: relation-or.diff

taxonomy.php

@@ -526 +526 @@
         $join = '';
         $where = '';
         $i = 0;
+        if ( !empty( $tax_query['relation'] ) ) {
+                $relation = $tax_query['relation'];
+        } else {
+                $relation = 'AND';
+        }
         foreach ( $tax_query as $query ) {
+                if ( !is_array( $query ) ) continue;
+                
                 extract( wp_parse_args( $query, array(
                         'taxonomy' => array(),
                         'terms' => array(),
@@ -576 +583 @@
                         $join .= " INNER JOIN $wpdb->term_relationships";
                         $join .= $i ? " AS $alias" : '';
                         $join .= " ON ($primary_table.$primary_id_column = $alias.object_id)";
+                        
+                        if ($i) $where .= " $relation"; 
+                        
+                        $where .= " $alias.term_taxonomy_id $operator ($terms)";
 
-                        $where .= " AND $alias.term_taxonomy_id $operator ($terms)";
-
                         $i++;
                 }
                 elseif ( 'NOT IN' == $operator ) {
@@ -594 +603 @@
                         )";
                 }
         }
+        if ( 'IN' == $operator ) {
+                $where = ' AND ( ' . $where . ' )';
+        }
 
         return compact( 'join', 'where' );
 }