diff --git a/address.php b/address.php
index a1f59b39a..8a871c4ac 100644
--- a/address.php
+++ b/address.php
@@ -35,4 +35,4 @@
 require(dirname(__FILE__).'/config/config.inc.php');
 Tools::displayFileAsDeprecated();
 
-Tools::redirect('index.php?controller=address'.($_REQUEST ? '&'.http_build_query($_REQUEST) : ''), __PS_BASE_URI__, null, 'HTTP/1.1 301 Moved Permanently');
\ No newline at end of file
+Tools::redirect('index.php?controller=address'.($_REQUEST ? '&'.http_build_query($_REQUEST, '', '&') : ''), __PS_BASE_URI__, null, 'HTTP/1.1 301 Moved Permanently');
\ No newline at end of file
diff --git a/addresses.php b/addresses.php
index e2faabeea..16bd7eace 100644
--- a/addresses.php
+++ b/addresses.php
@@ -35,4 +35,4 @@
 require(dirname(__FILE__).'/config/config.inc.php');
 Tools::displayFileAsDeprecated();
 
-Tools::redirect('index.php?controller=addresses'.($_REQUEST ? '&'.http_build_query($_REQUEST) : ''), __PS_BASE_URI__, null, 'HTTP/1.1 301 Moved Permanently');
\ No newline at end of file
+Tools::redirect('index.php?controller=addresses'.($_REQUEST ? '&'.http_build_query($_REQUEST, '', '&') : ''), __PS_BASE_URI__, null, 'HTTP/1.1 301 Moved Permanently');
\ No newline at end of file
diff --git a/admin-dev/init.php b/admin-dev/init.php
index 8773ff529..a61da29d7 100644
--- a/admin-dev/init.php
+++ b/admin-dev/init.php
@@ -96,7 +96,7 @@ try
 		$query = (isset($url['query'])) ? $url['query'] : '';
 		parse_str($query, $parseQuery);
 		unset($parseQuery['setShopContext']);
-		Tools::redirectAdmin($url['path'] . '?' . http_build_query($parseQuery));
+		Tools::redirectAdmin($url['path'] . '?' . http_build_query($parseQuery, '', '&'));
 	}
 
 	$context->currency = new Currency(Configuration::get('PS_CURRENCY_DEFAULT'));
diff --git a/attachment.php b/attachment.php
index 8db5cbd7c..730085182 100644
--- a/attachment.php
+++ b/attachment.php
@@ -35,4 +35,4 @@
 require(dirname(__FILE__).'/config/config.inc.php');
 Tools::displayFileAsDeprecated();
 
-Tools::redirect('index.php?controller=attachment'.($_REQUEST ? '&'.http_build_query($_REQUEST) : ''), __PS_BASE_URI__, null, 'HTTP/1.1 301 Moved Permanently');
\ No newline at end of file
+Tools::redirect('index.php?controller=attachment'.($_REQUEST ? '&'.http_build_query($_REQUEST, '', '&') : ''), __PS_BASE_URI__, null, 'HTTP/1.1 301 Moved Permanently');
\ No newline at end of file
diff --git a/authentication.php b/authentication.php
index 868c4313b..d5a20585d 100644
--- a/authentication.php
+++ b/authentication.php
@@ -35,4 +35,4 @@
 require(dirname(__FILE__).'/config/config.inc.php');
 Tools::displayFileAsDeprecated();
 
-Tools::redirect('index.php?controller=authentication'.($_REQUEST ? '&'.http_build_query($_REQUEST) : ''), __PS_BASE_URI__, null, 'HTTP/1.1 301 Moved Permanently');
\ No newline at end of file
+Tools::redirect('index.php?controller=authentication'.($_REQUEST ? '&'.http_build_query($_REQUEST, '', '&') : ''), __PS_BASE_URI__, null, 'HTTP/1.1 301 Moved Permanently');
\ No newline at end of file
diff --git a/best-sales.php b/best-sales.php
index 6ba30ecf5..777797183 100644
--- a/best-sales.php
+++ b/best-sales.php
@@ -35,4 +35,4 @@
 require(dirname(__FILE__).'/config/config.inc.php');
 Tools::displayFileAsDeprecated();
 
