Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-10-31 19:15:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

crash fix if topic has no posts, and check confirm obj

Browse Source
This commit is contained in:
Baris Soner Usakli
2014-01-26 23:20:37 -05:00
parent 31a57cf0dd
commit c18788fbc9
2 changed files with 18 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/feed.js
View File

@@ -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({ var feed = new rss({
title: topicData.topic_name, title: topicData.topic_name,
description: topicData.posts[0].content, description: description,
feed_url: Feed.defaults.baseUrl + '/topics/' + tid + '.rss', feed_url: Feed.defaults.baseUrl + '/topics/' + tid + '.rss',
site_url: nconf.get('url') + '/topic/' + topicData.slug, site_url: nconf.get('url') + '/topic/' + topicData.slug,
image_url: topicData.posts[0].picture, image_url: image_url,
author: topicData.posts[0].username, author: author,
ttl: Feed.defaults.ttl ttl: Feed.defaults.ttl
}), }),
dateStamp; dateStamp;

22
src/user.js
View File

@@ -926,21 +926,21 @@ var bcrypt = require('bcryptjs'),
confirm: function(code, callback) { confirm: function(code, callback) {
db.getObject('confirm:' + code, function(err, confirmObj) { db.getObject('confirm:' + code, function(err, confirmObj) {
if (err) { if (err) {
callback({ return callback({
status:'error' status:'error'
}); });
} else { }
if (confirmObj.uid && confirmObj.email) {
db.setObjectField('email:confirmed', confirmObj.email, '1', function() { if (confirmObj && confirmObj.uid && confirmObj.email) {
callback({ db.setObjectField('email:confirmed', confirmObj.email, '1', function() {
status: 'ok'
});
});
} else {
callback({ callback({
status: 'not_ok' status: 'ok'
}); });
} });
} else {
callback({
status: 'not_ok'
});
} }
}); });
} }