Infrastructure/ghost
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2025-03-11 02:12:21 -05:00
Code Issues Activity

Trim version number in RSS feeds

Browse source
This commit is contained in:
John O'Nolan 2014-07-21 23:07:21 +02:00
parent c0732292ac
commit d60382f0f0
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
core/server/controllers/frontend.js
View file

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