From: Matthias Schmidt <gravatronics@live.com>
Date: Mon, 31 Dec 2012 19:30:51 +0000 (+0100)
Subject: Removes $usePackageDependencies from ACLHandler
X-Git-Tag: 2.0.0_Beta_1~625
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=4dfe7d948a07b6e27bd45e0aa5dbd9e7d8f6b474;p=GitHub%2FWoltLab%2FWCF.git

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 b771e6530c..1036433abb 100644
--- 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 ef8881cf44..fa7652e44b 100644
--- 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 a65f2d6d47..dba03167f0 100644
--- 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();