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

// Improve multishop code

Browse Source
This commit is contained in:
rMalie
2012-05-25 13:37:43 +00:00
parent 18287e76e6
commit 7c4aaa1c44
3 changed files with 4 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controllers/front/CategoryController.php
+3 -11
View File
@@ -49,7 +49,7 @@ class CategoryControllerCore extends FrontController
public function canonicalRedirection($canonicalURL = '')
{
if (!Shop::isCategoryAvailable(Tools::getValue('id_category')))
if (!Validate::isLoadedObject($this->category) || !$this->category->inShop() || !$this->category->isAssociatedToShop())
{
$this->redirect_after = '404';
$this->redirect();
@@ -64,8 +64,6 @@ class CategoryControllerCore extends FrontController
*/
public function init()
{
parent::init();
// Get category ID
$id_category = (int)Tools::getValue('id_category');
if (!$id_category || !Validate::isUnsignedId($id_category))
@@ -73,14 +71,8 @@ class CategoryControllerCore extends FrontController
// Instantiate category
$this->category = new Category($id_category, $this->context->language->id);
if (!Validate::isLoadedObject($this->category) || !$this->category->inShop())
{
$this->errors[] = Tools::displayError('Category does not exist');
header('HTTP/1.1 404 Not Found');
header('Status: 404 Not Found');
}
else
$this->canonicalRedirection();
parent::init();
if (!$this->category->checkAccess($this->context->customer->id))
$this->errors[] = Tools::displayError('You do not have access to this category.');