From 84d0e643610f3c8cc06766c7e40b0033c6f036ed Mon Sep 17 00:00:00 2001
From: barisusakli <barisusakli@gmail.com>
Date: Wed, 3 Sep 2014 20:19:51 -0400
Subject: [PATCH] fix topic move

---
 public/src/forum/topic/move.js | 2 +-
 src/database/mongo/sorted.js   | 8 ++++++--
 src/database/redis/sorted.js   | 9 +++++++--
 src/socket.io/index.js         | 2 +-
 src/threadTools.js             | 6 +++---
 tests/database.js              | 6 +++---
 6 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/public/src/forum/topic/move.js b/public/src/forum/topic/move.js
index 11f82c85f3..f0dec0e9b7 100644
--- a/public/src/forum/topic/move.js
+++ b/public/src/forum/topic/move.js
@@ -43,7 +43,7 @@ define('forum/topic/move', function() {
 
 		renderCategories(categories);
 
-		modal.find('.category-list').on('click', 'li[data-cid]', function(e) {
+		modal.on('click', '.category-list li[data-cid]', function(e) {
 			selectCategory($(this));
 		});
 
diff --git a/src/database/mongo/sorted.js b/src/database/mongo/sorted.js
index 6a9064c87b..e2bc988f81 100644
--- a/src/database/mongo/sorted.js
+++ b/src/database/mongo/sorted.js
@@ -13,14 +13,18 @@ module.exports = function(db, module) {
 			value: value
 		};
 
-		db.collection('objects').update({_key: key, value: value}, {$set: data}, {upsert:true, w: 1}, callback);
+		db.collection('objects').update({_key: key, value: value}, {$set: data}, {upsert:true, w: 1}, function(err) {
+			callback(err);
+		});
 	};
 
 	module.sortedSetRemove = function(key, value, callback) {
 		callback = callback || helpers.noop;
 		value = helpers.valueToString(value);
 
-		db.collection('objects').remove({_key: key, value: value}, callback);
+		db.collection('objects').remove({_key: key, value: value}, function(err) {
+			callback(err);
+		});
 	};
 
 	module.sortedSetsRemove = function(keys, value, callback) {
diff --git a/src/database/redis/sorted.js b/src/database/redis/sorted.js
index ef29b3b935..8dfc560d2b 100644
--- a/src/database/redis/sorted.js
+++ b/src/database/redis/sorted.js
@@ -3,11 +3,16 @@
 module.exports = function(redisClient, module) {
 	module.sortedSetAdd = function(key, score, value, callback) {
 		callback = callback || function() {};
-		redisClient.zadd(key, score, value, callback);
+		redisClient.zadd(key, score, value, function(err) {
+			callback(err);
+		});
 	};
 
 	module.sortedSetRemove = function(key, value, callback) {
-		redisClient.zrem(key, value, callback);
+		callback = callback || function() {};
+		redisClient.zrem(key, value, function(err) {
+			callback(err);
+		});
 	};
 
 	module.sortedSetsRemove = function(keys, value, callback) {
diff --git a/src/socket.io/index.js b/src/socket.io/index.js
index 20ff8efa76..5fc81fbbef 100644
--- a/src/socket.io/index.js
+++ b/src/socket.io/index.js
@@ -85,7 +85,7 @@ Sockets.init = function(server) {
 
 				if (uid) {
 
-					db.sortedSetAdd('users:online', Date.now(), uid, function(err, data) {
+					db.sortedSetAdd('users:online', Date.now(), uid, function(err) {
 						socket.join('uid_' + uid);
 
 						async.parallel({
diff --git a/src/threadTools.js b/src/threadTools.js
index edd478c26a..613a456443 100644
--- a/src/threadTools.js
+++ b/src/threadTools.js
@@ -189,12 +189,12 @@ var winston = require('winston'),
 				topic = topicData;
 				db.sortedSetRemove('categories:' + topicData.cid + ':tid', tid, next);
 			},
-			function(result, next) {
+			function(next) {
 				var timestamp = parseInt(topic.pinned, 10) ? Math.pow(2, 53) : topic.lastposttime;
 				db.sortedSetAdd('categories:' + cid + ':tid', timestamp, tid, next);
 			}
-		], function(err, result) {
-			if(err) {
+		], function(err) {
+			if (err) {
 				return callback(err);
 			}
 			var oldCid = topic.cid;
diff --git a/tests/database.js b/tests/database.js
index 5153bc0c8d..aa252243b4 100644
--- a/tests/database.js
+++ b/tests/database.js
@@ -271,14 +271,14 @@ describe('Test database', function() {
 
 	it('should not throw err', function(done) {
 		function sortedSetAdd(callback) {
-			db.sortedSetAdd('sortedSet3', 12, 5, function(err, data) {
-				callback(err, {'sortedSetAdd': data});
+			db.sortedSetAdd('sortedSet3', 12, 5, function(err) {
+				callback(err);
 			});
 		}
 
 		function sortedSetRemove(callback) {
 			db.sortedSetRemove('sortedSet3', 12, function(err, data) {
-				callback(err, {'sortedSetRemove': data});
+				callback(err);
 			});
 		}