From a0854a0b544816f2b70830efb01fbcf825e7c5f9 Mon Sep 17 00:00:00 2001 From: Alexander Ebert Date: Tue, 21 Aug 2012 16:30:37 +0200 Subject: [PATCH] Fixed broken WCFSetup --- .../builder/UserGroupPermissionCacheBuilder.class.php | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) 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 -- 2.20.1