Merged Source/Master

zendframework · Mar 13, 2013 · af16339 · af16339
commit af16339
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/composer.json b/composer.json
@@ -20,8 +20,8 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "2.4-dev",
-            "dev-develop": "2.5-dev"
+            "dev-master": "2.1-dev",
+            "dev-develop": "2.2-dev"
         }
     },
     "autoload-dev": {

diff --git a/src/Acl.php b/src/Acl.php
@@ -669,7 +669,7 @@ protected function getChildResources(Resource\ResourceInterface $resource)
         $id = $resource->getResourceId();
 
         $children = $this->resources[$id]['children'];
-        foreach($children as $child) {
+        foreach ($children as $child) {
             $child_return = $this->getChildResources($child);
             $child_return[$child->getResourceId()] = $child;