From 5c40f15329087424d41a6d5e436f2830033e7ac6 Mon Sep 17 00:00:00 2001 From: Matthias Schmidt Date: Sun, 23 Jun 2019 14:30:04 +0200 Subject: [PATCH] Revert "Add bulk processing parameter for UserActivityPointHandler::removeEvents()" This reverts commit 78f6d353e5186675f9854ca2412a7732ef975adf. --- .../point/UserActivityPointHandler.class.php | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/wcfsetup/install/files/lib/system/user/activity/point/UserActivityPointHandler.class.php b/wcfsetup/install/files/lib/system/user/activity/point/UserActivityPointHandler.class.php index f54850d372..474912e985 100644 --- a/wcfsetup/install/files/lib/system/user/activity/point/UserActivityPointHandler.class.php +++ b/wcfsetup/install/files/lib/system/user/activity/point/UserActivityPointHandler.class.php @@ -151,12 +151,11 @@ class UserActivityPointHandler extends SingletonFactory { /** * Removes activity point events. * - * @param string $objectType - * @param integer[] $userToItems - * @param boolean $isBulkProcessing + * @param string $objectType + * @param integer[] $userToItems * @throws InvalidObjectTypeException */ - public function removeEvents($objectType, array $userToItems, $isBulkProcessing = false) { + public function removeEvents($objectType, array $userToItems) { if (empty($userToItems)) return; // get and validate object type @@ -181,13 +180,9 @@ class UserActivityPointHandler extends SingletonFactory { ]); } - // during bulk processing, users do not have to be updated because - // they can be updated via `UserRebuildDataWorker` afterwards - // which calls `updateUsers()` - if (!$isBulkProcessing) { - // update total activity points per user - $this->updateUsers(array_keys($userToItems)); - } + // update total activity points per user + $userIDs = array_keys($userToItems); + $this->updateUsers($userIDs); } /** -- 2.20.1