mirror of
https://github.com/NodeBB/NodeBB.git
synced 2025-11-01 03:26:04 +01:00
crash fix if topic has no posts, and check confirm obj
This commit is contained in:
10
src/feed.js
10
src/feed.js
@@ -38,13 +38,17 @@
|
||||
}
|
||||
}
|
||||
|
||||
var description = topicData.posts.length ? topicData.posts[0].content : '';
|
||||
var image_url = topicData.posts.length ? topicData.posts[0].picture : '';
|
||||
var author = topicData.posts.length ? topicData.posts[0].username : '';
|
||||
|
||||
var feed = new rss({
|
||||
title: topicData.topic_name,
|
||||
description: topicData.posts[0].content,
|
||||
description: description,
|
||||
feed_url: Feed.defaults.baseUrl + '/topics/' + tid + '.rss',
|
||||
site_url: nconf.get('url') + '/topic/' + topicData.slug,
|
||||
image_url: topicData.posts[0].picture,
|
||||
author: topicData.posts[0].username,
|
||||
image_url: image_url,
|
||||
author: author,
|
||||
ttl: Feed.defaults.ttl
|
||||
}),
|
||||
dateStamp;
|
||||
|
||||
@@ -926,11 +926,12 @@ var bcrypt = require('bcryptjs'),
|
||||
confirm: function(code, callback) {
|
||||
db.getObject('confirm:' + code, function(err, confirmObj) {
|
||||
if (err) {
|
||||
callback({
|
||||
return callback({
|
||||
status:'error'
|
||||
});
|
||||
} else {
|
||||
if (confirmObj.uid && confirmObj.email) {
|
||||
}
|
||||
|
||||
if (confirmObj && confirmObj.uid && confirmObj.email) {
|
||||
db.setObjectField('email:confirmed', confirmObj.email, '1', function() {
|
||||
callback({
|
||||
status: 'ok'
|
||||
@@ -941,7 +942,6 @@ var bcrypt = require('bcryptjs'),
|
||||
status: 'not_ok'
|
||||
});
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user