diff options
| author | ThibG <thib@sitedethib.com> | 2020-03-08 22:09:53 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-08 22:09:53 +0100 |
| commit | 840b17e3444f9a68d3639f1ffeb326e8cb1e03b1 (patch) | |
| tree | 8254538ed33f4c4b974b5379f3b5a0b489ba095a /app/models/media_attachment.rb | |
| parent | 13ef4d5fb0dbb66074f42df7989ae40509a4724f (diff) | |
| parent | 9c2922958783f7e499cdda5bb874d6096e47eb0a (diff) | |
Merge pull request #1297 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/models/media_attachment.rb')
| -rw-r--r-- | app/models/media_attachment.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/models/media_attachment.rb b/app/models/media_attachment.rb index 6a0b892f6..2813d9200 100644 --- a/app/models/media_attachment.rb +++ b/app/models/media_attachment.rb @@ -170,6 +170,7 @@ class MediaAttachment < ApplicationRecord def variant?(other_file_name) return true if file_file_name == other_file_name + return false if file_file_name.nil? formats = file.styles.values.map(&:format).compact |