From 634934e6cf33f3d17562a52bd321cda46f241381 Mon Sep 17 00:00:00 2001 From: lBrieu Date: Thu, 17 Nov 2011 09:54:49 +0000 Subject: [PATCH] // bug fix when trying to add files to combinations git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10201 b9a71923-0436-4b27-9f14-aed3839534dd --- controllers/admin/AdminProductsController.php | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/controllers/admin/AdminProductsController.php b/controllers/admin/AdminProductsController.php index e8f17b9e7..5dab401ee 100644 --- a/controllers/admin/AdminProductsController.php +++ b/controllers/admin/AdminProductsController.php @@ -1400,10 +1400,11 @@ if (false) // Trick's if ($edit == 1) { - $id_product_download_attibute = ProductDownload::getIdFromIdAttribute((int) $product->id, $id_product_attribute); - $id_product_download = ($id_product_download_attibute) ? (int) $id_product_download_attibute : (int) Tools::getValue('virtual_product_id'); - } - + $id_product_download_attribute = ProductDownload::getIdFromIdAttribute((int) $product->id, $id_product_attribute); + $id_product_download = ($id_product_download_attribute) ? (int) $id_product_download_attribute : (int) Tools::getValue('virtual_product_id'); + } else + $id_product_download = Tools::getValue('virtual_product_id'); + $is_shareable = Tools::getValue('virtual_product_is_shareable'); $virtual_product_name = Tools::getValue('virtual_product_name'); $virtual_product_filename = Tools::getValue('virtual_product_filename'); @@ -1460,8 +1461,8 @@ if (false) /* unactive download product if checkbox not checked */ if ($edit == 1) { - $id_product_download_attibute = ProductDownload::getIdFromIdAttribute((int) $product->id, $id_product_attribute); - $id_product_download = ($id_product_download_attibute) ? (int) $id_product_download_attibute : (int) Tools::getValue('virtual_product_id'); + $id_product_download_attribute = ProductDownload::getIdFromIdAttribute((int) $product->id, $id_product_attribute); + $id_product_download = ($id_product_download_attribute) ? (int) $id_product_download_attribute : (int) Tools::getValue('virtual_product_id'); } else $id_product_download = ProductDownload::getIdFromIdProduct($product->id);