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
classes/ImageManager.php
+2 -2
View File
@@ -114,7 +114,7 @@ class ImageManagerCore
* @param string $file_type
* @return boolean Operation result
*/
public static function resize($src_file, $dst_file, $dst_width = null, $dst_height = null, $file_type = 'jpg')
public static function resize($src_file, $dst_file, $dst_width = null, $dst_height = null, $file_type = 'jpg', $force_type = false)
{
if (!file_exists($src_file))
return false;
@@ -124,7 +124,7 @@ class ImageManagerCore
// This allow for higher quality and for transparency. JPG source files will also benefit from a higher quality
// because JPG reencoding by GD, even with max quality setting, degrades the image.
if (Configuration::get('PS_IMAGE_QUALITY') == 'png_all'
|| (Configuration::get('PS_IMAGE_QUALITY') == 'png' && $type == IMAGETYPE_PNG))
|| (Configuration::get('PS_IMAGE_QUALITY') == 'png' && $type == IMAGETYPE_PNG) && !$force_type)
$file_type = 'png';
if (!$src_width)