-Tools::redirect('index.php?controller=best-sales'.($_REQUEST ? '&'.http_build_query($_REQUEST) : ''), __PS_BASE_URI__, null, 'HTTP/1.1 301 Moved Permanently');
\ No newline at end of file
+Tools::redirect('index.php?controller=best-sales'.($_REQUEST ? '&'.http_build_query($_REQUEST, '', '&') : ''), __PS_BASE_URI__, null, 'HTTP/1.1 301 Moved Permanently');
\ No newline at end of file
diff --git a/cart.php b/cart.php
index 029ef6bd9..ffef546f1 100644
--- a/cart.php
+++ b/cart.php
@@ -35,4 +35,4 @@
 require(dirname(__FILE__).'/config/config.inc.php');
 Tools::displayFileAsDeprecated();
 
-Tools::redirect('index.php?controller=cart'.($_REQUEST ? '&'.http_build_query($_REQUEST) : ''), __PS_BASE_URI__, null, 'HTTP/1.1 301 Moved Permanently');
\ No newline at end of file
+Tools::redirect('index.php?controller=cart'.($_REQUEST ? '&'.http_build_query($_REQUEST, '', '&') : ''), __PS_BASE_URI__, null, 'HTTP/1.1 301 Moved Permanently');
\ No newline at end of file
diff --git a/category.php b/category.php
index f77fde284..b78861946 100644
--- a/category.php
+++ b/category.php
@@ -35,4 +35,4 @@
 require(dirname(__FILE__).'/config/config.inc.php');
 Tools::displayFileAsDeprecated();
 
-Tools::redirect('index.php?controller=category'.($_REQUEST ? '&'.http_build_query($_REQUEST) : ''), __PS_BASE_URI__, null, 'HTTP/1.1 301 Moved Permanently');
\ No newline at end of file
+Tools::redirect('index.php?controller=category'.($_REQUEST ? '&'.http_build_query($_REQUEST, '', '&') : ''), __PS_BASE_URI__, null, 'HTTP/1.1 301 Moved Permanently');
\ No newline at end of file
diff --git a/changecurrency.php b/changecurrency.php
index 8aec7f251..61c359265 100644
--- a/changecurrency.php
+++ b/changecurrency.php
@@ -35,4 +35,4 @@
 require(dirname(__FILE__).'/config/config.inc.php');
 Tools::displayFileAsDeprecated();
 
-Tools::redirect('index.php?controller=change-currency'.($_REQUEST ? '&'.http_build_query($_REQUEST) : ''), __PS_BASE_URI__, null, 'HTTP/1.1 301 Moved Permanently');
\ No newline at end of file
+Tools::redirect('index.php?controller=change-currency'.($_REQUEST ? '&'.http_build_query($_REQUEST, '', '&') : ''), __PS_BASE_URI__, null, 'HTTP/1.1 301 Moved Permanently');
\ No newline at end of file
diff --git a/classes/Dispatcher.php b/classes/Dispatcher.php
index b080a186e..5667238d2 100644
--- a/classes/Dispatcher.php
+++ b/classes/Dispatcher.php
@@ -502,7 +502,7 @@ class DispatcherCore
 	{
 		if (!isset($this->routes[$route_id]))
 		{
-			$query = http_build_query($params);
+			$query = http_build_query($params, '', '&');
 			return ($route_id == 'index') ? 'index.php'.(($query) ? '?'.$query : '') : 'index.php?controller='.$route_id.(($query) ? '&'.$query : '').$anchor;
 		}
 		$route = $this->routes[$route_id];
@@ -542,7 +542,7 @@ class DispatcherCore
 			}
 			$url = preg_replace('#\{([^{}]+:)?[a-z0-9_]+?(:[^{}])?\}#', '', $url);
 			if (count($add_param))
-				$url .= '?'.http_build_query($add_param);
+				$url .= '?'.http_build_query($add_param, '', '&');
 		}
 		// Build a classic url index.php?controller=foo&...
 		else
@@ -554,7 +554,7 @@ class DispatcherCore
 
 			if (!empty($route['controller']))
 				$query_params['controller'] = $route['controller'];
-			$url = 'index.php?'.http_build_query(array_merge($add_params, $query_params));
+			$url = 'index.php?'.http_build_query(array_merge($add_params, $query_params), '', '&');
 		}
 
 		return $url.$anchor;
