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

FIX: getURL on a subfolder site should ignore prefix in middle of URL (#8794)

This commit is contained in:
David Taylor 2020-01-27 17:51:46 +00:00 committed by GitHub
parent bb816302f6
commit fe0d912b97
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -29,8 +29,8 @@ const Discourse = Ember.Application.extend(FocusEvent, {
// if it's a non relative URL, return it.
if (url !== "/" && !/^\/[^\/]/.test(url)) return url;
if (url.indexOf(Discourse.BaseUri) !== -1) return url;
if (url[0] !== "/") url = "/" + url;
if (url.startsWith(Discourse.BaseUri)) return url;
return Discourse.BaseUri + url;
},

12
test/javascripts/lib/discourse-test.js.es6
View File

@ -10,6 +10,18 @@ QUnit.test("getURL on subfolder install", assert => {
"/forum/u/neil",
"relative url has subfolder"
);
assert.equal(
Discourse.getURL("/svg-sprite/forum.example.com/svg-sprite.js"),
"/forum/svg-sprite/forum.example.com/svg-sprite.js",
"works when the url has the prefix in the middle"
);
assert.equal(
Discourse.getURL("/forum/t/123"),
"/forum/t/123",
"does not prefix if the URL is already prefixed"
);
});
QUnit.test("getURLWithCDN on subfolder install with S3", assert => {