From 116221b382ce6686c34ce7ed8f3b90924e6c5d39 Mon Sep 17 00:00:00 2001 From: vAugagneur Date: Thu, 26 Jul 2012 14:03:08 +0000 Subject: [PATCH] //fixed bug "this product does not exist in this shop." git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16587 b9a71923-0436-4b27-9f14-aed3839534dd --- controllers/admin/AdminProductsController.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/controllers/admin/AdminProductsController.php b/controllers/admin/AdminProductsController.php index de0b1710e..13d44c7c1 100644 --- a/controllers/admin/AdminProductsController.php +++ b/controllers/admin/AdminProductsController.php @@ -2233,9 +2233,12 @@ class AdminProductsControllerCore extends AdminController $product = $this->object; - if ($this->display == 'edit' && Shop::isFeatureActive() && Shop::getContext() == Shop::CONTEXT_SHOP && !$product->isAssociatedToShop($this->context->shop->id)) + if ($this->display == 'edit' && Validate::isLoadedObject($product) && Shop::isFeatureActive() && Shop::getContext() == Shop::CONTEXT_SHOP && !$product->isAssociatedToShop($this->context->shop->id)) + { $this->displayWarning($this->l('Warning: this product does not exist in this shop.')); - + return; + } + // Product for multishop $this->context->smarty->assign('bullet_common_field', ''); if (Shop::isFeatureActive() && $this->display == 'edit')