diff --git a/classes/Link.php b/classes/Link.php
index 86248c721..69b32ab8c 100644
--- a/classes/Link.php
+++ b/classes/Link.php
@@ -496,7 +496,7 @@ class LinkCore
 						$vars[urlencode($k)] = $value;
 					else
 					{
-						foreach (explode('&', http_build_query(array($k => $value))) as $key => $val)
+						foreach (explode('&', http_build_query(array($k => $value)), '', '&') as $key => $val)
 						{
 							$data = explode('=', $val);
 							$vars[urldecode($data[0])] = $data[1];
@@ -507,7 +507,7 @@ class LinkCore
 		}
 
 		if (!$array)
-			return $url.(($this->allow == 1 || $url == $this->url) ? '?' : '&').http_build_query($vars);
+			return $url.(($this->allow == 1 || $url == $this->url) ? '?' : '&').http_build_query($vars, '', '&');
 		$vars['requestUrl'] = $url;
 
 		if (!$this->allow == 1)
diff --git a/classes/ModuleGraph.php b/classes/ModuleGraph.php
index b55bc0037..33f49e816 100644
--- a/classes/ModuleGraph.php
+++ b/classes/ModuleGraph.php
@@ -285,7 +285,7 @@ abstract class ModuleGraphCore extends Module
 		$url_params['module'] = Tools::getValue('module');
 		$url_params['id_employee'] = $id_employee;
 		$url_params['id_lang'] = $id_lang;
-		$drawer = 'drawer.php?'.http_build_query(array_map('Tools::safeOutput', $url_params));
+		$drawer = 'drawer.php?'.http_build_query(array_map('Tools::safeOutput', $url_params), '', '&');
 
 		require_once(dirname(__FILE__).'/../modules/'.$render.'/'.$render.'.php');
 		return call_user_func(array($render, 'hookGraphEngine'), $params, $drawer);
diff --git a/classes/controller/AdminController.php b/classes/controller/AdminController.php
index 4eb7e0f85..6cd82ac66 100644
--- a/classes/controller/AdminController.php
+++ b/classes/controller/AdminController.php
@@ -1658,7 +1658,7 @@ class AdminControllerCore extends Controller
 			$query = (isset($url['query'])) ? $url['query'] : '';
 			parse_str($query, $parse_query);
 			unset($parse_query['setShopContext'], $parse_query['conf']);
-			$this->redirect_after = $url['path'].'?'.http_build_query($parse_query);
+			$this->redirect_after = $url['path'].'?'.http_build_query($parse_query, '', '&');
 		}
 		elseif (!Shop::isFeatureActive())
 			$this->context->cookie->shopContext = 's-'.Configuration::get('PS_SHOP_DEFAULT');
diff --git a/classes/controller/FrontController.php b/classes/controller/FrontController.php
index b70aa7b88..75408a1ca 100755
--- a/classes/controller/FrontController.php
+++ b/classes/controller/FrontController.php
@@ -629,7 +629,7 @@ class FrontControllerCore extends Controller
 
 			$strParams = '';
 			if ($params)
-				$strParams = ((strpos($canonicalURL, '?') === false) ? '?' : '&').http_build_query($params);
+				$strParams = ((strpos($canonicalURL, '?') === false) ? '?' : '&').http_build_query($params, '', '&');
 
 			header('HTTP/1.0 301 Moved');
 			header('Cache-Control: no-cache');
diff --git a/cms.php b/cms.php
index 48fad84ea..1bcb35af3 100644
--- a/cms.php
+++ b/cms.php
@@ -35,4 +35,4 @@
 require(dirname(__FILE__).'/config/config.inc.php');
 Tools::displayFileAsDeprecated();
 
-Tools::redirect('index.php?controller=cms'.($_REQUEST ? '&'.http_build_query($_REQUEST) : ''), __PS_BASE_URI__, null, 'HTTP/1.1 301 Moved Permanently');
\ No newline at end of file
+Tools::redirect('index.php?controller=cms'.($_REQUEST ? '&'.http_build_query($_REQUEST, '', '&') : ''), __PS_BASE_URI__, null, 'HTTP/1.1 301 Moved Permanently');
\ No newline at end of file
diff --git a/contact-form.php b/contact-form.php
index 5e0e79ec9..4a83e3277 100644
--- a/contact-form.php
+++ b/contact-form.php
@@ -35,4 +35,4 @@
 require(dirname(__FILE__).'/config/config.inc.php');
 Tools::displayFileAsDeprecated();
 
-Tools::redirect('index.php?controller=contact'.($_REQUEST ? '&'.http_build_query($_REQUEST) : ''), __PS_BASE_URI__, null, 'HTTP/1.1 301 Moved Permanently');
\ No newline at end of file
+Tools::redirect('index.php?controller=contact'.($_REQUEST ? '&'.http_build_query($_REQUEST, '', '&') : ''), __PS_BASE_URI__, null, 'HTTP/1.1 301 Moved Permanently');
\ No newline at end of file
diff --git a/discount.php b/discount.php
index ce41b1784..9aab28f51 100644
--- a/discount.php
+++ b/discount.php
@@ -35,4 +35,4 @@
 require(dirname(__FILE__).'/config/config.inc.php');
 Tools::displayFileAsDeprecated();
 
