Fix actions disabling merging

pydio · Dec 7, 2015 · aea0f07 · aea0f07
1 parent 5eddfb2
commit aea0f07
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/core/src/core/classes/class.AJXP_Role.php b/core/src/core/classes/class.AJXP_Role.php
@@ -354,10 +354,10 @@ public function listActionsStatesFor($repository)
             $actions = $this->actions[AJXP_REPO_SCOPE_ALL];
         }
         if ($repository != null && isSet($this->actions[AJXP_REPO_SCOPE_SHARED]) && $repository->hasParent()) {
-            $actions = array_merge($actions, $this->actions[AJXP_REPO_SCOPE_SHARED]);
+            $actions = $this->array_merge_recursive2($actions, $this->actions[AJXP_REPO_SCOPE_SHARED]);
         }
         if ($repository != null && isSet($this->actions[$repository->getId()])) {
-            $actions = array_merge($actions, $this->actions[$repository->getId()]);
+            $actions = $this->array_merge_recursive2($actions, $this->actions[$repository->getId()]);
         }
         return $actions;
     }