//merge 1.4 => 1.5

This commit is contained in:
vAugagneur
2011-04-29 12:34:09 +00:00
parent de8741a55d
commit 05440b91e2
8 changed files with 58 additions and 17 deletions
+2 -2
View File
@@ -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))