From c18788fbc9c27f1451bf72a2c4732ab60bad8470 Mon Sep 17 00:00:00 2001 From: Baris Soner Usakli Date: Sun, 26 Jan 2014 23:20:37 -0500 Subject: [PATCH] crash fix if topic has no posts, and check confirm obj --- src/feed.js | 10 +++++++--- src/user.js | 22 +++++++++++----------- 2 files changed, 18 insertions(+), 14 deletions(-) diff --git a/src/feed.js b/src/feed.js index 89828328e1..0b8fe46f49 100644 --- a/src/feed.js +++ b/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; diff --git a/src/user.js b/src/user.js index 4ae5e527dc..ffbf32a707 100644 --- a/src/user.js +++ b/src/user.js @@ -926,21 +926,21 @@ 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) { - db.setObjectField('email:confirmed', confirmObj.email, '1', function() { - callback({ - status: 'ok' - }); - }); - } else { + } + + if (confirmObj && confirmObj.uid && confirmObj.email) { + db.setObjectField('email:confirmed', confirmObj.email, '1', function() { callback({ - status: 'not_ok' + status: 'ok' }); - } + }); + } else { + callback({ + status: 'not_ok' + }); } }); }