github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-23 01:16:22 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: wrong root path on subfolder installs

Browse Source
This commit is contained in:
Neil Lalonde 2015-10-21 13:13:19 -04:00
parent 1821ba8d93
commit ca98f66f7e
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/discourse.js
View File

@ -14,7 +14,7 @@ window.Discourse = Ember.Application.createWithMixins(Discourse.Ajax, {
if (!url) return url;
// if it's a non relative URL, return it.
if (!/^\/[^\/]/.test(url)) return url;
if (url !== '/' && !/^\/[^\/]/.test(url)) return url;
var u = Discourse.BaseUri === undefined ? "/" : Discourse.BaseUri;

7
test/javascripts/lib/discourse-test.js.es6 Normal file
View File

@ -0,0 +1,7 @@
module("lib:discourse");
test("getURL on subfolder install", function() {
Discourse.BaseUri = "/forum";
equal(Discourse.getURL("/"), "/forum/", "root url has subfolder");
equal(Discourse.getURL("/users/neil"), "/forum/users/neil", "relative url has subfolder");
});