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 5363177a4c476e7fe2e54d4e0661c4899ae5a697..e0ce079f632cf6bf9bcca7bd381997fe9cd158e3 100644 (file)
--- 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