Merge branch 'master' of github.com:designcreateplay/NodeBB

src/user.js

@@ -7,7 +7,7 @@ var bcrypt = require('bcrypt'),
 	userSearch = require('reds').createSearch('nodebbusersearch'),
 	check = require('validator').check,
 	sanitize = require('validator').sanitize,
-	
+
 	utils = require('./../public/src/utils'),
 	RDB = require('./redis'),
 	meta = require('./meta'),

src/websockets.js

@@ -340,8 +340,8 @@ module.exports.init = function(io) {
 			if (uid) {
 				user.setUserFields(uid, {
 					showemail: data.showemail
-				}, function(err) {
-					callback(err ? err.message : null);
+				}, function(err, result) {
+					callback(err);
 				});
 			}
 		});
@@ -403,6 +403,10 @@ module.exports.init = function(io) {
 
 		});
 
+		socket.on('api:topics.postcount', function(tid, callback) {
+			topics.getTopicField(tid, 'postcount', callback);
+		});
+
 		socket.on('api:topics.markAllRead', function(data, callback) {
 			topics.markAllRead(uid, function(err, success) {
 				if (!err && success) {