From 7ca62b8399146ebe59d2a2e3fb3a5257cd4c5f6c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Thu, 6 Dec 2018 12:08:23 -0500 Subject: [PATCH] feat: closes #7070 --- src/topics/merge.js | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/topics/merge.js b/src/topics/merge.js index e97261f8d7..5095606729 100644 --- a/src/topics/merge.js +++ b/src/topics/merge.js @@ -1,6 +1,7 @@ 'use strict'; -var async = require('async'); +const async = require('async'); +const plugins = require('../plugins'); module.exports = function (Topics) { Topics.merge = function (tids, uid, callback) { @@ -34,7 +35,13 @@ module.exports = function (Topics) { }, next); }, ], next); - }, callback); + }, function (err) { + if (err) { + return callback(err); + } + plugins.fireHook('action:topic.merge', { uid: uid, tids: tids, mergeIntoTid: mergeIntoTid, otherTids: otherTids }); + callback(); + }); }; function findOldestTopic(tids) {