//merge 1.4 => 1.5

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@6124 b9a71923-0436-4b27-9f14-aed3839534dd
2011-04-29 12:34:09 +00:00
parent 39eca4ab76
commit 35ff645731
8 changed files with 58 additions and 17 deletions
@@ -540,8 +540,8 @@ class AdminImport extends AdminTab
 					$res = $category->update();

 				// If no id_category or update failed
-				if (!$res AND $res = $category->add())
-					$category->addGroups(array(1));
+				if (!$res)
+					$res = $category->add();
 			}
 			//copying images of categories
 			if (isset($category->image) AND !empty($category->image))