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

public/src/app.js

@@ -217,7 +217,7 @@ var socket,
 				.append($('<strong>' + title + '</strong>'))
 				.append($('<p>' + params.message + '</p>'));
 
-			if (params.location === null) {
+			if (!params.location) {
 				params.location = 'alert_window';
 			}
 

public/src/forum/account.js

@@ -73,15 +73,6 @@ define(['forum/accountheader'], function(header) {
 
 			socket.emit('user.isOnline', theirid, Account.handleUserOnline);
 
-			socket.on('event:new_post', function(data) {
-				templates.preload_template('account', function() {
-					templates['account'].parse({posts:[]});
-					var html = templates.prepare(templates['account'].blocks['posts']).parse(data);
-					$('.user-recent-posts').prepend(html);
-					$('.user-recent-posts span.timeago').timeago();
-				});
-			});
-
 		});
 	};
 

public/src/forum/topic.js

@@ -735,6 +735,10 @@ define(['composer', 'forum/pagination'], function(composer, pagination) {
 		});
 
 		socket.on('event:new_post', function(data) {
+			if(data && data.posts && data.posts.length && data.posts[0].tid !== templates.get('topic_id')) {
+				return;
+			}
+
 			if(config.usePagination) {
 				onNewPostPagination(data);
 				return;

src/controllers/admin.js

@@ -11,7 +11,8 @@ var async = require('async'),
 	plugins = require('./../plugins'),
 	widgets = require('./../widgets'),
 	groups = require('./../groups'),
-	pkg = require('./../../package.json');
+	pkg = require('./../../package.json'),
+	validator = require('validator');
 
 
 
@@ -39,24 +40,26 @@ adminController.home = function(req, res, next) {
 };
 
 adminController.categories.active = function(req, res, next) {
-	categories.getAllCategories(0, function (err, data) {
-		data.categories = data.categories.filter(function (category) {
-			return !category.disabled;
-		});
-
-		res.render('admin/categories', data);
-	});
+	filterAndRenderCategories(req, res, next, true);
 };
 
 adminController.categories.disabled = function(req, res, next) {
+	filterAndRenderCategories(req, res, next, false);
+};
+
+function filterAndRenderCategories(req, res, next, active) {
 	categories.getAllCategories(0, function (err, data) {
 		data.categories = data.categories.filter(function (category) {
-			return category.disabled;
+			return active ? !category.disabled : category.disabled;
+		});
+
+		data.categories.forEach(function(category) {
+			category.description = validator.escape(category.description);
 		});
 
 		res.render('admin/categories', data);
 	});
-};
+}
 
 adminController.database.get = function(req, res, next) {
 	db.info(function (err, data) {
@@ -79,7 +82,7 @@ adminController.events.get = function(req, res, next) {
 		if(err || !data) {
 			return next(err);
 		}
-		
+
 		data = data.toString().split('\n').reverse().join('\n');
 		res.render('admin/events', {
 			eventdata: data