Merge pull request #743 from sjml/patch-1

Fixing Amazon uploads to not be hardcoded to https
2013-04-19 18:32:05 -07:00 · 2013-04-19 18:32:05 -07:00 · 8c8706a711
parent b644509c28 42fdbe2fb6
commit 8c8706a711
1 changed files with 1 additions and 1 deletions
--- a/app/models/upload.rb
+++ b/app/models/upload.rb
@ -57,7 +57,7 @@ class Upload < ActiveRecord::Base
                                  public: true,
                                  content_type: file.content_type)
    upload.width, upload.height = ImageSizer.resize(*image_info.size)
-    upload.url = "https://#{SiteSetting.s3_upload_bucket}.s3.amazonaws.com#{path}/#{remote_filename}"
+    upload.url = "//#{SiteSetting.s3_upload_bucket}.s3.amazonaws.com#{path}/#{remote_filename}"

    upload.save