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: always try to convert PNG to JPG when pasting an image

Browse Source
This commit is contained in:
Régis Hanol
2017-06-23 12:13:48 +02:00
parent bfd892bbbc
commit a9c0df0b58
4 changed files with 33 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/upload_creator.rb
View File

@@ -19,6 +19,7 @@ class UploadCreator
# - for_group_message (boolean)
# - for_theme (boolean)
# - for_private_message (boolean)
# - pasted (boolean)
def initialize(file, filename, opts = {})
@upload = Upload.new
@file = file
@@ -121,9 +122,10 @@ class UploadCreator
MIN_PIXELS_TO_CONVERT_TO_JPEG ||= 1280 * 720
def should_convert_to_jpeg?
TYPES_CONVERTED_TO_JPEG.include?(@image_info.type) &&
pixels > MIN_PIXELS_TO_CONVERT_TO_JPEG &&
SiteSetting.png_to_jpg_quality < 100
return false if !TYPES_CONVERTED_TO_JPEG.include?(@image_info.type)
return true if @opts[:pasted]
return false if SiteSetting.png_to_jpg_quality < 100
pixels > MIN_PIXELS_TO_CONVERT_TO_JPEG
end
def convert_to_jpeg!