From 6bd3c54a033b58f6b5ecd6aed69508188b54b935 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?=
 <barisusakli@gmail.com>
Date: Tue, 3 Mar 2015 16:16:32 -0500
Subject: [PATCH] fix findAndModify

temp fix for connect-mongo
create admin after categories
---
 src/database/mongo.js        | 4 +++-
 src/database/mongo/hash.js   | 2 +-
 src/database/mongo/main.js   | 2 +-
 src/database/mongo/sorted.js | 2 +-
 src/install.js               | 4 ++--
 5 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/database/mongo.js b/src/database/mongo.js
index 6708d9c94b..e7ee038f96 100644
--- a/src/database/mongo.js
+++ b/src/database/mongo.js
@@ -74,8 +74,10 @@
 			db = _db;
 
 			module.client = db;
-
+			
 			if (!nconf.get('redis')) {
+				// TEMP: to fix connect-mongo, see https://github.com/kcbanner/connect-mongo/issues/161
+				db.openCalled = true
 				module.sessionStore = new sessionStore({
 					db: db
 				});
diff --git a/src/database/mongo/hash.js b/src/database/mongo/hash.js
index da1d2483d9..65157d8cb9 100644
--- a/src/database/mongo/hash.js
+++ b/src/database/mongo/hash.js
@@ -242,7 +242,7 @@ module.exports = function(db, module) {
 		data[field] = value;
 
 		db.collection('objects').findAndModify({_key: key}, {}, {$inc: data}, {new: true, upsert: true}, function(err, result) {
-			callback(err, result ? result[field] : null);
+			callback(err, result && result.value ? result.value[field] : null);
 		});
 	};
 };
\ No newline at end of file
diff --git a/src/database/mongo/main.js b/src/database/mongo/main.js
index 8509475bc4..c2cf4883bf 100644
--- a/src/database/mongo/main.js
+++ b/src/database/mongo/main.js
@@ -118,7 +118,7 @@ module.exports = function(db, module) {
 			return callback();
 		}
 		db.collection('objects').findAndModify({_key: key}, {}, {$inc: {value: 1}}, {new: true, upsert: true}, function(err, result) {
-			callback(err, result ? result.value : null);
+			callback(err, result && result.value ? result.value.value : null);
 		});
 	};
 
diff --git a/src/database/mongo/sorted.js b/src/database/mongo/sorted.js
index 565189dd8f..0c049a74ae 100644
--- a/src/database/mongo/sorted.js
+++ b/src/database/mongo/sorted.js
@@ -499,7 +499,7 @@ module.exports = function(db, module) {
 		data.score = parseInt(increment, 10);
 
 		db.collection('objects').findAndModify({_key: key, value: value}, {}, {$inc: data}, {new: true, upsert: true}, function(err, result) {
-			callback(err, result ? result.score : null);
+			callback(err, result && result.value ? result.value.score : null);
 		});
 	};
 };
\ No newline at end of file
diff --git a/src/install.js b/src/install.js
index f0597315d4..ded2921a0b 100644
--- a/src/install.js
+++ b/src/install.js
@@ -468,8 +468,8 @@ install.setup = function (callback) {
 		setupConfig,
 		setupDefaultConfigs,
 		enableDefaultTheme,
-		createAdministrator,
 		createCategories,
+		createAdministrator,
 		createMenuItems,
 		createWelcomePost,
 		enableDefaultPlugins,
@@ -479,7 +479,7 @@ install.setup = function (callback) {
 		}
 	], function (err) {
 		if (err) {
-			winston.warn('NodeBB Setup Aborted. ' + err.message);
+			winston.warn('NodeBB Setup Aborted.\n ' + err.stack);
 			process.exit();
 		} else {
 			callback();