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

// Refactoring of shop class with new context Part 2

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7617 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
rMalie
2011-07-13 12:52:09 +00:00
parent c5cc771f16
commit 67c80b2b42
21 changed files with 189 additions and 193 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controllers/ProductController.php
+4 -4
View File
@@ -102,7 +102,7 @@ class ProductControllerCore extends FrontController
$this->errors[] = Tools::displayError('Product not found');
else
{
if (!Validate::isLoadedObject($this->product) OR !$this->product->isAssociatedToShop((int)$this->id_current_shop)
if (!Validate::isLoadedObject($this->product) OR !$this->product->isAssociatedToShop()
OR (!$this->product->active AND (Tools::getValue('adtoken') != Tools::encrypt('PreviewProduct'.$this->product->id))
|| !file_exists(dirname(__FILE__).'/../'.Tools::getValue('ad').'/ajax.php')))
{
@@ -160,16 +160,16 @@ class ProductControllerCore extends FrontController
if (isset($regs[2]) AND is_numeric($regs[2]))
{
if (Product::idIsOnCategoryId((int)($this->product->id), array('0' => array('id_category' => (int)($regs[2])))))
$category = new Category((int)($regs[2]), (int)self::$cookie->id_lang, (int)$this->id_current_shop);
$category = new Category((int)($regs[2]), (int)self::$cookie->id_lang);
}
elseif (isset($regs[5]) AND is_numeric($regs[5]))
{
if (Product::idIsOnCategoryId((int)($this->product->id), array('0' => array('id_category' => (int)($regs[5])))))
$category = new Category((int)($regs[5]), (int)self::$cookie->id_lang, (int)$this->id_current_shop);
$category = new Category((int)($regs[5]), (int)self::$cookie->id_lang);
}
}
if (!$category)
$category = new Category($this->product->id_category_default, (int)self::$cookie->id_lang, (int)$this->id_current_shop);
$category = new Category($this->product->id_category_default, (int)self::$cookie->id_lang);
if (isset($category) AND Validate::isLoadedObject($category))
{