From 6176af089c738df9fc59c3c158990a882fc84204 Mon Sep 17 00:00:00 2001
From: Eric <eric.espie@combodo.com>
Date: Tue, 18 Aug 2020 14:41:18 +0200
Subject: [PATCH] =?UTF-8?q?N=C2=B03256=20-=20Invalid=20filter=20parameter,?=
 =?UTF-8?q?=20when=20using=20&=20(ampersand)=20in=20filter=20parameter=20(?=
 =?UTF-8?q?OQL=20Query)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/dbsearch.class.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/dbsearch.class.php b/core/dbsearch.class.php
index d4f5ea4e9..1449122eb 100644
--- a/core/dbsearch.class.php
+++ b/core/dbsearch.class.php
@@ -631,7 +631,7 @@ abstract class DBSearch
 		}
 
 		$sOql = $this->ToOql($bDevelopParams, $aContextParams);
-		return json_encode(array($sOql, $aQueryParams, $this->m_aModifierProperties));
+		return urlencode(json_encode(array($sOql, $aQueryParams, $this->m_aModifierProperties)));
 	}
 
 	/**
@@ -648,7 +648,7 @@ abstract class DBSearch
 	 */
 	static public function unserialize($sValue)
 	{
-		$aData = json_decode($sValue, true);
+		$aData = json_decode(urldecode($sValue), true);
 		if (is_null($aData))
 		{
 			throw new CoreException("Invalid filter parameter");