OpenSourceArk/Ghost
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Ensure correct url in ghost_head

Browse Source 
Closes #4967

- Previously, an additional `/` was added to the prev/next links. This
removes the additional slash.
This commit is contained in:
Felix Rieseberg 2015-03-09 16:24:51 +01:00
parent 7383820e35
commit 4b1ece9f01
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
core/server/helpers/ghost_head.js
View File

@ -32,6 +32,7 @@ ghost_head = function (options) {
majorMinor = /^(\d+\.)?(\d+)/,
trimmedVersion = this.version,
trimmedUrlpattern = /.+(?=\/page\/\d*\/)/,
tagOrAuthorPattern = /\/(tag)|(author)\//,
trimmedUrl, next, prev, tags,
ops = [],
structuredData,
@ -76,12 +77,16 @@ ghost_head = function (options) {
trimmedUrl = self.relativeUrl.match(trimmedUrlpattern);
if (self.pagination.prev) {
prev = (self.pagination.prev > 1 ? prev = '/page/' + self.pagination.prev + '/' : prev = '/');
prev = (trimmedUrl) ? '/' + trimmedUrl + prev : prev;
prev = (trimmedUrl) ? trimmedUrl + prev : prev;
head.push('<link rel="prev" href="' + config.urlFor({relativeUrl: prev, secure: self.secure}, true) + '" />');
}
if (self.pagination.next) {
next = '/page/' + self.pagination.next + '/';
next = (trimmedUrl) ? '/' + trimmedUrl + next : next;
if (trimmedUrl) {
next = trimmedUrl + next;
} else if (tagOrAuthorPattern.test(self.relativeUrl)) {
next = self.relativeUrl.slice(0, -1) + next;
}
head.push('<link rel="next" href="' + config.urlFor({relativeUrl: next, secure: self.secure}, true) + '" />');
}
}