summaryrefslogtreecommitdiff
path: root/app/uploaders/uploader_helper.rb
diff options
context:
space:
mode:
Diffstat (limited to 'app/uploaders/uploader_helper.rb')
-rw-r--r--app/uploaders/uploader_helper.rb9
1 files changed, 1 insertions, 8 deletions
diff --git a/app/uploaders/uploader_helper.rb b/app/uploaders/uploader_helper.rb
index 7635c20ab3a..fd446d31092 100644
--- a/app/uploaders/uploader_helper.rb
+++ b/app/uploaders/uploader_helper.rb
@@ -32,14 +32,7 @@ module UploaderHelper
def extension_match?(extensions)
return false unless file
- extension =
- if file.respond_to?(:extension)
- file.extension
- else
- # Not all CarrierWave storages respond to :extension
- File.extname(file.path).delete('.')
- end
-
+ extension = file.try(:extension) || File.extname(file.path).delete('.')
extensions.include?(extension.downcase)
end
end