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

Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development

Browse Source 
Conflicts:
	controllers/admin/AdminImportController.php
This commit is contained in:
gRoussac
2013-09-19 16:38:01 +02:00
parent 0c511dead5 6b47f5713e
commit 803b6ce8ec
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controllers/admin/AdminImportController.php
+1 -1
View File
@@ -1474,7 +1474,7 @@ class AdminImportControllerCore extends AdminController
$error = true; $error = true;
if ($error) if ($error)
$this->warnings[] = sprintf(Tools::displayError('Product n°%1$d: the picture cannot be saved: %2$s'), $image->id_product, $url); $this->warnings[] = sprintf(Tools::displayError('Product n°%1$d: the picture cannot be saved: %2$s'), $image->id_product, $url);
} }
} }
if (isset($product->id_category)) if (isset($product->id_category))