From 6a837632fa37d01304dbdbaff8935013b7fe2136 Mon Sep 17 00:00:00 2001
From: barisusakli <barisusakli@gmail.com>
Date: Sun, 1 Feb 2015 20:10:51 -0500
Subject: [PATCH] fix first post loading when pagination is enabled

---
 public/src/client/topic/posts.js | 17 +++++++----------
 src/controllers/topics.js        |  2 +-
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/public/src/client/topic/posts.js b/public/src/client/topic/posts.js
index ec566d9812..7bd7b714ae 100644
--- a/public/src/client/topic/posts.js
+++ b/public/src/client/topic/posts.js
@@ -14,11 +14,11 @@ define('forum/topic/posts', [
 
 	Posts.onNewPost = function(data) {
 		var tid = ajaxify.variables.get('topic_id');
-		if(data && data.posts && data.posts.length && parseInt(data.posts[0].tid, 10) !== parseInt(tid, 10)) {
+		if (data && data.posts && data.posts.length && parseInt(data.posts[0].tid, 10) !== parseInt(tid, 10)) {
 			return;
 		}
 
-		if(config.usePagination) {
+		if (config.usePagination) {
 			return onNewPostPagination(data);
 		}
 
@@ -32,14 +32,11 @@ define('forum/topic/posts', [
 
 	function onNewPostPagination(data) {
 		var posts = data.posts;
-		socket.emit('topics.getPageCount', ajaxify.variables.get('topic_id'), function(err, newPageCount) {
-
-			if (pagination.currentPage === pagination.pageCount) {
-				createNewPosts(data);
-			} else if(data.posts && data.posts.length && parseInt(data.posts[0].uid, 10) === parseInt(app.uid, 10)) {
-				pagination.loadPage(pagination.pageCount);
-			}
-		});
+		if (pagination.currentPage === pagination.pageCount) {
+			createNewPosts(data);
+		} else if(data.posts && data.posts.length && parseInt(data.posts[0].uid, 10) === parseInt(app.uid, 10)) {
+			pagination.loadPage(pagination.pageCount);
+		}
 	}
 
 	function createNewPosts(data, callback) {
diff --git a/src/controllers/topics.js b/src/controllers/topics.js
index 6b3b42ab93..ffcca5ab46 100644
--- a/src/controllers/topics.js
+++ b/src/controllers/topics.js
@@ -54,7 +54,7 @@ topicsController.get = function(req, res, next) {
 
 			var settings = results.settings;
 			var postCount = parseInt(results.topic.postcount, 10);
-			var pageCount = Math.ceil((postCount - 1) / settings.postsPerPage);
+			var pageCount = Math.max(1, Math.ceil((postCount - 1) / settings.postsPerPage));
 
 			if (utils.isNumber(req.params.post_index)) {
 				var url = '';