From 7afd2925afec23817291e21d0fb6c53ecef97fa1 Mon Sep 17 00:00:00 2001
From: barisusakli <barisusakli@gmail.com>
Date: Wed, 31 Aug 2016 22:50:48 +0300
Subject: [PATCH] get sort setting from config

---
 public/src/client/category.js          | 3 ++-
 public/src/client/topic/posts.js       | 3 ++-
 src/socket.io/categories.js            | 8 ++++----
 src/socket.io/topics/infinitescroll.js | 9 +++------
 4 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/public/src/client/category.js b/public/src/client/category.js
index af0d26b980..80d8d10539 100644
--- a/public/src/client/category.js
+++ b/public/src/client/category.js
@@ -277,7 +277,8 @@ define('forum/category', [
 			cid: ajaxify.data.cid,
 			after: after,
 			direction: direction,
-			author: utils.params().author
+			author: utils.params().author,
+			categoryTopicSort: config.categoryTopicSort
 		}, function (data, done) {
 			if (data.topics && data.topics.length) {
 				Category.onTopicsLoaded(data, direction, done);
diff --git a/public/src/client/topic/posts.js b/public/src/client/topic/posts.js
index 3c70c09712..6aae064794 100644
--- a/public/src/client/topic/posts.js
+++ b/public/src/client/topic/posts.js
@@ -222,7 +222,8 @@ define('forum/topic/posts', [
 		infinitescroll.loadMore('topics.loadMore', {
 			tid: tid,
 			after: after,
-			direction: direction
+			direction: direction,
+			topicPostSort: config.topicPostSort
 		}, function (data, done) {
 			indicatorEl.fadeOut();
 
diff --git a/src/socket.io/categories.js b/src/socket.io/categories.js
index 1c13adebea..a8957a10dc 100644
--- a/src/socket.io/categories.js
+++ b/src/socket.io/categories.js
@@ -80,12 +80,12 @@ SocketCategories.loadMore = function(socket, data, callback) {
 		}
 
 		var infScrollTopicsPerPage = 20;
-		var set = 'cid:' + data.cid + ':tids',
-			reverse = false;
+		var set = 'cid:' + data.cid + ':tids';
+		var reverse = false;
 
-		if (results.settings.categoryTopicSort === 'newest_to_oldest') {
+		if (data.categoryTopicSort === 'newest_to_oldest') {
 			reverse = true;
-		} else if (results.settings.categoryTopicSort === 'most_posts') {
+		} else if (data.categoryTopicSort === 'most_posts') {
 			reverse = true;
 			set = 'cid:' + data.cid + ':tids:posts';
 		}
diff --git a/src/socket.io/topics/infinitescroll.js b/src/socket.io/topics/infinitescroll.js
index 5f089bd52e..7401c60e1f 100644
--- a/src/socket.io/topics/infinitescroll.js
+++ b/src/socket.io/topics/infinitescroll.js
@@ -1,7 +1,7 @@
 'use strict';
 
 var async = require('async');
-var user = require('../../user');
+
 var topics = require('../../topics');
 var privileges = require('../../privileges');
 var meta = require('../../meta');
@@ -19,9 +19,6 @@ module.exports = function(SocketTopics) {
 			privileges: function(next) {
 				privileges.topics.get(data.tid, socket.uid, next);
 			},
-			settings: function(next) {
-				user.getSettings(socket.uid, next);
-			},
 			topic: function(next) {
 				topics.getTopicFields(data.tid, ['postcount', 'deleted'], next);
 			}
@@ -35,10 +32,10 @@ module.exports = function(SocketTopics) {
 			}
 
 			var set = 'tid:' + data.tid + ':posts';
-			if (results.settings.topicPostSort === 'most_votes') {
+			if (data.topicPostSort === 'most_votes') {
 				set = 'tid:' + data.tid + ':posts:votes';
 			}
-			var reverse = results.settings.topicPostSort === 'newest_to_oldest' || results.settings.topicPostSort === 'most_votes';
+			var reverse = data.topicPostSort === 'newest_to_oldest' || data.topicPostSort === 'most_votes';
 			var start = Math.max(0, parseInt(data.after, 10));
 
 			var infScrollPostsPerPage = 10;