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

// Fix strict standard on controllers + modules header / footer include

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8727 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
rMalie
2011-09-23 08:05:31 +00:00
parent 34c4d39649
commit d8b6693264
16 changed files with 40 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/FrontController.php
+4 -4
View File
@@ -412,9 +412,9 @@ class FrontControllerCore extends ControllerCore
exit;
}
protected function canonicalRedirection($canonicalURL)
protected function canonicalRedirection($canonicalURL = '')
{
if (!Configuration::get('PS_CANONICAL_REDIRECT'))
if (!$canonicalURL || !Configuration::get('PS_CANONICAL_REDIRECT'))
return;
$matchUrl = (($this->ssl && Configuration::get('PS_SSL_ENABLED')) ? 'https://' : 'http://').$_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI'];
@@ -599,11 +599,11 @@ class FrontControllerCore extends ControllerCore
asort($nArray);
$this->n = abs((int)(Tools::getValue('n', ((isset($this->context->cookie->nb_item_per_page) AND $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)));
$current_url = tools::htmlentitiesUTF8($_SERVER['REQUEST_URI']);
//delete parameter page
$current_url = preg_replace('/(\?)?(&)?p=\d+/', '$1', $current_url);
$range = 2; /* how many pages around page selected */
if ($this->p < 0)