dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[-] BO : fix bug #PSCFV-2251 - http_build_query must fix arg_separator

Browse Source
This commit is contained in:
tDidierjean
2012-05-09 13:39:19 +00:00
parent b15004b28f
commit f7e72c61dd
44 changed files with 47 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/Dispatcher.php
+3 -3
View File
@@ -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;
classes/Link.php
+2 -2
View File
@@ -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)
classes/ModuleGraph.php
+1 -1
View File
@@ -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);
classes/controller/AdminController.php
+1 -1
View File
@@ -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');
classes/controller/FrontController.php
+1 -1
View File
@@ -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');