From 8ceb2c3702e5996ee5cf2fadc76fbb6f3c2922bf Mon Sep 17 00:00:00 2001 From: mBertholino Date: Wed, 28 Dec 2011 16:14:23 +0000 Subject: [PATCH] [-] BO : #PSTEST-232 : Product pictures are now displayed with multishop --- classes/AdminController.php | 4 ++-- classes/FileUploader.php | 8 ++++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/classes/AdminController.php b/classes/AdminController.php index f476d8f9f..ff84ce5ec 100644 --- a/classes/AdminController.php +++ b/classes/AdminController.php @@ -546,7 +546,7 @@ class AdminControllerCore extends Controller { if (!empty($this->fieldImageSettings)) $res = $object->deleteImage(); - + if (!$res) $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->addJquery(); - $this->addjQueryPlugin(array('cluetip', 'hoverIntent', 'scrollTo', 'alerts')); + $this->addjQueryPlugin(array('cluetip', 'hoverIntent', 'scrollTo')); $this->addJS(array( _PS_JS_DIR_.'admin.js', diff --git a/classes/FileUploader.php b/classes/FileUploader.php index 5e4816cb8..a5494236b 100755 --- a/classes/FileUploader.php +++ b/classes/FileUploader.php @@ -219,8 +219,12 @@ class qqUploadedFileXhr $imagesTypes = ImageType::getImagesTypes('products'); 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'])); } }