From 4dc087b286120e32fa4e225d384e67ce7aaa406b Mon Sep 17 00:00:00 2001 From: rMalie Date: Thu, 19 Apr 2012 15:06:15 +0000 Subject: [PATCH] // Fix product SEO git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14775 b9a71923-0436-4b27-9f14-aed3839534dd --- controllers/admin/AdminProductsController.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/controllers/admin/AdminProductsController.php b/controllers/admin/AdminProductsController.php index 7fa9e2750..95ecea2bf 100644 --- a/controllers/admin/AdminProductsController.php +++ b/controllers/admin/AdminProductsController.php @@ -1701,10 +1701,10 @@ class AdminProductsControllerCore extends AdminController $this->errors[] = $this->l('this field').' '.call_user_func(array($className, 'displayFieldName'), $fieldLang, $className).' ('.$language['name'].') '.$this->l('is invalid'); // Categories - if (!Tools::isSubmit('categoryBox') || !count(Tools::getValue('categoryBox'))) + if ($this->isProductFieldUpdated('id_category_default') && (!Tools::isSubmit('categoryBox') || !count(Tools::getValue('categoryBox')))) $this->errors[] = $this->l('product must be in at least one Category'); - if (!is_array(Tools::getValue('categoryBox')) || !in_array(Tools::getValue('id_category_default'), Tools::getValue('categoryBox'))) + if ($this->isProductFieldUpdated('id_category_default') && (!is_array(Tools::getValue('categoryBox')) || !in_array(Tools::getValue('id_category_default'), Tools::getValue('categoryBox')))) $this->errors[] = $this->l('product must be in the default category'); // Tags @@ -1743,7 +1743,7 @@ class AdminProductsControllerCore extends AdminController */ protected function cleanMultishopFields() { - if (Shop::isFeatureActive() && Shop::getContext() != Shop::CONTEXT_SHOP && $this->display == 'edit') + if (Shop::isFeatureActive() && Shop::getContext() != Shop::CONTEXT_SHOP && $this->id_object) { $this->object = $this->loadObject(); foreach (Product::$definition['fields'] as $field => $data)