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

Merge pull request #660 from wojciechka/cooked_images_double_prefix 

Post processing of images adds prefix second time
This commit is contained in:
Robin Ward 2013-04-05 08:22:36 -07:00
parent c41bdc8752 68bdab6635
commit 87f67a95eb
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/cooked_post_processor.rb
View File

@ -45,7 +45,7 @@ class CookedPostProcessor
images.each do |img| images.each do |img|
src = img['src'] src = img['src']
src = Discourse.base_url + src if src[0] == "/" src = Discourse.base_url_no_prefix + src if src[0] == "/"
if src.present? && (img['width'].blank? || img['height'].blank?) if src.present? && (img['width'].blank? || img['height'].blank?)

7
lib/discourse.rb
View File

@ -26,7 +26,7 @@ module Discourse
end end
end end
def self.base_url def self.base_url_no_prefix
protocol = "http" protocol = "http"
protocol = "https" if SiteSetting.use_ssl? protocol = "https" if SiteSetting.use_ssl?
if SiteSetting.force_hostname.present? if SiteSetting.force_hostname.present?
@ -35,10 +35,13 @@ module Discourse
result = "#{protocol}://#{current_hostname}" result = "#{protocol}://#{current_hostname}"
end end
result << ":#{SiteSetting.port}" if SiteSetting.port.present? && SiteSetting.port.to_i > 0 result << ":#{SiteSetting.port}" if SiteSetting.port.present? && SiteSetting.port.to_i > 0
result << ActionController::Base.config.relative_url_root if !ActionController::Base.config.relative_url_root.blank?
result result
end end
def self.base_url
return base_url_no_prefix + base_uri
end
def self.enable_maintenance_mode def self.enable_maintenance_mode
$redis.set maintenance_mode_key, 1 $redis.set maintenance_mode_key, 1
true true