-Tools::redirect('index.php?controller=discount'.($_REQUEST ? '&'.http_build_query($_REQUEST) : ''), __PS_BASE_URI__, null, 'HTTP/1.1 301 Moved Permanently');
\ No newline at end of file
+Tools::redirect('index.php?controller=discount'.($_REQUEST ? '&'.http_build_query($_REQUEST, '', '&') : ''), __PS_BASE_URI__, null, 'HTTP/1.1 301 Moved Permanently');
\ No newline at end of file
diff --git a/get-file.php b/get-file.php
index 99062eb65..4ae55b2ad 100644
--- a/get-file.php
+++ b/get-file.php
@@ -35,4 +35,4 @@
 require(dirname(__FILE__).'/config/config.inc.php');
 Tools::displayFileAsDeprecated();
 
-Tools::redirect('index.php?controller=get-file'.($_REQUEST ? '&'.http_build_query($_REQUEST) : ''), __PS_BASE_URI__, null, 'HTTP/1.1 301 Moved Permanently');
\ No newline at end of file
+Tools::redirect('index.php?controller=get-file'.($_REQUEST ? '&'.http_build_query($_REQUEST, '', '&') : ''), __PS_BASE_URI__, null, 'HTTP/1.1 301 Moved Permanently');
\ No newline at end of file
diff --git a/guest-tracking.php b/guest-tracking.php
index 7bf79b50f..37545294a 100644
--- a/guest-tracking.php
+++ b/guest-tracking.php
@@ -35,4 +35,4 @@
 require(dirname(__FILE__).'/config/config.inc.php');
 Tools::displayFileAsDeprecated();
 
-Tools::redirect('index.php?controller=guest-tracking'.($_REQUEST ? '&'.http_build_query($_REQUEST) : ''), __PS_BASE_URI__, null, 'HTTP/1.1 301 Moved Permanently');
\ No newline at end of file
+Tools::redirect('index.php?controller=guest-tracking'.($_REQUEST ? '&'.http_build_query($_REQUEST, '', '&') : ''), __PS_BASE_URI__, null, 'HTTP/1.1 301 Moved Permanently');
\ No newline at end of file
diff --git a/history.php b/history.php
index 7ee9a59cc..857bc9df9 100644
--- a/history.php
+++ b/history.php
@@ -35,4 +35,4 @@
 require(dirname(__FILE__).'/config/config.inc.php');
 Tools::displayFileAsDeprecated();
 
-Tools::redirect('index.php?controller=history'.($_REQUEST ? '&'.http_build_query($_REQUEST) : ''), __PS_BASE_URI__, null, 'HTTP/1.1 301 Moved Permanently');
\ No newline at end of file
+Tools::redirect('index.php?controller=history'.($_REQUEST ? '&'.http_build_query($_REQUEST, '', '&') : ''), __PS_BASE_URI__, null, 'HTTP/1.1 301 Moved Permanently');
\ No newline at end of file
diff --git a/identity.php b/identity.php
index d8400e147..f86aab4f1 100644
--- a/identity.php
+++ b/identity.php
@@ -35,4 +35,4 @@
 require(dirname(__FILE__).'/config/config.inc.php');
 Tools::displayFileAsDeprecated();
 
-Tools::redirect('index.php?controller=identity'.($_REQUEST ? '&'.http_build_query($_REQUEST) : ''), __PS_BASE_URI__, null, 'HTTP/1.1 301 Moved Permanently');
\ No newline at end of file
+Tools::redirect('index.php?controller=identity'.($_REQUEST ? '&'.http_build_query($_REQUEST, '', '&') : ''), __PS_BASE_URI__, null, 'HTTP/1.1 301 Moved Permanently');
\ No newline at end of file
diff --git a/manufacturer.php b/manufacturer.php
index a3b9a8c7b..c9416c44c 100644
--- a/manufacturer.php
+++ b/manufacturer.php
@@ -35,4 +35,4 @@
 require(dirname(__FILE__).'/config/config.inc.php');
 Tools::displayFileAsDeprecated();
 
