FIX: lightbox wasn't working when using s3 upload

This commit is contained in:
Régis Hanol
2013-06-22 13:38:42 +02:00
parent 456cff17f8
commit 08aa23f0ca
7 changed files with 55 additions and 20 deletions

View File

@ -9,7 +9,11 @@ module S3
# if this fails, it will throw an exception
file = S3.upload(file, remote_filename, directory)
return "//#{SiteSetting.s3_upload_bucket}.s3.amazonaws.com/#{remote_filename}"
"#{S3.base_url}/#{remote_filename}"
end
def self.base_url
"//#{SiteSetting.s3_upload_bucket}.s3.amazonaws.com"
end
def self.remove_file(url)