Merge remote-tracking branch 'origin/master' into user-icons

Conflicts:
	public/src/app.js
	public/src/client/account/edit.js

src/controllers/api.js

@@ -41,6 +41,7 @@ apiController.getConfig = function(req, res, next) {
 	config.maximumTitleLength = meta.config.maximumTitleLength;
 	config.minimumPostLength = meta.config.minimumPostLength;
 	config.maximumPostLength = meta.config.maximumPostLength;
+	config.topicStaleDays = parseInt(meta.config.topicStaleDays, 10) || 60;
 	config.hasImageUploadPlugin = plugins.hasListeners('filter:uploadImage');
 	config.maximumProfileImageSize = meta.config.maximumProfileImageSize;
 	config.minimumUsernameLength = meta.config.minimumUsernameLength;

src/controllers/authentication.js

@@ -69,6 +69,10 @@ authenticationController.register = function(req, res, next) {
 			return res.status(400).send(err.message);
 		}
 
+		if (req.body.userLang) {
+			user.setSetting(data.uid, 'userLang', req.body.userLang);
+		}
+
 		res.json(data);
 	});
 };

src/controllers/search.js

@@ -75,7 +75,7 @@ function buildCategories(uid, callback) {
 		];
 
 		categories = categories.filter(function(category) {
-			return !category.link && !parseInt(category.parentCid, 10);
+			return category && !category.link && !parseInt(category.parentCid, 10);
 		});
 
 		categories.forEach(function(category) {

src/controllers/topics.js

@@ -3,9 +3,8 @@
 var topicsController = {},
 	async = require('async'),
 	S = require('string'),
-	validator = require('validator'),
 	nconf = require('nconf'),
-	qs = require('querystring'),
+
 	user = require('../user'),
 	meta = require('../meta'),
 	topics = require('../topics'),
@@ -124,6 +123,8 @@ topicsController.get = function(req, res, callback) {
 				topicData.pageCount = pageCount;
 				topicData.currentPage = page;
 
+				topics.modifyByPrivilege(topicData.posts, results.privileges);
+
 				plugins.fireHook('filter:controllers.topic.get', topicData, next);
 			});
 		},
@@ -134,8 +135,7 @@ topicsController.get = function(req, res, callback) {
 					url: nconf.get('relative_path') + '/category/' + topicData.category.slug
 				},
 				{
-					text: topicData.title,
-					url: nconf.get('relative_path') + '/topic/' + topicData.slug
+					text: topicData.title
 				}
 			];