Fixes CKEditor file upload

publify · Mar 16, 2012 · 9272674 · 9272674
1 parent a1e70bb
commit 9272674
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/vendor/plugins/easy-ckeditor/app/controllers/ckeditor_controller.rb b/vendor/plugins/easy-ckeditor/app/controllers/ckeditor_controller.rb
@@ -95,6 +95,7 @@ def create_folder
   def upload_file
     begin
       load_file_from_params
+
       Resource.create(:filename => @new_file.original_filename, :mime => @ftype, :created_at => Time.now)
       copy_tmp_file(@new_file) if mime_types_ok(@ftype)
     rescue => e
@@ -207,7 +208,7 @@ def uploaded_file_path
   #
   def check_file(file)
     log "CKEDITOR ---- CLASS OF UPLOAD OBJECT: #{file.class}"
-    unless [Tempfile, StringIO].include? file.class
+    unless [Tempfile, StringIO, ActionDispatch::Http::UploadedFile].include? file.class
       @errorNumber = 403
       throw Exception.new
     end