From 8df2f96dfe450a6fdda3aeb0bc570a534d204ff6 Mon Sep 17 00:00:00 2001
From: Molkobain <lajarige.guillaume@free.fr>
Date: Wed, 13 Jan 2021 21:20:41 +0100
Subject: [PATCH] =?UTF-8?q?N=C2=B03627=20-=20Fix=20"global=20search"=20res?=
 =?UTF-8?q?ults=20page=20URL=20not=20containing=20the=20query?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/UI.php                                                 | 2 +-
 .../UI/Base/Component/GlobalSearch/GlobalSearch.php          | 2 +-
 templates/base/components/global-search/layout.html.twig     | 5 +++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/pages/UI.php b/pages/UI.php
index f94cfdb94..a9668f562 100644
--- a/pages/UI.php
+++ b/pages/UI.php
@@ -574,7 +574,7 @@ try
 
 		case 'full_text': // Global "google-like" search
 			$oP->DisableBreadCrumb();
-			$sQuery = trim(utils::ReadPostedParam('query', '', 'raw_data'));
+			$sQuery = trim(utils::ReadParam('text', '', false, 'raw_data'));
 			$iTune = utils::ReadParam('tune', 0);
 			if (empty($sQuery))
 			{
diff --git a/sources/application/UI/Base/Component/GlobalSearch/GlobalSearch.php b/sources/application/UI/Base/Component/GlobalSearch/GlobalSearch.php
index b09e869e4..1205526f8 100644
--- a/sources/application/UI/Base/Component/GlobalSearch/GlobalSearch.php
+++ b/sources/application/UI/Base/Component/GlobalSearch/GlobalSearch.php
@@ -42,7 +42,7 @@ class GlobalSearch extends UIBlock
 		'js/components/global-search.js',
 	];
 
-	public const DEFAULT_ENDPOINT_REL_URL = 'pages/UI.php?operation=full_text';
+	public const DEFAULT_ENDPOINT_REL_URL = 'pages/UI.php';
 
 	/** @var string $sEndpoint Absolute endpoint URL of the search form */
 	protected $sEndpoint;
diff --git a/templates/base/components/global-search/layout.html.twig b/templates/base/components/global-search/layout.html.twig
index 8a2b60ec4..0bd9e72b3 100644
--- a/templates/base/components/global-search/layout.html.twig
+++ b/templates/base/components/global-search/layout.html.twig
@@ -1,9 +1,10 @@
 <div id="{{ oUIBlock.GetId() }}" class="ibo-global-search" data-role="ibo-global-search">
-	<form action="{{ oUIBlock.GetEndpoint() }}" method="post" class="ibo-global-search--head" data-role="ibo-global-search--head">
+	<form action="{{ oUIBlock.GetEndpoint() }}" method="get" class="ibo-global-search--head" data-role="ibo-global-search--head">
 		<a href="#" class="ibo-global-search--icon" data-role="ibo-global-search--icon" data-tooltip-content="{{ 'UI:Component:GlobalSearch:Tooltip'|dict_s }}" data-tooltip-placement="bottom-start" data-tooltip-distance-offset="25">
 			<span class="fas fa-search"></span>
 		</a>
-		<input type="text" name="query" class="ibo-global-search--input" data-role="ibo-global-search--input" placeholder="{{ 'UI:Component:GlobalSearch:Input:Placeholder'|dict_s }}" autocomplete="off">
+		<input type="text" name="text" class="ibo-global-search--input" data-role="ibo-global-search--input" placeholder="{{ 'UI:Component:GlobalSearch:Input:Placeholder'|dict_s }}" autocomplete="off">
+		<input type="hidden" name="operation" value="full_text">
 	</form>
 	<div class="ibo-global-search--drawer" data-role="ibo-global-search--drawer">
 		<div class="ibo-global-search--compartment">