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

[-] FO: Fix PSCFV-3954

Browse Source
This commit is contained in:
rGaillard
2012-09-10 15:11:47 +00:00
parent 5585a9c611
commit a6ac9ea2bf
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/controller/FrontController.php
+8 -7
View File
@@ -635,23 +635,24 @@ class FrontControllerCore extends Controller
if (!preg_match('/^'.Tools::pRegexp(rawurldecode($canonical_url), '/').'([&?].*)?$/', $match_url)) if (!preg_match('/^'.Tools::pRegexp(rawurldecode($canonical_url), '/').'([&?].*)?$/', $match_url))
{ {
$params = array(); $params = array();
$excluded_key = array('isolang', 'id_lang', 'controller', 'fc');
foreach ($_GET as $key => $value)
if (!in_array($key, $excluded_key) && Validate::isUrl($key) && Validate::isUrl($value))
$params[$key] = $value;
$str_params = ''; $str_params = '';
$url_details = parse_url($canonical_url); $url_details = parse_url($canonical_url);
if (!empty($url_details['query'])) if (!empty($url_details['query']))
{ {
parse_str($url_details['query'], $query); parse_str($url_details['query'], $query);
foreach ($query as $key => $value) foreach ($query as $key => $value)
$params[$key] = $value; $params[Tools::safeOutput($key)] = Tools::safeOutput($value);
} }
$excluded_key = array('isolang', 'id_lang', 'controller', 'fc');
foreach ($_GET as $key => $value)
if (!in_array($key, $excluded_key) && Validate::isUrl($key) && Validate::isUrl($value))
$params[Tools::safeOutput($key)] = Tools::safeOutput($value);
$str_params = http_build_query($params, '', '&'); $str_params = http_build_query($params, '', '&');
if (!empty($str_params)) if (!empty($str_params))
$final_url = preg_replace('/^([^?]*)?.*$/', '$1', $canonical_url).'?'.Tools::safeOutput($str_params); $final_url = preg_replace('/^([^?]*)?.*$/', '$1', $canonical_url).'?'.$str_params;
else else
$final_url = preg_replace('/^([^?]*)?.*$/', '$1', $canonical_url); $final_url = preg_replace('/^([^?]*)?.*$/', '$1', $canonical_url);