From 5f906defc8c7d6e04730c015ebdf9f1d7e4a479a Mon Sep 17 00:00:00 2001
From: John Edmonds <john.a.edmonds@gmail.com>
Date: Sun, 25 Sep 2011 11:48:59 -0400
Subject: [PATCH] Directly use UploadedFile object if available.
Opera doesn't support XHR file uploads and instead submits a regular form.
Thus, we are provided with an UploadedFile object which can be used instead of creating our own compatible object.
---
app/controllers/photos_controller.rb | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/app/controllers/photos_controller.rb b/app/controllers/photos_controller.rb
index 1afafd9b9e..e739c2e38c 100644
--- a/app/controllers/photos_controller.rb
+++ b/app/controllers/photos_controller.rb
@@ -49,7 +49,11 @@ class PhotosController < ApplicationController
params[:photo][:aspect_ids] = params[:photo][:aspect_ids].values
end
- params[:photo][:user_file] = file_handler(params)
+ params[:photo][:user_file] = if request.params.has_key?(:qqfile) and not request.params[:qqfile].is_a?(String)
+ params[:qqfile]
+ else
+ file_handler(params)
+ end
@photo = current_user.build_post(:photo, params[:photo])
--
GitLab