From eb7c2d5872b12d5b67b26d38cb5585780608c207 Mon Sep 17 00:00:00 2001
From: boomzillawtf <boomzillawtf@gmail.com>
Date: Wed, 16 Mar 2016 20:19:02 -0400
Subject: [PATCH] Use scrollToMyPost setting with both pagination and infinite
 scroll

---
 public/src/client/topic/posts.js | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/public/src/client/topic/posts.js b/public/src/client/topic/posts.js
index 2eada17c17..3eff5a03b5 100644
--- a/public/src/client/topic/posts.js
+++ b/public/src/client/topic/posts.js
@@ -33,10 +33,12 @@ define('forum/topic/posts', [
 		ajaxify.data.postcount ++;
 		postTools.updatePostCount(ajaxify.data.postcount);
 
-		if (config.usePagination) {
-			onNewPostPagination(data);
-		} else {
-			onNewPostInfiniteScroll(data);
+		if (config.scrollToMyPost) {
+		  if (config.usePagination) {
+			  onNewPostPagination(data);
+		  } else {
+			  onNewPostInfiniteScroll(data);
+		  }
 		}
 	};
 
@@ -79,7 +81,7 @@ define('forum/topic/posts', [
 	}
 
 	function scrollToPostIfSelf(post) {
-		var isSelfPost = config.scrollToMyPost && parseInt(post.uid, 10) === parseInt(app.user.uid, 10);
+		var isSelfPost = parseInt(post.uid, 10) === parseInt(app.user.uid, 10);
 		if (isSelfPost) {
 			navigator.scrollBottom(post.index);
 		}