Fix get entries query

GravityKit · Nov 11, 2024 · 0da305f · 0da305f
1 parent 67e1ef3
commit 0da305f
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/future/includes/class-gv-view.php b/future/includes/class-gv-view.php
@@ -1222,7 +1222,9 @@ public function get_entries( $request = null ) {
 				foreach ( $this->joins as $join ) {
 					$query = $join->as_query_join( $query );
 
-					if ( $this->settings->get( 'multiple_forms_disable_null_joins' ) ) {
+					$is_strict_mode = $this->settings->get( 'multiple_forms_disable_null_joins' );
+
+					if ( $is_strict_mode ) {
 
 						// Disable NULL outputs
 						$condition = new \GF_Query_Condition(
@@ -1251,7 +1253,10 @@ public function get_entries( $request = null ) {
 					);
 
 					$q = $query->_introspect();
-					$query->where( \GF_Query_Condition::_and( $q['where'], $status_conditions ) );
+
+					$relation = $is_strict_mode ? '_and' : '_or';
+
+					$query->where( \GF_Query_Condition::$relation( $q['where'], $status_conditions ) );
 
 					/**
 					 * Applies legacy modifications to Query for is_approved settings.