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 #3701 from xfalcox/patch-1 

Fix same domains links on subfolder installs
This commit is contained in:
Neil Lalonde 2015-09-15 11:49:09 -04:00
parent 72f2454290 230bc8bb6e
commit 721b282d3c
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/lib/url.js.es6
View File

@ -272,7 +272,7 @@ const DiscourseURL = Ember.Object.createWithMixins({
// This has been extracted so it can be tested. // This has been extracted so it can be tested.
origin: function() { origin: function() {
return window.location.origin; return window.location.origin + (Discourse.BaseUri === "/" ? '' : Discourse.BaseUri);
}, },
/** /**

7
test/javascripts/lib/url-test.js.es6
View File

@ -16,3 +16,10 @@ test("isInternal with a HTTPS url", function() {
sandbox.stub(DiscourseURL, "origin").returns("https://eviltrout.com"); sandbox.stub(DiscourseURL, "origin").returns("https://eviltrout.com");
ok(DiscourseURL.isInternal("http://eviltrout.com/monocle"), "HTTPS urls match HTTP urls"); ok(DiscourseURL.isInternal("http://eviltrout.com/monocle"), "HTTPS urls match HTTP urls");
}); });
test("isInternal on subfolder install", function() {
sandbox.stub(DiscourseURL, "origin").returns("http://eviltrout.com/forum");
not(DiscourseURL.isInternal("http://eviltrout.com"), "the host root is not internal");
not(DiscourseURL.isInternal("http://eviltrout.com/tophat"), "a url on the same host but on a different folder is not internal");
ok(DiscourseURL.isInternal("http://eviltrout.com/forum/moustache"), "a url on the same host and on the same folder is internal");
});