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

// Miss on last commit

Browse Source
This commit is contained in:
rGaillard
2011-12-22 22:14:36 +00:00
parent e3b373dc71
commit 6632ca1dee
2 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/FileUploader.php
+1
View File
@@ -158,6 +158,7 @@ class qqUploadedFileXhr
$theme = (Shop::isFeatureActive() ? '-'.$imageType['id_theme'] : ''); $theme = (Shop::isFeatureActive() ? '-'.$imageType['id_theme'] : '');
if (!imageResize($tmpName, $new_path.'-'.stripslashes($imageType['name']).$theme.'.'.$image->image_format, $imageType['width'], $imageType['height'], $image->image_format)) if (!imageResize($tmpName, $new_path.'-'.stripslashes($imageType['name']).$theme.'.'.$image->image_format, $imageType['width'], $imageType['height'], $image->image_format))
return array('error' => Tools::displayError('An error occurred while copying image:').' '.stripslashes($imageType['name'])); return array('error' => Tools::displayError('An error occurred while copying image:').' '.stripslashes($imageType['name']));
}
} }
unlink($tmpName); unlink($tmpName);
Hook::exec('watermark', array('id_image' => $id_image, 'id_product' => $id_product)); Hook::exec('watermark', array('id_image' => $id_image, 'id_product' => $id_product));
classes/Link.php
-2
View File
@@ -317,8 +317,6 @@ class LinkCore
$uri_path = _THEME_PROD_DIR_.$ids.($type ? '-'.$type : '').$theme.'.jpg'; $uri_path = _THEME_PROD_DIR_.$ids.($type ? '-'.$type : '').$theme.'.jpg';
} }
else else
$uri_path = _THEME_PROD_DIR_.$ids.($type ? '-'.$type : '').'.jpg';
}else
{ {
// if ids if of the form id_product-id_image, we want to extract the id_image part // if ids if of the form id_product-id_image, we want to extract the id_image part
$split_ids = explode('-', $ids); $split_ids = explode('-', $ids);