IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

BUGFIX: attachments bust under multisite

Browse Source
This commit is contained in:
Sam
2014-03-25 10:37:31 +11:00
parent 14f7551f2b
commit 3830f41e5f
3 changed files with 26 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
app/controllers/uploads_controller.rb
View File

@@ -30,17 +30,21 @@ class UploadsController < ApplicationController
end
def show
return render nothing: true, status: 404 unless Discourse.store.internal?
RailsMultisite::ConnectionManagement.with_connection(params[:site]) do |db|
id = params[:id].to_i
url = request.fullpath
return render nothing: true, status: 404 unless Discourse.store.internal?
# the "url" parameter is here to prevent people from scanning the uploads using the id
upload = Upload.where(id: id, url: url).first
id = params[:id].to_i
url = request.fullpath
return render nothing: true, status: 404 unless upload
# the "url" parameter is here to prevent people from scanning the uploads using the id
upload = Upload.where(id: id, url: url).first
send_file(Discourse.store.path_for(upload), filename: upload.original_filename)
return render nothing: true, status: 404 unless upload
send_file(Discourse.store.path_for(upload), filename: upload.original_filename)
end
end
end