[-] BO : fixed infinite loop in the categories #PSCFV-8965

PrestaShop · May 2, 2013 · 87be8bd · 87be8bd
1 parent e67965e
commit 87be8bd
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/controllers/admin/AdminCategoriesController.php b/controllers/admin/AdminCategoriesController.php
@@ -146,7 +146,7 @@ public function init()
 		if (Shop::isFeatureActive() && Shop::getContext() != Shop::CONTEXT_SHOP)
 			unset($this->fields_list['position']);
 		// shop restriction : if category is not available for current shop, we redirect to the list from default category
-		if (!$this->_category->isAssociatedToShop() && Shop::getContext() == Shop::CONTEXT_SHOP)
+		if (Validate::isLoadedObject($this->_category) && !$this->_category->isAssociatedToShop() && Shop::getContext() == Shop::CONTEXT_SHOP)
 		{
 			$this->redirect_after = self::$currentIndex.'&id_category='.(int)$this->context->shop->getCategory().'&token='.$this->token;
 			$this->redirect();