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

Merge pull request #47 from doekia/PSCFV-4181

Browse Source 
[-] FO: PSCFV-4181: pruneoff unavailable products
This commit is contained in:
Vincent Augagneur
2012-11-26 06:43:40 -08:00
parent b85e38a750 e55e213783
commit 755c2532bd
1 changed files with 11 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controllers/front/CompareController.php
+11 -18
View File
@@ -103,23 +103,10 @@ class CompareControllerCore extends FrontController
foreach ($ids as $k => &$id) foreach ($ids as $k => &$id)
{ {
$curProduct = new Product((int)$id, true, $this->context->language->id); $curProduct = new Product((int)$id, true, $this->context->language->id);
if (!$curProduct->active || !$curProduct->isAssociatedToShop()) if (!Validate::isLoadedObject($curProduct) || !$curProduct->active || !$curProduct->isAssociatedToShop())
{
unset($ids[$k]);
continue;
}
if (!$curProduct->active || !$curProduct->isAssociatedToShop())
{
unset($ids[$k]);
continue;
}
if (!Validate::isLoadedObject($curProduct))
continue;
if (!$curProduct->active)
{ {
if (isset($this->context->cookie->id_compare))
CompareProduct::removeCompareProduct($this->context->cookie->id_compare, $id);
unset($ids[$k]); unset($ids[$k]);
continue; continue;
} }
@@ -149,11 +136,17 @@ class CompareControllerCore extends FrontController
)); ));
$this->context->smarty->assign('HOOK_EXTRA_PRODUCT_COMPARISON', Hook::exec('displayProductComparison', array('list_ids_product' => $ids))); $this->context->smarty->assign('HOOK_EXTRA_PRODUCT_COMPARISON', Hook::exec('displayProductComparison', array('list_ids_product' => $ids)));
} }
else if (isset($this->context->cookie->id_compare))
{
$object = new CompareProduct((int)$this->context->cookie->id_compare);
if (Validate::isLoadedObject($object))
$object->delete();
}
} }
} }
$this->context->smarty->assign('hasProduct', $hasProduct); $this->context->smarty->assign('hasProduct', $hasProduct);
$this->setTemplate(_PS_THEME_DIR_.'products-comparison.tpl'); $this->setTemplate(_PS_THEME_DIR_.'products-comparison.tpl');
} }
}
}