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

[-] BO : #PSTEST-232 : Product pictures are now displayed with multishop

Browse Source
This commit is contained in:
mBertholino
2011-12-28 16:14:23 +00:00
parent 6867390eae
commit 8ceb2c3702
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/AdminController.php
+2 -2
View File
@@ -546,7 +546,7 @@ class AdminControllerCore extends Controller
{ {
if (!empty($this->fieldImageSettings)) if (!empty($this->fieldImageSettings))
$res = $object->deleteImage(); $res = $object->deleteImage();
if (!$res) if (!$res)
$this->_errors[] = Tools::displayError('Unable to delete associated images'); $this->_errors[] = Tools::displayError('Unable to delete associated images');
@@ -1573,7 +1573,7 @@ class AdminControllerCore extends Controller
$this->addCSS(_THEME_CSS_DIR_.'rtl.css'); $this->addCSS(_THEME_CSS_DIR_.'rtl.css');
$this->addJquery(); $this->addJquery();
$this->addjQueryPlugin(array('cluetip', 'hoverIntent', 'scrollTo', 'alerts')); $this->addjQueryPlugin(array('cluetip', 'hoverIntent', 'scrollTo'));
$this->addJS(array( $this->addJS(array(
_PS_JS_DIR_.'admin.js', _PS_JS_DIR_.'admin.js',
classes/FileUploader.php
+6 -2
View File
@@ -219,8 +219,12 @@ class qqUploadedFileXhr
$imagesTypes = ImageType::getImagesTypes('products'); $imagesTypes = ImageType::getImagesTypes('products');
foreach ($imagesTypes AS $k => $imageType) foreach ($imagesTypes AS $k => $imageType)
{ {
$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)) $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))
return array('error' => Tools::displayError('An error occurred while copying image:').' '.stripslashes($imageType['name']));
*/
if (!imageResize($tmpName, $new_path.'-'.stripslashes($imageType['name']).'.'.$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']));
} }
} }