From ef4de68f5bc4c8966ac6e4c978517cd3bafb4115 Mon Sep 17 00:00:00 2001
From: Baris Usakli <barisusakli@gmail.com>
Date: Wed, 7 Feb 2018 12:30:03 -0500
Subject: [PATCH] closes #6312

---
 public/src/client/topic/merge.js | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/public/src/client/topic/merge.js b/public/src/client/topic/merge.js
index 473f76583c..92e7e86594 100644
--- a/public/src/client/topic/merge.js
+++ b/public/src/client/topic/merge.js
@@ -10,9 +10,6 @@ define('forum/topic/merge', function () {
 
 	Merge.init = function () {
 		$('.category').on('click', '[component="topic/merge"]', onMergeTopicsClicked);
-		if (modal) {
-			$('[component="category/topic"]').on('click', 'a', onTopicClicked);
-		}
 	};
 
 	function onMergeTopicsClicked() {
@@ -28,7 +25,7 @@ define('forum/topic/merge', function () {
 
 			modal.find('.close,#merge_topics_cancel').on('click', closeModal);
 
-			$('[component="category/topic"]').on('click', 'a', onTopicClicked);
+			$('[component="category"]').on('click', '[component="category/topic"] a', onTopicClicked);
 
 			showTopicsSelected();
 
@@ -41,14 +38,19 @@ define('forum/topic/merge', function () {
 	function onTopicClicked(ev) {
 		var tid = $(this).parents('[component="category/topic"]').attr('data-tid');
 		var index = $(this).parents('[component="category/topic"]').attr('data-index');
-		var title = ajaxify.data.topics[index] ? ajaxify.data.topics[index].title : 'No title';
-		if (selectedTids[tid]) {
-			delete selectedTids[tid];
-		} else {
-			selectedTids[tid] = title;
-		}
-		checkButtonEnable();
-		showTopicsSelected();
+		socket.emit('topics.getTopic', tid, function (err, topicData) {
+			if (err) {
+				return app.alertError(err);
+			}
+			var title = topicData ? topicData.title : 'No title';
+			if (selectedTids[tid]) {
+				delete selectedTids[tid];
+			} else {
+				selectedTids[tid] = title;
+			}
+			checkButtonEnable();
+			showTopicsSelected();
+		});
 		ev.preventDefault();
 		ev.stopPropagation();
 		return false;