Fixed loading of ACLs

diff --git a/wcfsetup/install/files/js/WCF.ACL.js b/wcfsetup/install/files/js/WCF.ACL.js
index 1dd3743dd4e48f1a9f9794cb5ba35e4c30a64b1a..25fee24a4272f588aef7c7a07550c74f8bf8c2d4 100644 (file)
--- 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 7ce37fa186871a5b2eb7c051a41e6ff35f0f84a1..7ae0e3fe4ffe184bda428a78ec406be6613a5545 100644 (file)
--- 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);
        }