From a4bfa3542070213026a13ece344db4745c17efe7 Mon Sep 17 00:00:00 2001 From: Roman Rizzi Date: Thu, 11 Jun 2020 11:06:48 -0300 Subject: [PATCH] DEV: Pass the is_image flag when triggering the before_upload_creation event (#10031) --- lib/upload_creator.rb | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/lib/upload_creator.rb b/lib/upload_creator.rb index 368569af446..caaacb0a748 100644 --- a/lib/upload_creator.rb +++ b/lib/upload_creator.rb @@ -34,16 +34,14 @@ class UploadCreator return @upload end - DiscourseEvent.trigger(:before_upload_creation, @file) + @image_info = FastImage.new(@file) rescue nil + is_image = FileHelper.is_supported_image?(@filename) + is_image ||= @image_info && FileHelper.is_supported_image?("test.#{@image_info.type}") + is_image = false if @opts[:for_theme] + + DiscourseEvent.trigger(:before_upload_creation, @file, is_image) DistributedMutex.synchronize("upload_#{user_id}_#{@filename}") do - # test for image regardless of input - @image_info = FastImage.new(@file) rescue nil - - is_image = FileHelper.is_supported_image?(@filename) - is_image ||= @image_info && FileHelper.is_supported_image?("test.#{@image_info.type}") - is_image = false if @opts[:for_theme] - if is_image extract_image_info! return @upload if @upload.errors.present?