github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-06-25 01:30:17 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

renamed the sha column to the proper sha1

Browse Source
This commit is contained in:
Régis Hanol
2013-06-17 22:16:14 +02:00
parent 1051b8de84
commit ae3543872c
5 changed files with 28 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/s3.rb
View File

@ -1,13 +1,13 @@
module S3
def self.store_file(file, sha, image_info, upload_id)
def self.store_file(file, sha1, image_info, upload_id)
raise Discourse::SiteSettingMissing.new("s3_upload_bucket") if SiteSetting.s3_upload_bucket.blank?
raise Discourse::SiteSettingMissing.new("s3_access_key_id") if SiteSetting.s3_access_key_id.blank?
raise Discourse::SiteSettingMissing.new("s3_secret_access_key") if SiteSetting.s3_secret_access_key.blank?
@fog_loaded = require 'fog' unless @fog_loaded
remote_filename = "#{upload_id}#{sha}.#{image_info.type}"
remote_filename = "#{upload_id}#{sha1}.#{image_info.type}"
options = S3.generate_options
directory = S3.get_or_create_directory(SiteSetting.s3_upload_bucket, options)