github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-06-02 16:29:32 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #1075 from ZogStriP/fix-lightboxing-when-using-s3

Browse Source 
FIX: lightbox wasn't working when using s3 upload
This commit is contained in:
Sam
2013-06-23 22:11:45 -07:00
parent 7c726bd235 08aa23f0ca
commit 22d6f6784c
7 changed files with 55 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
app/models/upload.rb
View File

@ -30,6 +30,7 @@ class Upload < ActiveRecord::Base
def create_thumbnail!
return unless SiteSetting.create_thumbnails?
return if SiteSetting.enable_s3_uploads?
return unless width > SiteSetting.auto_link_images_wider_than
return if has_thumbnail?
thumbnail = OptimizedImage.create_for(self, width, height)
@ -86,12 +87,20 @@ class Upload < ActiveRecord::Base
LocalStore.remove_file(url)
end
def self.uploaded_regex
/\/uploads\/#{RailsMultisite::ConnectionManagement.current_db}\/(?<upload_id>\d+)\/[0-9a-f]{16}\.(png|jpg|jpeg|gif|tif|tiff|bmp)/
def self.has_been_uploaded?(url)
is_relative?(url) || is_local?(url) || is_on_s3?(url)
end
def self.has_been_uploaded?(url)
(url =~ /^\/[^\/]/) == 0 || url.start_with?(base_url)
def self.is_relative?(url)
(url =~ /^\/[^\/]/) == 0
end
def self.is_local?(url)
url.start_with?(base_url)
end
def self.is_on_s3?(url)
SiteSetting.enable_s3_uploads? && url.start_with?(S3.base_url)
end
def self.base_url
@ -122,6 +131,7 @@ end
# Indexes
#
# index_uploads_on_sha1 (sha1) UNIQUE
# index_uploads_on_url (url)
# index_uploads_on_user_id (user_id)
#