From eb9b4a62dc1456aa93fa3f7897353ec05428499b Mon Sep 17 00:00:00 2001
From: barisusakli <barisusakli@gmail.com>
Date: Tue, 24 Jun 2014 17:40:41 -0400
Subject: [PATCH] fix topic move, fix moveAll

move topic wasnt moving mainPid, also fixed crash on move all
clicking permissions on admin/categories no longer goes to top of page
---
 public/src/forum/admin/categories.js |  2 +-
 public/src/forum/topic/move.js       |  2 +-
 src/categories/recentreplies.js      | 15 ++++++++++++---
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/public/src/forum/admin/categories.js b/public/src/forum/admin/categories.js
index b50708d73a..cc1627fdf6 100644
--- a/public/src/forum/admin/categories.js
+++ b/public/src/forum/admin/categories.js
@@ -192,10 +192,10 @@ define('forum/admin/categories', ['uploader', 'forum/admin/iconSelect'], functio
 				});
 			});
 
-			// Permissions modal
 			$('.admin-categories').on('click', '.permissions', function() {
 				var	cid = $(this).parents('li[data-cid]').attr('data-cid');
 				Categories.launchPermissionsModal(cid);
+				return false;
 			});
 
 
diff --git a/public/src/forum/topic/move.js b/public/src/forum/topic/move.js
index 2736f512f8..1027f44ff1 100644
--- a/public/src/forum/topic/move.js
+++ b/public/src/forum/topic/move.js
@@ -20,7 +20,7 @@ define('forum/topic/move', function() {
 		modal.on('shown.bs.modal', onMoveModalShown);
 		$('#move-confirm').hide();
 
-		if (tids.length > 1) {
+		if (Move.moveAll || (tids && tids.length > 1)) {
 			translator.translate('[[topic:move_topics]]', function(translated) {
 				modal.find('.modal-header h3').text(translated);
 			});
diff --git a/src/categories/recentreplies.js b/src/categories/recentreplies.js
index a9ea8e9248..974f3eeef9 100644
--- a/src/categories/recentreplies.js
+++ b/src/categories/recentreplies.js
@@ -36,15 +36,24 @@ module.exports = function(Categories) {
 		}
 
 		updatePostCount(tid, oldCid, cid);
-
-		topics.getPids(tid, function(err, pids) {
+		async.parallel({
+			mainPid: function(next) {
+				topics.getTopicField(tid, 'mainPid', next);
+			},
+			pids: function(next) {
+				topics.getPids(tid, next);
+			}
+		}, function(err, results) {
 			if (err) {
 				return winston.error(err.message);
 			}
-			if (pids && !pids.length) {
+
+			if (!results.mainPid && results.pids && !pids.length) {
 				return;
 			}
 
+			var pids = [results.mainPid].concat(results.pids);
+
 			var keys = pids.map(function(pid) {
 				return 'post:' + pid;
 			});