From cc27b41489adb573c9ed0ef242217f273f3dbc32 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Joshua=20R=C3=BCsweg?= Date: Thu, 1 May 2014 16:34:15 +0200 Subject: [PATCH] use "removeFromGroups"-Method in update()-Method --- .../files/lib/data/user/UserAction.class.php | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/wcfsetup/install/files/lib/data/user/UserAction.class.php b/wcfsetup/install/files/lib/data/user/UserAction.class.php index cc23dce4e4..378f07c937 100644 --- a/wcfsetup/install/files/lib/data/user/UserAction.class.php +++ b/wcfsetup/install/files/lib/data/user/UserAction.class.php @@ -314,11 +314,14 @@ class UserAction extends AbstractDatabaseObjectAction implements IClipboardActio $action->executeAction(); } + if (!empty($removeGroups)) { + $action = new UserAction($this->objects, 'removeFromGroups', array( + 'groups' => $groupIDs + )); + $action->executeAction(); + } + foreach ($this->objects as $userEditor) { - if (!empty($removeGroups)) { - $userEditor->removeFromGroups($removeGroups); - } - if (!empty($userOptions)) { $userEditor->updateUserOptions($userOptions); } @@ -330,7 +333,7 @@ class UserAction extends AbstractDatabaseObjectAction implements IClipboardActio } /** - * Add users to given groups. + * Remove users from given groups. */ public function removeFromGroups() { if (empty($this->objects)) { -- 2.20.1