From: Matthias Schmidt <gravatronics@live.com>
Date: Sun, 21 Aug 2016 13:42:08 +0000 (+0200)
Subject: Merge branch 'master' into next
X-Git-Tag: 3.0.0_Beta_1~625
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=f28be008cd72f026cbb0d8898c583bb1b1ea60ed;p=GitHub%2FWoltLab%2FWCF.git

Merge branch 'master' into next

# Conflicts:
#
wcfsetup/install/files/lib/system/cronjob/UserGroupAssignmentCronjob.cla
ss.php
---

f28be008cd72f026cbb0d8898c583bb1b1ea60ed
diff --cc wcfsetup/install/files/lib/system/cronjob/UserGroupAssignmentCronjob.class.php
index 9044b78724,d8bc124561..3c0d0d0d16
--- a/wcfsetup/install/files/lib/system/cronjob/UserGroupAssignmentCronjob.class.php
+++ b/wcfsetup/install/files/lib/system/cronjob/UserGroupAssignmentCronjob.class.php
@@@ -31,12 -33,14 +31,14 @@@ class UserGroupAssignmentCronjob extend
  		}
  		
  		foreach ($usersToGroup as $groupID => $users) {
- 			$userAction = new UserAction(array_unique($users), 'addToGroups', [
- 				'addDefaultGroups' => false,
- 				'deleteOldGroups' => false,
- 				'groups' => [$groupID]
- 			]);
- 			$userAction->executeAction();
+ 			if (!empty($users)) {
 -				$userAction = new UserAction(array_unique($users), 'addToGroups', array(
++				$userAction = new UserAction(array_unique($users), 'addToGroups', [
+ 					'addDefaultGroups' => false,
+ 					'deleteOldGroups' => false,
 -					'groups' => array($groupID)
 -				));
++					'groups' => [$groupID]
++				]);
+ 				$userAction->executeAction();
+ 			}
  		}
  	}
  }