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

Merge pull request #3735 from riking/patch-4

Browse Source 
FIX: Discourse.BaseUri should not default to /
This commit is contained in:
Robin Ward
2015-11-06 14:52:19 -05:00
parent b699d43b1b aca70805f1
commit 8ba7c06b7d
9 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/pretty_text.rb
View File

@@ -141,7 +141,7 @@ module PrettyText
def self.decorate_context(context)
context.eval("Discourse.CDN = '#{Rails.configuration.action_controller.asset_host}';")
context.eval("Discourse.BaseUrl = '#{RailsMultisite::ConnectionManagement.current_hostname}'.replace(/:[\d]*$/,'');")
context.eval("Discourse.BaseUri = '#{Discourse::base_uri("/")}';")
context.eval("Discourse.BaseUri = '#{Discourse::base_uri}';")
context.eval("Discourse.SiteSettings = #{SiteSetting.client_settings_json};")
context.eval("Discourse.getURL = function(url) {