-Tools::redirect('index.php?controller=manufacturer'.($_REQUEST ? '&'.http_build_query($_REQUEST) : ''), __PS_BASE_URI__, null, 'HTTP/1.1 301 Moved Permanently');
\ No newline at end of file
+Tools::redirect('index.php?controller=manufacturer'.($_REQUEST ? '&'.http_build_query($_REQUEST, '', '&') : ''), __PS_BASE_URI__, null, 'HTTP/1.1 301 Moved Permanently');
\ No newline at end of file
diff --git a/my-account.php b/my-account.php
index 190474a82..0206b23c8 100644
--- a/my-account.php
+++ b/my-account.php
@@ -35,4 +35,4 @@
 require(dirname(__FILE__).'/config/config.inc.php');
 Tools::displayFileAsDeprecated();
 
-Tools::redirect('index.php?controller=my-account'.($_REQUEST ? '&'.http_build_query($_REQUEST) : ''), __PS_BASE_URI__, null, 'HTTP/1.1 301 Moved Permanently');
\ No newline at end of file
+Tools::redirect('index.php?controller=my-account'.($_REQUEST ? '&'.http_build_query($_REQUEST, '', '&') : ''), __PS_BASE_URI__, null, 'HTTP/1.1 301 Moved Permanently');
\ No newline at end of file
diff --git a/new-products.php b/new-products.php
index d85b7683d..7c2254d46 100644
--- a/new-products.php
+++ b/new-products.php
@@ -35,4 +35,4 @@
 require(dirname(__FILE__).'/config/config.inc.php');
 Tools::displayFileAsDeprecated();
 
-Tools::redirect('index.php?controller=new-products'.($_REQUEST ? '&'.http_build_query($_REQUEST) : ''), __PS_BASE_URI__, null, 'HTTP/1.1 301 Moved Permanently');
\ No newline at end of file
+Tools::redirect('index.php?controller=new-products'.($_REQUEST ? '&'.http_build_query($_REQUEST, '', '&') : ''), __PS_BASE_URI__, null, 'HTTP/1.1 301 Moved Permanently');
\ No newline at end of file
diff --git a/order-confirmation.php b/order-confirmation.php
index b8424d754..bea1faa78 100644
--- a/order-confirmation.php
+++ b/order-confirmation.php
@@ -35,4 +35,4 @@
 require(dirname(__FILE__).'/config/config.inc.php');
 Tools::displayFileAsDeprecated();
 
-Tools::redirect('index.php?controller=order-confirmation'.($_REQUEST ? '&'.http_build_query($_REQUEST) : ''), __PS_BASE_URI__, null, 'HTTP/1.1 301 Moved Permanently');
\ No newline at end of file
+Tools::redirect('index.php?controller=order-confirmation'.($_REQUEST ? '&'.http_build_query($_REQUEST, '', '&') : ''), __PS_BASE_URI__, null, 'HTTP/1.1 301 Moved Permanently');
\ No newline at end of file
diff --git a/order-detail.php b/order-detail.php
index 70c3f9185..c53b2ef81 100644
--- a/order-detail.php
+++ b/order-detail.php
@@ -35,4 +35,4 @@
 require(dirname(__FILE__).'/config/config.inc.php');
 Tools::displayFileAsDeprecated();
 
-Tools::redirect('index.php?controller=order-detail'.($_REQUEST ? '&'.http_build_query($_REQUEST) : ''), __PS_BASE_URI__, null, 'HTTP/1.1 301 Moved Permanently');
\ No newline at end of file
+Tools::redirect('index.php?controller=order-detail'.($_REQUEST ? '&'.http_build_query($_REQUEST, '', '&') : ''), __PS_BASE_URI__, null, 'HTTP/1.1 301 Moved Permanently');
\ No newline at end of file
diff --git a/order-follow.php b/order-follow.php
index a04ee543c..604f1f555 100644
--- a/order-follow.php
+++ b/order-follow.php
@@ -35,4 +35,4 @@
 require(dirname(__FILE__).'/config/config.inc.php');
 Tools::displayFileAsDeprecated();
 
-Tools::redirect('index.php?controller=order-follow'.($_REQUEST ? '&'.http_build_query($_REQUEST) : ''), __PS_BASE_URI__, null, 'HTTP/1.1 301 Moved Permanently');
\ No newline at end of file
+Tools::redirect('index.php?controller=order-follow'.($_REQUEST ? '&'.http_build_query($_REQUEST, '', '&') : ''), __PS_BASE_URI__, null, 'HTTP/1.1 301 Moved Permanently');
\ No newline at end of file
diff --git a/order-opc.php b/order-opc.php
index 81768ef3a..2016eb259 100755
--- a/order-opc.php
+++ b/order-opc.php
@@ -35,4 +35,4 @@
 require(dirname(__FILE__).'/config/config.inc.php');
 Tools::displayFileAsDeprecated();
 
