From 9ceb8e9f0bccd30d332b0c712df9d0eec2bbbfcd Mon Sep 17 00:00:00 2001
From: Eric <eric.espie@combodo.com>
Date: Fri, 16 Nov 2018 11:31:36 +0100
Subject: [PATCH] =?UTF-8?q?N=C2=B01765=20-=20Fix=20Organization=20filter?=
 =?UTF-8?q?=20and=20UNION=20filter=20in=20ExternalKey=20search?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../search/criterionconversion/criteriontooql.class.inc.php    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/sources/application/search/criterionconversion/criteriontooql.class.inc.php b/sources/application/search/criterionconversion/criteriontooql.class.inc.php
index dd5139a31..ef0a64c47 100644
--- a/sources/application/search/criterionconversion/criteriontooql.class.inc.php
+++ b/sources/application/search/criterionconversion/criteriontooql.class.inc.php
@@ -334,8 +334,9 @@ class CriterionToOQL extends CriterionConversionAbstract
 		// Hierarchical keys
 		try
 		{
-			if ($sHierarchicalKeyCode !== false)
+			if (($sHierarchicalKeyCode !== false) && ($oSearch instanceof DBObjectSearch))
 			{
+				// NOTE: The hierarchy does not work for unions for now. It'll be done with the full support of unions in search.
 				// Add all the joins for hierarchical key
 				$oFilter = new DBObjectSearch($sTargetClass);
 				$sFilterAlias = $oFilter->GetClassAlias();