Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-12-21 16:00:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/designcreateplay/NodeBB

Browse Source
This commit is contained in:
psychobunny
2014-02-26 17:00:07 -05:00
parent aee2b2ecd0 7f2d70d7f6
commit 2247a8b21f
12 changed files with 124 additions and 157 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/webserver.js
View File

@@ -600,7 +600,7 @@ process.on('uncaughtException', function(err) {
var start = (page - 1) * settings.topicsPerPage,
end = start + settings.topicsPerPage - 1;
topics.getTopicWithPosts(tid, uid, start, end, true, function (err, topicData) {
topics.getTopicWithPosts(tid, uid, start, end, function (err, topicData) {
if (topicData) {
if (parseInt(topicData.deleted, 10) === 1 && parseInt(topicData.expose_tools, 10) === 0) {
return next(new Error('Topic deleted'), null);
@@ -646,7 +646,7 @@ process.on('uncaughtException', function(err) {
metaTags: [
{
name: "title",
content: topicData.topic_name
content: topicData.title
},
{
name: "description",
@@ -654,7 +654,7 @@ process.on('uncaughtException', function(err) {
},
{
property: 'og:title',
content: topicData.topic_name
content: topicData.title
},
{
property: 'og:description',
@@ -686,7 +686,7 @@ process.on('uncaughtException', function(err) {
},
{
property: 'article:section',
content: topicData.category_name
content: topicData.category.name
}
],
linkTags: [
@@ -697,7 +697,7 @@ process.on('uncaughtException', function(err) {
},
{
rel: 'up',
href: nconf.get('url') + '/category/' + topicData.category_slug
href: nconf.get('url') + '/category/' + topicData.category.slug
}
]
}, function (err, header) {
@@ -787,15 +787,15 @@ process.on('uncaughtException', function(err) {
metaTags: [
{
name: 'title',
content: categoryData.category_name
content: categoryData.name
},
{
property: 'og:title',
content: categoryData.category_name
content: categoryData.name
},
{
name: 'description',
content: categoryData.category_description
content: categoryData.description
},
{
property: "og:type",