dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[-] BO : fix #PSCFV-3276

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16510 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
lLefevre
2012-07-20 14:16:54 +00:00
parent fe2542ef07
commit f9dac67c18
5 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controllers/admin/AdminImportController.php
+2 -2
View File
@@ -900,7 +900,7 @@ class AdminImportControllerCore extends AdminController
);
$res = false;
if (($field_error = $category->validateFields(UNFRIENDLY_ERROR, true)) === true &&
($lang_field_error = $category->validateFieldsLang(UNFRIENDLY_ERROR, true)) === true)
($lang_field_error = $category->validateFieldsLang(UNFRIENDLY_ERROR, true)) === true && empty($this->errors))
{
$category_already_created = Category::searchByNameAndParentCategoryId(
$default_language_id,
@@ -931,7 +931,7 @@ class AdminImportControllerCore extends AdminController
//copying images of categories
if (isset($category->image) && !empty($category->image))
if (!(AdminImportController::copyImg($category->id, null, $category->image, 'categories')))
$this->warnings[] = $category->image.' '.Tools::displayError('Cannot be copied');
$this->warnings[] = $category->image.' '.Tools::displayError('cannot be copied');
// If both failed, mysql error
if (!$res)
{