logo

mastofe

My custom branche(s) on git.pleroma.social/pleroma/mastofe
commit: d3a62d263703142250d7d59335394a8e2a599ed4
parent: 4bc625166e381da15aea667b968e186c11be0217
Author: Eugen Rochko <eugen@zeonfederated.com>
Date:   Thu, 22 Feb 2018 00:28:19 +0100

Fix #6525: Make sure file is opened in LazyThumbnail processor (#6529)


Diffstat:

Mapp/models/concerns/account_avatar.rb2+-
Mapp/models/concerns/account_header.rb2+-
Mlib/paperclip/lazy_thumbnail.rb2+-
3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/models/concerns/account_avatar.rb b/app/models/concerns/account_avatar.rb @@ -8,7 +8,7 @@ module AccountAvatar class_methods do def avatar_styles(file) styles = { original: { geometry: '120x120#', file_geometry_parser: FastGeometryParser } } - styles[:static] = { format: 'png', convert_options: '-coalesce', file_geometry_parser: FastGeometryParser } if file.content_type == 'image/gif' + styles[:static] = { geometry: '120x120#', format: 'png', convert_options: '-coalesce', file_geometry_parser: FastGeometryParser } if file.content_type == 'image/gif' styles end diff --git a/app/models/concerns/account_header.rb b/app/models/concerns/account_header.rb @@ -8,7 +8,7 @@ module AccountHeader class_methods do def header_styles(file) styles = { original: { geometry: '700x335#', file_geometry_parser: FastGeometryParser } } - styles[:static] = { format: 'png', convert_options: '-coalesce', file_geometry_parser: FastGeometryParser } if file.content_type == 'image/gif' + styles[:static] = { geometry: '700x335#', format: 'png', convert_options: '-coalesce', file_geometry_parser: FastGeometryParser } if file.content_type == 'image/gif' styles end diff --git a/lib/paperclip/lazy_thumbnail.rb b/lib/paperclip/lazy_thumbnail.rb @@ -3,7 +3,7 @@ module Paperclip class LazyThumbnail < Paperclip::Thumbnail def make - return @file unless needs_convert? + return File.open(@file.path) unless needs_convert? Paperclip::Thumbnail.make(file, options, attachment) end