From d60382f0f0ba476c007732d150a3b75524d1a18d Mon Sep 17 00:00:00 2001 From: John O'Nolan Date: Mon, 21 Jul 2014 23:07:21 +0200 Subject: [PATCH] Trim version number in RSS feeds --- core/server/controllers/frontend.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/core/server/controllers/frontend.js b/core/server/controllers/frontend.js index 906e8fe79d..3b43deea2d 100644 --- a/core/server/controllers/frontend.js +++ b/core/server/controllers/frontend.js @@ -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'