#1848

public/src/modules/navigator.js

@@ -152,7 +152,7 @@ define('navigator', ['forum/pagination'], function(pagination) {
 	}
 
 	navigator.scrollToPost = function(postIndex, highlight, duration, offset) {
-		if (!utils.isNumber(postIndex)) {
+		if (!utils.isNumber(postIndex) || !$('.post-container').length) {
 			return;
 		}
 

src/controllers/topics.js

@@ -44,18 +44,6 @@ topicsController.get = function(req, res, next) {
 		},
 		function (results, next) {
 
-			var postCount = parseInt(results.postCount, 10);
-			if (utils.isNumber(req.params.post_index)) {
-				var url = '';
-				if (req.params.post_index > postCount) {
-					url = '/topic/' + req.params.topic_id + '/' + req.params.slug + '/' + postCount;
-					return res.locals.isAPI ? res.status(302).json(url) : res.redirect(url);
-				} else if (req.params.post_index < 1) {
-					url = '/topic/' + req.params.topic_id + '/' + req.params.slug;
-					return res.locals.isAPI ? res.status(302).json(url) : res.redirect(url);
-				}
-			}
-
 			userPrivileges = results.privileges;
 
 			if (userPrivileges.disabled) {
@@ -70,6 +58,18 @@ topicsController.get = function(req, res, next) {
 				return categoriesController.notAllowed(req, res);
 			}
 
+			var postCount = parseInt(results.postCount, 10);
+			if (utils.isNumber(req.params.post_index)) {
+				var url = '';
+				if (req.params.post_index > postCount) {
+					url = '/topic/' + req.params.topic_id + '/' + req.params.slug + '/' + postCount;
+					return res.locals.isAPI ? res.status(302).json(url) : res.redirect(url);
+				} else if (req.params.post_index < 1) {
+					url = '/topic/' + req.params.topic_id + '/' + req.params.slug;
+					return res.locals.isAPI ? res.status(302).json(url) : res.redirect(url);
+				}
+			}
+
 			var settings = results.settings;
 			var set = 'tid:' + tid + ':posts',
 				reverse = false;