Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix the build.

This commit is contained in:
Guo Xiang Tan 2019-07-29 20:02:18 +08:00
parent faea594436
commit ef46231214
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/models/post.rb
View File

@ -896,17 +896,16 @@ class Post < ActiveRecord::Base
fragments ||= Nokogiri::HTML::fragment(self.cooked) fragments ||= Nokogiri::HTML::fragment(self.cooked)
links = fragments.css("a/@href", "img/@src").map { |media| media.value }.uniq links = fragments.css("a/@href", "img/@src").map { |media| media.value }.uniq
local_store = FileStore::LocalStore.new
links.each do |src| links.each do |src|
next if src.blank? || upload_patterns.none? { |pattern| src.split("?")[0] =~ pattern } next if src.blank? || upload_patterns.none? { |pattern| src.split("?")[0] =~ pattern }
next if Rails.configuration.multisite && src.exclude?(current_db) && src.exclude?("short-url") next if Rails.configuration.multisite && src.exclude?(current_db) && src.exclude?("short-url")
src = "#{SiteSetting.force_https ? "https" : "http"}:#{src}" if src.start_with?("//") src = "#{SiteSetting.force_https ? "https" : "http"}:#{src}" if src.start_with?("//")
next unless Discourse.store.has_been_uploaded?(src) || (include_local_upload && (src =~ /\A\/[^\/]/i || local_store.has_been_uploaded?(src))) next unless Discourse.store.has_been_uploaded?(src) || (include_local_upload && src =~ /\A\/[^\/]/i)
path = begin path = begin
URI(URI.unescape(src.gsub(GlobalSetting.cdn_url, "")))&.path URI(URI.unescape(src))&.path
rescue URI::Error rescue URI::Error
end end