Fix for tags not working when grouping

Previously, tags weren't working properly when breaking into groups
weblab · Nov 9, 2015 · a282f7b · a282f7b
1 parent 2ccd55d
commit a282f7b
Showing 1 changed file with 14 additions and 2 deletions.
diff --git a/uc-people-widget.php b/uc-people-widget.php
@@ -165,20 +165,26 @@ public function widget( $args, $instance ){
 
 		if ( $settings['specific_groups'] != false || $settings['specific_tags'] != false ){
 			$tax_query = array();
+			$isGroupSet = false;
+			$isTagSet = false;
 
 			if ( $settings['specific_groups'] != false ) {
-				$tax_query[] = array(
+				$isGroupSet = true;
+				$taxGroupArray = array(
 					'taxonomy' => 'group',
 					'field'   	=> 'term_id',
 					'terms'		=> $settings['specific_groups']
 				);
+				$tax_query[] = $taxGroupArray;
 			}
 			if ( $settings['specific_tags'] != false ) {
-				$tax_query[] = array(
+				$isTagSet = true;
+				$taxTagArray = array(
 					'taxonomy' => 'persontag',
 					'field'   	=> 'term_id',
 					'terms'		=> $settings['specific_tags']
 				);
+				$tax_query[] = $taxTagArray;
 			}
 			$wpQueryArgs['tax_query'] = $tax_query;
 		}
@@ -220,6 +226,12 @@ public function widget( $args, $instance ){
 					'terms'		=> $value
 				);
 				array_push($tax_query, $group_query);
+				/*if( $isGroupSet != false ){
+					array_push($tax_query, $taxGroupArray);
+				}*/
+				if( $isTagSet != false ){
+					array_push($tax_query, $taxTagArray);
+				}
 				$wpQueryArgs['tax_query'] = $tax_query;
 
 				// with $arg updated, let's do a new query.