From: Alexander Ebert <ebert@woltlab.com>
Date: Mon, 18 Feb 2013 19:17:28 +0000 (+0100)
Subject: Fixed loading of ACLs
X-Git-Tag: 2.0.0_Beta_1~469^2
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=c066501a66680e83653706e9d63feeaabc119753;p=GitHub%2FWoltLab%2FWCF.git

Fixed loading of ACLs
---

diff --git a/wcfsetup/install/files/js/WCF.ACL.js b/wcfsetup/install/files/js/WCF.ACL.js
index 1dd3743dd4..25fee24a42 100644
--- a/wcfsetup/install/files/js/WCF.ACL.js
+++ b/wcfsetup/install/files/js/WCF.ACL.js
@@ -7,7 +7,7 @@ WCF.ACL = {};
  * ACL support for WCF
  * 
  * @author	Alexander Ebert
- * @copyright	2001-2011 WoltLab GmbH
+ * @copyright	2001-2013 WoltLab GmbH
  * @license	GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
  */
 WCF.ACL.List = Class.extend({
@@ -78,7 +78,7 @@ WCF.ACL.List = Class.extend({
 	 * @param	boolean		includeUserGroups
 	 */
 	init: function(containerSelector, objectTypeID, categoryName, objectID, includeUserGroups, initialPermissions) {
-		this._objectID = objectID;
+		this._objectID = objectID || 0;
 		this._objectTypeID = objectTypeID;
 		this._categoryName = categoryName;
 		if (includeUserGroups === undefined) {
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 7ce37fa186..7ae0e3fe4f 100644
--- a/wcfsetup/install/files/lib/data/acl/option/ACLOptionAction.class.php
+++ b/wcfsetup/install/files/lib/data/acl/option/ACLOptionAction.class.php
@@ -23,7 +23,7 @@ class ACLOptionAction extends AbstractDatabaseObjectAction {
 	 * Validates parameters for ACL options.
 	 */
 	public function validateLoadAll() {
-		$this->readInteger('objectID', false);
+		$this->readInteger('objectID', true);
 		$this->readInteger('objectTypeID');
 		$this->readString('categoryName', true);
 	}