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

Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development

Browse Source
This commit is contained in:
gRoussac
2013-11-04 11:48:25 +01:00
parent ad555f1d30 b3c54a59dd
commit 9ea79f8cb5
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/controller/FrontController.php
+2 -2
View File
@@ -850,7 +850,7 @@ class FrontControllerCore extends Controller
if (!is_numeric(Tools::getValue('p', 1)) || Tools::getValue('p', 1) < 0) if (!is_numeric(Tools::getValue('p', 1)) || Tools::getValue('p', 1) < 0)
Tools::redirect(self::$link->getPaginationLink(false, false, $this->n, false, 1, false)); Tools::redirect(self::$link->getPaginationLink(false, false, $this->n, false, 1, false));
$current_url = tools::htmlentitiesUTF8($_SERVER['REQUEST_URI']); $current_url = Tools::htmlentitiesUTF8($_SERVER['REQUEST_URI']);
//delete parameter page //delete parameter page
$current_url = preg_replace('/(\?)?(&amp;)?p=\d+/', '$1', $current_url); $current_url = preg_replace('/(\?)?(&amp;)?p=\d+/', '$1', $current_url);
@@ -919,7 +919,7 @@ class FrontControllerCore extends Controller
$ips = array_map('trim', $ips); $ips = array_map('trim', $ips);
if (is_array($ips) && count($ips)) if (is_array($ips) && count($ips))
foreach ($ips as $ip) foreach ($ips as $ip)
if (!empty($ip) && strpos($user_ip, $ip) === 0) if (!empty($ip) && preg_match('/^'.$ip.'.*/', $user_ip))
$allowed = true; $allowed = true;
return $allowed; return $allowed;
} }