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

Conflicts:
	src/topics.js

src/categories.js

@@ -189,7 +189,6 @@ var	RDB = require('./redis.js'),
 						--topicCountToLoad;
 
 					if(retrieved_topics.length === topicCountToLoad) {
-						console.log('derp');
 						callback(retrieved_topics);
 					}
 				});
@@ -282,13 +281,17 @@ var	RDB = require('./redis.js'),
 	}
 
 	Categories.getRecentReplies = function(cid, count, callback) {
-		RDB.zrevrange('categories:recent_posts:cid:' + cid, 0, count-1, function(err, pids) {
+		RDB.zrevrange('categories:recent_posts:cid:' + cid, 0, (count<10)?10:count, function(err, pids) {
 
 			if (pids.length == 0) {
 				callback([]);
 				return;
 			}
+
 			posts.getPostSummaryByPids(pids, function(posts) {
+				if(posts.length > count) {
+					posts = posts.slice(0, count);
+				}
 				callback(posts);
 			});
 		});

src/posts.js

@@ -57,24 +57,24 @@ marked.setOptions({
 		
 		var returnData = [];
 		
-		var loaded = 0;
+		function getPostSummary(pid, callback) {
-						
+			Posts.getPostFields(pid, ['pid', 'content', 'uid', 'timestamp', 'deleted'], function(postData) {
-		for(var i=0, ii=pids.length; i<ii; ++i) {
-			
-			(function(index, pid) {
-				Posts.getPostFields(pids[i], ['pid', 'content', 'uid', 'timestamp'], function(postData) {
 				Posts.addUserInfoToPost(postData, function() {
 
-						returnData[index] = postData;
+					if(postData.deleted !== '1')	{
-						++loaded;
+						returnData.push(postData);
-						
-						if(loaded === pids.length) {
-							callback(returnData);		
 					}
+					
+					callback(null);
 				});
 			});
-			}(i, pids[i]));
 		}
+		
+		async.eachSeries(pids, getPostSummary, function(err) {
+			if(!err) {
+				callback(returnData);
+			}
+		});
 	};
 
 	Posts.getPostData = function(pid, callback) {

src/routes/user.js

@@ -61,7 +61,7 @@ var user = require('./../user.js'),
 		});
 		
 		app.get('/users/:userslug/edit', function(req, res) {
-			console.log('derp');
+
 			if(!req.user)
 				return res.redirect('/403');
 			

src/webserver.js

@@ -263,7 +263,6 @@ var express = require('express'),
 
 		app.get('/test', function(req, res) {
 			
-			console.log('derp');
 			/*user.get_userslugs_by_uids([1,2], function(data) {
 				res.send(data);
 			});*/