Fixed location filter affecting unrelated queries

Fixes #405
ethercreative · Sep 16, 2024 · 4350fac · 4350fac
1 parent 227061f
commit 4350fac
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 5.0.3 - 2024-09-16
+### Fixed
+- Fixed location filter affecting unrelated queries (Fixes #405)
+
 ## 5.0.2 - 2024-09-10
 ### Fixed
 - Fixes location search (Fixes #394, #393, #392)

diff --git a/src/fields/MapField.php b/src/fields/MapField.php
@@ -436,6 +436,9 @@ public function afterPrepareElementQuery (CancelableEvent $event): void
 			self::$searchParams['value'],
 			self::$searchParams['field'],
 		);
+
+		// Clear search params to prevent it being applied to unrelated queries.
+		self::$searchParams = null;
 	}
 
 	// Helpers

diff --git a/src/services/MapService.php b/src/services/MapService.php
@@ -193,7 +193,7 @@ public function modifyElementsQuery (ElementQueryInterface $query, mixed $value,
 			'[[' . $alias . '.fieldId]] = ' . $field->id,
 		];
 
-		$query->subQuery->join('JOIN', $table . ' ' . $alias, $on);
+		$query->subQuery->join('LEFT JOIN', $table . ' ' . $alias, $on);
 
 		if ($value === ':empty:')
 		{