From: Alexander Ebert <ebert@woltlab.com>
Date: Tue, 21 Aug 2012 14:30:37 +0000 (+0200)
Subject: Fixed broken WCFSetup
X-Git-Tag: 2.0.0_Beta_1~880^2~3
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=a0854a0b544816f2b70830efb01fbcf825e7c5f9;p=GitHub%2FWoltLab%2FWCF.git

Fixed broken WCFSetup
---

diff --git a/wcfsetup/install/files/lib/system/cache/builder/UserGroupPermissionCacheBuilder.class.php b/wcfsetup/install/files/lib/system/cache/builder/UserGroupPermissionCacheBuilder.class.php
index 5363177a4c..e0ce079f63 100644
--- a/wcfsetup/install/files/lib/system/cache/builder/UserGroupPermissionCacheBuilder.class.php
+++ b/wcfsetup/install/files/lib/system/cache/builder/UserGroupPermissionCacheBuilder.class.php
@@ -83,7 +83,13 @@ class UserGroupPermissionCacheBuilder implements ICacheBuilder {
 				}
 				else {
 					$typeObj = $this->getTypeObject($option['type']);
-					$result = $typeObj->merge($option['values']);
+					$result = array_shift($option['values']);
+					foreach ($option['values'] as $value) {
+						$newValue = $typeObj->merge($result, $value);
+						if ($newValue !== null) {
+							$result = $newValue;
+						}
+					}
 				}
 				
 				// unset false values