From ebcd892aee939a90a1d86d856850c65761001507 Mon Sep 17 00:00:00 2001 From: barisusakli Date: Thu, 25 Feb 2016 18:01:59 +0200 Subject: [PATCH] closes #4259 --- src/categories/delete.js | 4 ++-- src/socket.io/admin/categories.js | 2 +- src/topics/delete.js | 8 +++++--- src/topics/tools.js | 2 +- 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/src/categories/delete.js b/src/categories/delete.js index ea3b567085..8d99bb60d1 100644 --- a/src/categories/delete.js +++ b/src/categories/delete.js @@ -8,10 +8,10 @@ var async = require('async'), module.exports = function(Categories) { - Categories.purge = function(cid, callback) { + Categories.purge = function(cid, uid, callback) { batch.processSortedSet('cid:' + cid + ':tids', function(tids, next) { async.eachLimit(tids, 10, function(tid, next) { - topics.purgePostsAndTopic(tid, next); + topics.purgePostsAndTopic(tid, uid, next); }, next); }, {alwaysStartAt: 0}, function(err) { if (err) { diff --git a/src/socket.io/admin/categories.js b/src/socket.io/admin/categories.js index a3d929e5c2..288e395837 100644 --- a/src/socket.io/admin/categories.js +++ b/src/socket.io/admin/categories.js @@ -42,7 +42,7 @@ Categories.getNames = function(socket, data, callback) { }; Categories.purge = function(socket, cid, callback) { - categories.purge(cid, callback); + categories.purge(cid, socket.uid, callback); }; Categories.update = function(socket, data, callback) { diff --git a/src/topics/delete.js b/src/topics/delete.js index b7bb2ea71e..8f2794fa17 100644 --- a/src/topics/delete.js +++ b/src/topics/delete.js @@ -85,7 +85,7 @@ module.exports = function(Topics) { }); }; - Topics.purgePostsAndTopic = function(tid, callback) { + Topics.purgePostsAndTopic = function(tid, uid, callback) { var mainPid; async.waterfall([ function (next) { @@ -94,11 +94,13 @@ module.exports = function(Topics) { function (_mainPid, next) { mainPid = _mainPid; batch.processSortedSet('tid:' + tid + ':posts', function(pids, next) { - async.eachLimit(pids, 10, posts.purge, next); + async.eachLimit(pids, 10, function(pid, next) { + posts.purge(pid, uid, next); + }, next); }, {alwaysStartAt: 0}, next); }, function (next) { - posts.purge(mainPid, next); + posts.purge(mainPid, uid, next); }, function (next) { Topics.purge(tid, next); diff --git a/src/topics/tools.js b/src/topics/tools.js index f7ceab6931..3deea91b46 100644 --- a/src/topics/tools.js +++ b/src/topics/tools.js @@ -94,7 +94,7 @@ module.exports = function(Topics) { function (_cid, next) { cid = _cid; - Topics.purgePostsAndTopic(tid, next); + Topics.purgePostsAndTopic(tid, uid, next); }, function (next) { next(null, {tid: tid, cid: cid, uid: uid});