-Tools::redirect('index.php?controller=order-opc'.($_REQUEST ? '&'.http_build_query($_REQUEST) : ''), __PS_BASE_URI__, null, 'HTTP/1.1 301 Moved Permanently');
\ No newline at end of file
+Tools::redirect('index.php?controller=order-opc'.($_REQUEST ? '&'.http_build_query($_REQUEST, '', '&') : ''), __PS_BASE_URI__, null, 'HTTP/1.1 301 Moved Permanently');
\ No newline at end of file
diff --git a/order-return.php b/order-return.php
index 693532fb9..04c5dd52e 100644
--- a/order-return.php
+++ b/order-return.php
@@ -35,4 +35,4 @@
 require(dirname(__FILE__).'/config/config.inc.php');
 Tools::displayFileAsDeprecated();
 
-Tools::redirect('index.php?controller=order-return'.($_REQUEST ? '&'.http_build_query($_REQUEST) : ''), __PS_BASE_URI__, null, 'HTTP/1.1 301 Moved Permanently');
\ No newline at end of file
+Tools::redirect('index.php?controller=order-return'.($_REQUEST ? '&'.http_build_query($_REQUEST, '', '&') : ''), __PS_BASE_URI__, null, 'HTTP/1.1 301 Moved Permanently');
\ No newline at end of file
diff --git a/order-slip.php b/order-slip.php
index 8b64cdccd..a528d294f 100644
--- a/order-slip.php
+++ b/order-slip.php
@@ -35,4 +35,4 @@
 require(dirname(__FILE__).'/config/config.inc.php');
 Tools::displayFileAsDeprecated();
 
-Tools::redirect('index.php?controller=order-slip'.($_REQUEST ? '&'.http_build_query($_REQUEST) : ''), __PS_BASE_URI__, null, 'HTTP/1.1 301 Moved Permanently');
\ No newline at end of file
+Tools::redirect('index.php?controller=order-slip'.($_REQUEST ? '&'.http_build_query($_REQUEST, '', '&') : ''), __PS_BASE_URI__, null, 'HTTP/1.1 301 Moved Permanently');
\ No newline at end of file
diff --git a/order.php b/order.php
index cee4b51c1..0fcbfef20 100644
--- a/order.php
+++ b/order.php
@@ -35,4 +35,4 @@
 require(dirname(__FILE__).'/config/config.inc.php');
 Tools::displayFileAsDeprecated();
 
-Tools::redirect('index.php?controller=order'.($_REQUEST ? '&'.http_build_query($_REQUEST) : ''), __PS_BASE_URI__, null, 'HTTP/1.1 301 Moved Permanently');
\ No newline at end of file
+Tools::redirect('index.php?controller=order'.($_REQUEST ? '&'.http_build_query($_REQUEST, '', '&') : ''), __PS_BASE_URI__, null, 'HTTP/1.1 301 Moved Permanently');
\ No newline at end of file
diff --git a/password.php b/password.php
index 23d3a7b10..028a2731c 100644
--- a/password.php
+++ b/password.php
@@ -35,4 +35,4 @@
 require(dirname(__FILE__).'/config/config.inc.php');
 Tools::displayFileAsDeprecated();
 
-Tools::redirect('index.php?controller=password'.($_REQUEST ? '&'.http_build_query($_REQUEST) : ''), __PS_BASE_URI__, null, 'HTTP/1.1 301 Moved Permanently');
\ No newline at end of file
+Tools::redirect('index.php?controller=password'.($_REQUEST ? '&'.http_build_query($_REQUEST, '', '&') : ''), __PS_BASE_URI__, null, 'HTTP/1.1 301 Moved Permanently');
\ No newline at end of file
diff --git a/pdf-invoice.php b/pdf-invoice.php
index 452db943a..fba2d0817 100644
--- a/pdf-invoice.php
+++ b/pdf-invoice.php
@@ -35,4 +35,4 @@
 include(dirname(__FILE__).'/config/config.inc.php');
 Tools::displayFileAsDeprecated();
 
-Tools::redirect('index.php?controller=pdf-invoice'.($_REQUEST ? '&'.http_build_query($_REQUEST) : ''), __PS_BASE_URI__, null, 'HTTP/1.1 301 Moved Permanently');
\ No newline at end of file
+Tools::redirect('index.php?controller=pdf-invoice'.($_REQUEST ? '&'.http_build_query($_REQUEST, '', '&') : ''), __PS_BASE_URI__, null, 'HTTP/1.1 301 Moved Permanently');
\ No newline at end of file
diff --git a/pdf-order-return.php b/pdf-order-return.php
index b308570fa..3cb7daa8b 100644
--- a/pdf-order-return.php
+++ b/pdf-order-return.php
@@ -35,4 +35,4 @@
 include(dirname(__FILE__).'/config/config.inc.php');
 Tools::displayFileAsDeprecated();
 
