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

// product import improved (image problem because of file_exists PHP function)

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14852 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
vChabot
2012-04-24 14:39:29 +00:00
parent 67642bac3a
commit 79e53679b5
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controllers/admin/AdminImportController.php
+3 -3
View File
@@ -1151,6 +1151,7 @@ class AdminImportControllerCore extends AdminController
} }
} }
$shops = array();
// If both failed, mysql error // If both failed, mysql error
if (!$res) if (!$res)
{ {
@@ -1175,8 +1176,6 @@ class AdminImportControllerCore extends AdminController
} }
$product->associateTo($shops); $product->associateTo($shops);
} }
else
$shops = array();
// SpecificPrice (only the basic reduction feature is supported by the import) // SpecificPrice (only the basic reduction feature is supported by the import)
if ((isset($info['reduction_price']) && $info['reduction_price'] > 0) || (isset($info['reduction_percent']) && $info['reduction_percent'] > 0)) if ((isset($info['reduction_price']) && $info['reduction_price'] > 0) || (isset($info['reduction_percent']) && $info['reduction_percent'] > 0))
@@ -1256,7 +1255,8 @@ class AdminImportControllerCore extends AdminController
$image->id_product = (int)$product->id; $image->id_product = (int)$product->id;
$image->position = Image::getHighestPosition($product->id) + 1; $image->position = Image::getHighestPosition($product->id) + 1;
$image->cover = (!$key && !$product_has_images) ? true : false; $image->cover = (!$key && !$product_has_images) ? true : false;
if (!file_exists($url)) // file_exists doesn't work with HTTP protocol
if (@fopen($url, 'r') == false)
$error = true; $error = true;
else if (($field_error = $image->validateFields(UNFRIENDLY_ERROR, true)) === true && else if (($field_error = $image->validateFields(UNFRIENDLY_ERROR, true)) === true &&
($lang_field_error = $image->validateFieldsLang(UNFRIENDLY_ERROR, true)) === true && $image->add()) ($lang_field_error = $image->validateFieldsLang(UNFRIENDLY_ERROR, true)) === true && $image->add())