Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-07-21 04:40:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'refs/remotes/origin/master' into chat-permission

Browse Source
This commit is contained in:
Baris Usakli
2017-12-20 13:13:10 -05:00
parent 057e83cfac 96084340ad
commit 63b9255fa1
10 changed files with 131 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/controllers/category.js
View File

@@ -199,14 +199,17 @@ function addTags(categoryData, res) {
}
res.locals.linkTags = [
{
rel: 'alternate',
type: 'application/rss+xml',
href: categoryData.rssFeedUrl,
},
{
rel: 'up',
href: nconf.get('url'),
},
];
if (!categoryData['feeds:disableRSS']) {
res.locals.linkTags.push({
rel: 'alternate',
type: 'application/rss+xml',
href: categoryData.rssFeedUrl,
});
}
}

13
src/controllers/topics.js
View File

@@ -257,17 +257,20 @@ function addTags(topicData, req, res) {
addOGImageTags(res, topicData, postAtIndex);
res.locals.linkTags = [
{
rel: 'alternate',
type: 'application/rss+xml',
href: topicData.rssFeedUrl,
},
{
rel: 'canonical',
href: nconf.get('url') + '/topic/' + topicData.slug,
},
];
if (!topicData['feeds:disableRSS']) {
res.locals.linkTags.push({
rel: 'alternate',
type: 'application/rss+xml',
href: topicData.rssFeedUrl,
});
}
if (topicData.category) {
res.locals.linkTags.push({
rel: 'up',