diff options
| author | ThibG <thib@sitedethib.com> | 2018-07-10 10:52:18 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-10 10:52:18 +0200 |
| commit | e6647ccf6d13030a91c7e635526e1e40a059ce31 (patch) | |
| tree | eda07c40c934ab9a55d7847afe4af3e54bce86b8 /app/models/concerns/attachmentable.rb | |
| parent | c699b2d141d7aa910bd81ae5fe881ecec7039395 (diff) | |
| parent | 402da8065c2b378cca6361f2c7252bd766f25dde (diff) | |
Merge pull request #557 from ThibG/glitch-soc/tentative-merge
Merge upstream changes
Diffstat (limited to 'app/models/concerns/attachmentable.rb')
| -rw-r--r-- | app/models/concerns/attachmentable.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/concerns/attachmentable.rb b/app/models/concerns/attachmentable.rb index 44bdfa39a..de4cf8775 100644 --- a/app/models/concerns/attachmentable.rb +++ b/app/models/concerns/attachmentable.rb @@ -28,7 +28,7 @@ module Attachmentable self.class.attachment_definitions.each_key do |attachment_name| attachment = send(attachment_name) - next if attachment.blank? || !attachment.content_type.match?(/image.*/) || attachment.queued_for_write[:original].blank? + next if attachment.blank? || !/image.*/.match?(attachment.content_type) || attachment.queued_for_write[:original].blank? width, height = FastImage.size(attachment.queued_for_write[:original].path) |