TryGhost/Ghost
1
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2025-01-01 23:37:43 +03:00
Code Issues Projects Releases Wiki Activity

Allow domain name to be referenced on an external page in the navigation.

Browse Source 
closes #6939
- added a test for the specific issue
- modified the url generation to allow the url in an external pages slug
This commit is contained in:
Lukas Strassel 2016-06-09 00:16:42 +02:00
parent 7b098e085a
commit 696a06fa00
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/server/config/url.js
View File

@ -204,11 +204,11 @@ function urlFor(context, data, absolute) {
baseUrl = getBaseUrl(secure);
hostname = baseUrl.split('//')[1] + ghostConfig.paths.subdir;
if (urlPath.indexOf(hostname) > -1
&& urlPath.indexOf('.' + hostname) === -1
&& urlPath.indexOf('mailto:') !== 0) {
&& !urlPath.split(hostname)[0].match(/\.|mailto:/)) {
// make link relative to account for possible
// mismatch in http/https etc, force absolute
// do not do so if link is a subdomain of blog url
// or if hostname is inside of the slug
urlPath = urlPath.split(hostname)[1];
if (urlPath.substring(0, 1) !== '/') {
urlPath = '/' + urlPath;

6
core/test/unit/config_spec.js
View File

@ -364,6 +364,12 @@ describe('Config', function () {
testData = {nav: {url: '#this-anchor'}};
config.urlFor(testContext, testData).should.equal('#this-anchor');
testData = {nav: {url: 'http://some-external-page.com/my-ghost-blog.com'}};
config.urlFor(testContext, testData).should.equal('http://some-external-page.com/my-ghost-blog.com');
testData = {nav: {url: 'http://some-external-page.com/stuff-my-ghost-blog.com-around'}};
config.urlFor(testContext, testData).should.equal('http://some-external-page.com/stuff-my-ghost-blog.com-around');
configUtils.set({url: 'http://my-ghost-blog.com/blog'});
testData = {nav: {url: 'http://my-ghost-blog.com/blog/short-and-sweet/'}};
config.urlFor(testContext, testData).should.equal('http://my-ghost-blog.com/blog/short-and-sweet/');