2
1
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2023-12-13 21:00:40 +01:00

Merge pull request #3355 from JohnONolan/trim

Trim version number in RSS feeds
This commit is contained in:
Hannah Wolfe 2014-07-21 22:24:05 +01:00
commit 9535af1665

View file

@ -381,12 +381,16 @@ frontendControllers = {
var title = result[0].value.settings[0].value,
description = result[1].value.settings[0].value,
permalinks = result[2].value.settings[0],
majorMinor = /^(\d+\.)?(\d+)/,
trimmedVersion = res.locals.version,
siteUrl = config.urlFor('home', {secure: req.secure}, true),
feedUrl = config.urlFor('rss', {secure: req.secure}, true),
maxPage = page.meta.pagination.pages,
feedItems = [],
feed;
trimmedVersion = trimmedVersion ? trimmedVersion.match(majorMinor)[0] : '?';
if (tagParam) {
if (page.meta.filters.tags) {
title = page.meta.filters.tags[0].name + ' - ' + title;
@ -397,7 +401,7 @@ frontendControllers = {
feed = new RSS({
title: title,
description: description,
generator: 'Ghost v' + res.locals.version,
generator: 'Ghost ' + trimmedVersion,
feed_url: feedUrl,
site_url: siteUrl,
ttl: '60'