diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2018-02-22 00:28:19 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-22 00:28:19 +0100 |
| commit | d3a62d263703142250d7d59335394a8e2a599ed4 (patch) | |
| tree | b0ff6caa8e1ea2685ce72227e75b5ddac906774d /app | |
| parent | 4bc625166e381da15aea667b968e186c11be0217 (diff) | |
Fix #6525: Make sure file is opened in LazyThumbnail processor (#6529)
Diffstat (limited to 'app')
| -rw-r--r-- | app/models/concerns/account_avatar.rb | 2 | ||||
| -rw-r--r-- | app/models/concerns/account_header.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/models/concerns/account_avatar.rb b/app/models/concerns/account_avatar.rb index 619644c9a..7712a29fd 100644 --- 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 index 5ed8a9c83..04c576b28 100644 --- 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 |