Removes $usePackageDependencies from ACLHandler

diff --git a/wcfsetup/install/files/lib/data/acl/option/ACLOptionAction.class.php b/wcfsetup/install/files/lib/data/acl/option/ACLOptionAction.class.php
index b771e6530c318c61923cba63b4b55f6858f891e8..1036433abb7231c9e8cba168fe7f25ef3e9f01cc 100644 (file)
--- a/wcfsetup/install/files/lib/data/acl/option/ACLOptionAction.class.php
+++ b/wcfsetup/install/files/lib/data/acl/option/ACLOptionAction.class.php
@@ -36,7 +36,7 @@ class ACLOptionAction extends AbstractDatabaseObjectAction {
         */
        public function loadAll() {
                $objectIDs = (isset($this->parameters['data']['objectID'])) ? array($this->parameters['data']['objectID']) : array();
-               $permissions = ACLHandler::getInstance()->getPermissions($this->parameters['data']['objectTypeID'], $objectIDs, null, true, true);
+               $permissions = ACLHandler::getInstance()->getPermissions($this->parameters['data']['objectTypeID'], $objectIDs, null, true);
                
                return $permissions;
        }

diff --git a/wcfsetup/install/files/lib/system/acl/ACLHandler.class.php b/wcfsetup/install/files/lib/system/acl/ACLHandler.class.php
index ef8881cf443a09ca37495c9608b1fe53bc9b89bb..fa7652e44bc906a7a6ee5aa8a11e706562ab186a 100644 (file)
--- a/wcfsetup/install/files/lib/system/acl/ACLHandler.class.php
+++ b/wcfsetup/install/files/lib/system/acl/ACLHandler.class.php
@@ -54,7 +54,7 @@ class ACLHandler extends SingletonFactory {
                if (!$this->assignVariablesDisabled && isset($_POST['aclValues'])) {
                        $values = $_POST['aclValues'];
                        
-                       $data = $this->getPermissions($objectTypeID, array(), null, true, true);
+                       $data = $this->getPermissions($objectTypeID, array(), null, true);
                        
                        foreach ($values as $type => $optionData) {
                                if ($type === 'user') {
@@ -224,12 +224,11 @@ class ACLHandler extends SingletonFactory {
         * @param       integer                                         $objectTypeID
         * @param       array                                           $objectIDs
         * @param       wcf\data\acl\option\category\ACLOptionCategory  $category
-        * @param       boolean                                         $usePackageDependencies
         * @param       boolean                                         $settingsView
         * @return      array
         */
-       public function getPermissions($objectTypeID, array $objectIDs, ACLOptionCategory $category = null, $usePackageDependencies = true, $settingsView = false) {
-               $optionList = $this->getOptions($objectTypeID, $category, $usePackageDependencies, $settingsView);
+       public function getPermissions($objectTypeID, array $objectIDs, ACLOptionCategory $category = null, $settingsView = false) {
+               $optionList = $this->getOptions($objectTypeID, $category, $settingsView);
                
                $data = array(
                        'options' => $optionList,
@@ -364,12 +363,11 @@ class ACLHandler extends SingletonFactory {
         * 
         * @param       integer                                         $objectTypeID
         * @param       wcf\data\acl\option\category\ACLOptionCategory  $category
-        * @param       boolean                                         $usePackageDependencies
         * @param       boolean                                         $settingsView
         * @param       boolean                                         $settingsView
         * @return      wcf\data\acl\option\ACLOptionList
         */
-       public function getOptions($objectTypeID, ACLOptionCategory $category = null, $usePackageDependencies = true, $settingsView = false) {
+       public function getOptions($objectTypeID, ACLOptionCategory $category = null, $settingsView = false) {
                $optionList = new ACLOptionList();
                $optionList->sqlLimit = 0;
                if ($category !== null) {
@@ -387,10 +385,9 @@ class ACLHandler extends SingletonFactory {
         * @param       integer                                         $objectTypeID
         * @param       array<integer>                                  $objectIDs
         * @param       wcf\data\acl\option\category\ACLOptionCategory  $category
-        * @param       boolean                                         $usePackageDependencies
         */
-       public function removeValues($objectTypeID, array $objectIDs, ACLOptionCategory $category = null, $usePackageDependencies = true) {
-               $optionList = $this->getOptions($objectTypeID, $category, $usePackageDependencies);
+       public function removeValues($objectTypeID, array $objectIDs, ACLOptionCategory $category = null) {
+               $optionList = $this->getOptions($objectTypeID, $category);
                $options = $optionList->getObjects();
                
                $conditions = new PreparedStatementConditionBuilder();

diff --git a/wcfsetup/install/files/lib/system/cache/builder/CategoryACLOptionCacheBuilder.class.php b/wcfsetup/install/files/lib/system/cache/builder/CategoryACLOptionCacheBuilder.class.php
index a65f2d6d47df9214492c3cbd17476f15dea32a65..dba03167f0d4f8e79f4824cc9b4010daf20b3275 100644 (file)
--- a/wcfsetup/install/files/lib/system/cache/builder/CategoryACLOptionCacheBuilder.class.php
+++ b/wcfsetup/install/files/lib/system/cache/builder/CategoryACLOptionCacheBuilder.class.php
@@ -38,7 +38,7 @@ class CategoryACLOptionCacheBuilder implements ICacheBuilder {
                                                        'user' => array()
                                                );
                                        }
-
+                                       
                                        foreach ($optionData as $typeID => $optionValues) {
                                                $data[$categoryID][$type][$typeID] = array();