Merge remote-tracking branch 'origin/master' into require.js

public/src/forum/topic.js

@@ -376,7 +376,8 @@ define('forum/topic', ['forum/pagination', 'forum/infinitescroll', 'forum/topic/
 	}
 
 	function loadPostsAfter(after, callback) {
-		if (!utils.isNumber(after) || (after === 0 && $('#post-container li.post-row[data-index="0"]').length)) {
+		var tid = ajaxify.variables.get('topic_id');
+		if (!utils.isNumber(tid) || !utils.isNumber(after) || (after === 0 && $('#post-container li.post-row[data-index="0"]').length)) {
 			return;
 		}
 
@@ -386,7 +387,7 @@ define('forum/topic', ['forum/pagination', 'forum/infinitescroll', 'forum/topic/
 		}
 
 		infinitescroll.loadMore('topics.loadMore', {
-			tid: ajaxify.variables.get('topic_id'),
+			tid: tid,
 			after: after
 		}, function (data) {
 

src/database/redis.js

@@ -65,6 +65,7 @@
 
 		redisClient.on('error', function (err) {
 			winston.error(err.stack);
+			process.exit(1);
 		});
 
 		module.client = redisClient;

src/sitemap.js

@@ -29,12 +29,12 @@ var path = require('path'),
 			async.parallel([
 				function(next) {
 					var categoryUrls = [];
-					categories.getVisibleCategories(0, function(err, data) {
+					categories.getVisibleCategories(0, function(err, categoriesData) {
 						if (err) {
 							return next(err);
 						}
 
-						data.categories.forEach(function(category) {
+						categoriesData.forEach(function(category) {
 							categoryUrls.push({
 								url: path.join('/category', category.slug),
 								changefreq: 'weekly',