ZF-9643

- Solution applied in setRule() as opposed to fix in previous commit in removeAllow() / removeDeny()

git-svn-id: http://framework.zend.com/svn/framework/standard/trunk@22581 44c647ce-9c0f-0410-b52a-842ac1e357ba

library/Zend/Acl.php

@@ -534,10 +534,6 @@ class Zend_Acl
      */
     public function removeAllow($roles = null, $resources = null, $privileges = null)
     {
-        if ($resources == null) {
-            $resources = array_keys($this->_resources);
-        }
-        
         return $this->setRule(self::OP_REMOVE, self::TYPE_ALLOW, $roles, $resources, $privileges);
     }
 
@@ -552,10 +548,6 @@ class Zend_Acl
      */
     public function removeDeny($roles = null, $resources = null, $privileges = null)
     {
-        if ($resources == null) {
-            $resources = array_keys($this->_resources);
-        }
-        
         return $this->setRule(self::OP_REMOVE, self::TYPE_DENY, $roles, $resources, $privileges);
     }
 
@@ -641,7 +633,7 @@ class Zend_Acl
 
         // ensure that all specified Resources exist; normalize input to array of Resource objects or null
         if (!is_array($resources)) {
-            $resources = array($resources);
+            $resources = ($resources == null && count($this->_resources) > 0) ? array_keys($this->_resources) : array($resources);
         } else if (0 === count($resources)) {
             $resources = array(null);
         }