-Tools::redirect('index.php?controller=pdf-order-return'.($_REQUEST ? '&'.http_build_query($_REQUEST) : ''), __PS_BASE_URI__, null, 'HTTP/1.1 301 Moved Permanently');
\ No newline at end of file
+Tools::redirect('index.php?controller=pdf-order-return'.($_REQUEST ? '&'.http_build_query($_REQUEST, '', '&') : ''), __PS_BASE_URI__, null, 'HTTP/1.1 301 Moved Permanently');
\ No newline at end of file
diff --git a/pdf-order-slip.php b/pdf-order-slip.php
index b7fa09f1c..20e4da9a5 100644
--- a/pdf-order-slip.php
+++ b/pdf-order-slip.php
@@ -35,4 +35,4 @@
 include(dirname(__FILE__).'/config/config.inc.php');
 Tools::displayFileAsDeprecated();
 
-Tools::redirect('index.php?controller=pdf-order-slip'.($_REQUEST ? '&'.http_build_query($_REQUEST) : ''), __PS_BASE_URI__, null, 'HTTP/1.1 301 Moved Permanently');
\ No newline at end of file
+Tools::redirect('index.php?controller=pdf-order-slip'.($_REQUEST ? '&'.http_build_query($_REQUEST, '', '&') : ''), __PS_BASE_URI__, null, 'HTTP/1.1 301 Moved Permanently');
\ No newline at end of file
diff --git a/prices-drop.php b/prices-drop.php
index 6bb51f109..cc076176e 100644
--- a/prices-drop.php
+++ b/prices-drop.php
@@ -35,4 +35,4 @@
 require(dirname(__FILE__).'/config/config.inc.php');
 Tools::displayFileAsDeprecated();
 
-Tools::redirect('index.php?controller=prices-drop'.($_REQUEST ? '&'.http_build_query($_REQUEST) : ''), __PS_BASE_URI__, null, 'HTTP/1.1 301 Moved Permanently');
\ No newline at end of file
+Tools::redirect('index.php?controller=prices-drop'.($_REQUEST ? '&'.http_build_query($_REQUEST, '', '&') : ''), __PS_BASE_URI__, null, 'HTTP/1.1 301 Moved Permanently');
\ No newline at end of file
diff --git a/product-sort.php b/product-sort.php
index d5546d7d1..063ac819d 100644
--- a/product-sort.php
+++ b/product-sort.php
@@ -35,4 +35,4 @@
 require(dirname(__FILE__).'/config/config.inc.php');
 Tools::displayFileAsDeprecated();
 
-Tools::redirect('index.php?controller=product-sort'.($_REQUEST ? '&'.http_build_query($_REQUEST) : ''), __PS_BASE_URI__, null, 'HTTP/1.1 301 Moved Permanently');
\ No newline at end of file
+Tools::redirect('index.php?controller=product-sort'.($_REQUEST ? '&'.http_build_query($_REQUEST, '', '&') : ''), __PS_BASE_URI__, null, 'HTTP/1.1 301 Moved Permanently');
\ No newline at end of file
diff --git a/product.php b/product.php
index fcc5c477b..73b4e26d2 100644
--- a/product.php
+++ b/product.php
@@ -35,4 +35,4 @@
 require(dirname(__FILE__).'/config/config.inc.php');
 Tools::displayFileAsDeprecated();
 
-Tools::redirect('index.php?controller=product'.($_REQUEST ? '&'.http_build_query($_REQUEST) : ''), __PS_BASE_URI__, null, 'HTTP/1.1 301 Moved Permanently');
\ No newline at end of file
+Tools::redirect('index.php?controller=product'.($_REQUEST ? '&'.http_build_query($_REQUEST, '', '&') : ''), __PS_BASE_URI__, null, 'HTTP/1.1 301 Moved Permanently');
\ No newline at end of file
diff --git a/products-comparison.php b/products-comparison.php
index 7c6754d3d..e7fae68c5 100644
--- a/products-comparison.php
+++ b/products-comparison.php
@@ -35,4 +35,4 @@
 require(dirname(__FILE__).'/config/config.inc.php');
 Tools::displayFileAsDeprecated();
 
