// Merge -> revision 8342

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8344 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
rMalie committed 2011-09-05 14:56:02 +00:00
1 parent 371f9a5397
commit 79fd72e461
46 files changed
+1299 -249

No files matched your search

+1 -1
View File
@@ -610,7 +610,7 @@ class AdminImport extends AdminTab
$product = new Product((int)($info['id']));
$categoryData = Product::getProductCategories((int)($product->id));
foreach ($categoryData as $tmp)
$product->category[] = $tmp['id_category'];
$product->category[] = $tmp;
}
else
$product = new Product();