use "removeFromGroups"-Method in update()-Method
authorJoshua Rüsweg <josh@joshsboard.de>
Thu, 1 May 2014 14:34:15 +0000 (16:34 +0200)
committerJoshua Rüsweg <josh@joshsboard.de>
Thu, 1 May 2014 14:34:15 +0000 (16:34 +0200)
wcfsetup/install/files/lib/data/user/UserAction.class.php

index cc23dce4e470c558ee8d75467df21dcf2a1ae029..378f07c9378e58bf409e9372454218ad2eabd078 100644 (file)
@@ -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)) {