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

[-] FO: Fix PSCFV-2766 logo store cannot be changed

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16112 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
rGaillard
2012-06-22 09:55:05 +00:00
parent b37c0dc297
commit eb3b7e564b
7 changed files with 22 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controllers/admin/AdminThemesController.php
+14 -5
View File
@@ -528,12 +528,21 @@ class AdminThemesControllerCore extends AdminController
if (!$tmp_name || !move_uploaded_file($_FILES[$field_name]['tmp_name'], $tmp_name))
return false;
$logo_name = $logo_prefix.'-'.(int)$id_shop.'.jpg';
if (($id_shop == Configuration::get('PS_SHOP_DEFAULT') || $id_shop == 0))
$logo_name = $logo_prefix.'.jpg';
$ext = ($field_name == 'PS_STORES_ICON') ? '.gif' : '.jpg';
$logo_name = $logo_prefix.'-'.(int)$id_shop.$ext;
if (Context::getContext()->shop->getContext() == Shop::CONTEXT_ALL || $id_shop == 0)
$logo_name = $logo_prefix.$ext;
if (!@ImageManager::resize($tmp_name, _PS_IMG_DIR_.$logo_name))
$this->errors[] = Tools::displayError('An error occurred during logo copy.');
if ($field_name == 'PS_STORES_ICON')
{
if (!@ImageManager::resize($tmp_name, _PS_IMG_DIR_.$logo_name, null, null, 'gif', true))
$this->errors[] = Tools::displayError('An error occurred during logo copy.');
}
else
{
if (!@ImageManager::resize($tmp_name, _PS_IMG_DIR_.$logo_name))
$this->errors[] = Tools::displayError('An error occurred during logo copy.');
}
Configuration::updateValue($field_name, $logo_name);
$this->fields_options['appearance']['fields'][$field_name]['thumb'] = _PS_IMG_.$logo_name.'?date='.time();