IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

FIX: automatic PNG to JPG conversion wasn't working

Browse Source
This commit is contained in:
Régis Hanol 2017-06-26 14:21:47 +02:00
parent fba9bbb18c
commit ecec23fae4
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/upload_creator.rb
View File

@ -124,7 +124,7 @@ class UploadCreator
def should_convert_to_jpeg? def should_convert_to_jpeg?
return false if !TYPES_CONVERTED_TO_JPEG.include?(@image_info.type) return false if !TYPES_CONVERTED_TO_JPEG.include?(@image_info.type)
return true if @opts[:pasted] return true if @opts[:pasted]
return false if SiteSetting.png_to_jpg_quality < 100 return false if SiteSetting.png_to_jpg_quality == 100
pixels > MIN_PIXELS_TO_CONVERT_TO_JPEG pixels > MIN_PIXELS_TO_CONVERT_TO_JPEG
end end