-Tools::redirect('index.php?controller=products-comparison'.($_REQUEST ? '&'.http_build_query($_REQUEST) : ''), __PS_BASE_URI__, null, 'HTTP/1.1 301 Moved Permanently');
\ No newline at end of file
+Tools::redirect('index.php?controller=products-comparison'.($_REQUEST ? '&'.http_build_query($_REQUEST, '', '&') : ''), __PS_BASE_URI__, null, 'HTTP/1.1 301 Moved Permanently');
\ No newline at end of file
diff --git a/search.php b/search.php
index ac56e7236..2edc93b9f 100644
--- a/search.php
+++ b/search.php
@@ -35,4 +35,4 @@
 require(dirname(__FILE__).'/config/config.inc.php');
 Tools::displayFileAsDeprecated();
 
-Tools::redirect('index.php?controller=search'.($_REQUEST ? '&'.http_build_query($_REQUEST) : ''), __PS_BASE_URI__, null, 'HTTP/1.1 301 Moved Permanently');
\ No newline at end of file
+Tools::redirect('index.php?controller=search'.($_REQUEST ? '&'.http_build_query($_REQUEST, '', '&') : ''), __PS_BASE_URI__, null, 'HTTP/1.1 301 Moved Permanently');
\ No newline at end of file
diff --git a/sitemap.php b/sitemap.php
index 60237919e..41ccfbbc7 100644
--- a/sitemap.php
+++ b/sitemap.php
@@ -35,4 +35,4 @@
 require(dirname(__FILE__).'/config/config.inc.php');
 Tools::displayFileAsDeprecated();
 
-Tools::redirect('index.php?controller=sitemap'.($_REQUEST ? '&'.http_build_query($_REQUEST) : ''), __PS_BASE_URI__, null, 'HTTP/1.1 301 Moved Permanently');
\ No newline at end of file
+Tools::redirect('index.php?controller=sitemap'.($_REQUEST ? '&'.http_build_query($_REQUEST, '', '&') : ''), __PS_BASE_URI__, null, 'HTTP/1.1 301 Moved Permanently');
\ No newline at end of file
diff --git a/statistics.php b/statistics.php
index 88db88f83..337fcb9be 100644
--- a/statistics.php
+++ b/statistics.php
@@ -35,4 +35,4 @@
 require(dirname(__FILE__).'/config/config.inc.php');
 Tools::displayFileAsDeprecated();
 
-Tools::redirect('index.php?controller=statistics'.($_REQUEST ? '&'.http_build_query($_REQUEST) : ''), __PS_BASE_URI__, null, 'HTTP/1.1 301 Moved Permanently');
\ No newline at end of file
+Tools::redirect('index.php?controller=statistics'.($_REQUEST ? '&'.http_build_query($_REQUEST, '', '&') : ''), __PS_BASE_URI__, null, 'HTTP/1.1 301 Moved Permanently');
\ No newline at end of file
diff --git a/stores.php b/stores.php
index f06d450b0..83d5c300d 100644
--- a/stores.php
+++ b/stores.php
@@ -35,4 +35,4 @@
 require(dirname(__FILE__).'/config/config.inc.php');
 Tools::displayFileAsDeprecated();
 
-Tools::redirect('index.php?controller=stores'.($_REQUEST ? '&'.http_build_query($_REQUEST) : ''), __PS_BASE_URI__, null, 'HTTP/1.1 301 Moved Permanently');
\ No newline at end of file
+Tools::redirect('index.php?controller=stores'.($_REQUEST ? '&'.http_build_query($_REQUEST, '', '&') : ''), __PS_BASE_URI__, null, 'HTTP/1.1 301 Moved Permanently');
\ No newline at end of file
diff --git a/supplier.php b/supplier.php
index 0354297e9..a8de797c0 100644
--- a/supplier.php
+++ b/supplier.php
@@ -35,4 +35,4 @@
 require(dirname(__FILE__).'/config/config.inc.php');
 Tools::displayFileAsDeprecated();
 
-Tools::redirect('index.php?controller=supplier'.($_REQUEST ? '&'.http_build_query($_REQUEST) : ''), __PS_BASE_URI__, null, 'HTTP/1.1 301 Moved Permanently');
\ No newline at end of file
+Tools::redirect('index.php?controller=supplier'.($_REQUEST ? '&'.http_build_query($_REQUEST, '', '&') : ''), __PS_BASE_URI__, null, 'HTTP/1.1 301 Moved Permanently');
\ No newline at end of file