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

FIX: properly handle images when using 's3_cdn_url'

Browse Source
This commit is contained in:
Régis Hanol
2015-05-26 11:47:33 +02:00
parent 32f91301ef
commit a797f7c664
3 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/file_store/s3_store.rb
View File

@@ -32,7 +32,10 @@ module FileStore
end
def has_been_uploaded?(url)
url.present? && url.start_with?(absolute_base_url)
return false if url.blank?
return true if url.start_with?(absolute_base_url)
return true if SiteSetting.s3_cdn_url.present? && url.start_with?(SiteSetting.s3_cdn_url)
false
end
def absolute_base_url