From: Joshua Rüsweg <josh@joshsboard.de>
Date: Thu, 1 May 2014 14:34:15 +0000 (+0200)
Subject: use "removeFromGroups"-Method in update()-Method
X-Git-Tag: 2.1.0_Alpha_1~548^2~7^2
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=cc27b41489adb573c9ed0ef242217f273f3dbc32;p=GitHub%2FWoltLab%2FWCF.git

use "removeFromGroups"-Method in update()-Method
---

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)) {