From f082849126729a6261c210151a060be5f1eb7085 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Tue, 30 Sep 2014 23:58:52 -0400 Subject: [PATCH 1/3] removing console.log --- src/database/redis.js | 1 - 1 file changed, 1 deletion(-) diff --git a/src/database/redis.js b/src/database/redis.js index 8e0cea9af2..8e5e5e2216 100644 --- a/src/database/redis.js +++ b/src/database/redis.js @@ -94,7 +94,6 @@ dbIdx = parseInt(nconf.get('redis:database'), 10); if (dbIdx) { - console.log('SELECTING dbIdxBBBBBB', dbIdx); cxn.select(dbIdx, function(error) { if(error) { winston.error("NodeBB could not connect to your Redis database. Redis returned the following error: " + error.message); From e6824fd727abaf54e49d9616d20c814a9b06a88e Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Wed, 1 Oct 2014 00:01:57 -0400 Subject: [PATCH 2/3] bumping to 0.5.2 for dev purposes --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 087c731117..dd3c79796e 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "nodebb", "license": "GPLv3 or later", "description": "NodeBB Forum", - "version": "0.5.1", + "version": "0.5.2", "homepage": "http://www.nodebb.org", "repository": { "type": "git", From 977cd98a797b50e3fa9abf22509a803be5e81734 Mon Sep 17 00:00:00 2001 From: barisusakli Date: Wed, 1 Oct 2014 00:29:47 -0400 Subject: [PATCH 3/3] dont crash if user doesn't have email --- src/user/profile.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/user/profile.js b/src/user/profile.js index e8d42da6d5..8b46f53994 100644 --- a/src/user/profile.js +++ b/src/user/profile.js @@ -123,6 +123,8 @@ module.exports = function(User) { return callback(err); } + userData.email = userData.email || ''; + if (userData.email === newEmail) { return callback(); }