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

[-] FO : #PSCFI-4733 - Pagination creates pages that should not exist (and duplicate content)

Browse Source
This commit is contained in:
mDeflotte
2012-02-22 09:33:03 +00:00
parent 1c288bf01d
commit 7e669604c3
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
classes/controller/FrontController.php
View File

@@ -743,6 +743,12 @@ class FrontControllerCore extends Controller
$this->n = abs((int)(Tools::getValue('n', ((isset($this->context->cookie->nb_item_per_page) && $this->context->cookie->nb_item_per_page >= 10) ? $this->context->cookie->nb_item_per_page : (int)(Configuration::get('PS_PRODUCTS_PER_PAGE'))))));
$this->p = abs((int)(Tools::getValue('p', 1)));
if (!is_numeric(Tools::getValue('p', 1)) || Tools::getValue('p', 1) < 0)
{
$this->redirect_after = '404';
$this->redirect();
}
$current_url = tools::htmlentitiesUTF8($_SERVER['REQUEST_URI']);
//delete parameter page
$current_url = preg_replace('/(\?)?(&amp;)?p=\d+/', '$1', $current_url);
@@ -755,8 +761,12 @@ class FrontControllerCore extends Controller
if (isset($this->context->cookie->nb_item_per_page) && $this->n != $this->context->cookie->nb_item_per_page && in_array($this->n, $nArray))
$this->context->cookie->nb_item_per_page = $this->n;
if ($this->p > ($nbProducts / $this->n))
$this->p = ceil($nbProducts / $this->n);
if ($this->p > (($nbProducts / $this->n) + 1))
{
$this->redirect_after = preg_replace('/[&?]p=\d+/', '', $_SERVER['REQUEST_URI']);
$this->redirect();
}
$pages_nb = ceil($nbProducts / (int)($this->n));
$start = (int)($this->p - $range);