Discourse/discourse
Discourse/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-09-06 10:50:21 +08:00
Code Packages Activity Actions 13

FIX: Allow api to send uploads with :url

Browse source
This commit is contained in:
Konstantin Ilchenko 2015-06-21 14:52:52 +03:00
parent ca42d00883
commit 131cf643ce
2 changed files with 18 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/controllers/uploads_controller.rb
View file

@ -4,7 +4,7 @@ class UploadsController < ApplicationController
def create
type = params.require(:type)
file = params[:file] || params[:files].first
file = params[:file] || params[:files].try(:first)
url = params[:url]
client_id = params[:client_id]
synchronous = is_api? && params[:synchronous]
@ -52,7 +52,7 @@ class UploadsController < ApplicationController
# API can provide a URL
if file.nil? && url.present? && is_api?
tempfile = FileHelper.download(url, SiteSetting.max_image_size_kb.kilobytes, "discourse-upload-#{type}") rescue nil
filename = File.basename(URI.parse(file).path)
filename = File.basename(URI.parse(url).path)
else
tempfile = file.tempfile
filename = file.original_filename