github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-31 18:28:18 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: correct svg handling for images

Browse Source 
We regressed and optimized images no longer worked with svg

The following adds the correct logic to simply copy file for svgs
and bypasses resizing for svg avatars
This commit is contained in:
Sam
2018-11-07 15:29:14 +11:00
parent 7534042427
commit 0a442e319c
4 changed files with 21 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/models/optimized_image.rb
View File

@ -21,6 +21,7 @@ class OptimizedImage < ActiveRecord::Base
end
def self.create_for(upload, width, height, opts = {})
return unless width > 0 && height > 0
return if upload.try(:sha1).blank?
@ -29,7 +30,7 @@ class OptimizedImage < ActiveRecord::Base
upload.fix_image_extension
end
if !upload.extension.match?(IM_DECODERS)
if !upload.extension.match?(IM_DECODERS) && upload.extension != "svg"
if !opts[:raise_on_error]
# nothing to do ... bad extension, not an image
return
@ -76,7 +77,7 @@ class OptimizedImage < ActiveRecord::Base
temp_file = Tempfile.new(["discourse-thumbnail", extension])
temp_path = temp_file.path
if extension =~ /\.svg$/i
if upload.extension == "svg"
FileUtils.cp(original_path, temp_path)
resized = true
elsif opts[:crop]
@ -86,7 +87,6 @@ class OptimizedImage < ActiveRecord::Base
end
if resized
thumbnail = OptimizedImage.create!(
upload_id: upload.id,
sha1: Upload.generate_digest(temp_path),