FIX: canonical url should not use the CDN

This commit is contained in:
Régis Hanol
2013-12-17 00:35:34 +01:00
parent 7fb985a02e
commit 2ce75a8523
3 changed files with 22 additions and 4 deletions

View File

@@ -6,8 +6,12 @@ module UrlHelper
url.start_with?(Discourse.asset_host || Discourse.base_url_no_prefix)
end
def absolute(url)
url =~ /^\/[^\/]/ ? (Discourse.asset_host || Discourse.base_url_no_prefix) + url : url
def absolute(url, cdn = Discourse.asset_host)
url =~ /^\/[^\/]/ ? (cdn || Discourse.base_url_no_prefix) + url : url
end
def absolute_without_cdn(url)
absolute(url, nil)
end
def schemaless(url)