Fix edit_role action

pydio · Jul 14, 2016 · ede79b8 · ede79b8
1 parent 3c50dbb
commit ede79b8
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/core/src/plugins/access.ajxp_conf/src/RolesManager.php b/core/src/plugins/access.ajxp_conf/src/RolesManager.php
@@ -280,7 +280,7 @@ public function rolesActions(ServerRequestInterface $requestInterface, ResponseI
                 }
 
                 // Make sure it's utf8
-                $data["ALL"] = array_merge($data["ALL"], [
+                $data["ALL"] = array_merge((isSet($data["ALL"]) ? $data["ALL"]: []), [
                     "PLUGINS_SCOPES"    => [
                         "GLOBAL_TYPES"      => ["conf", "auth", "authfront", "log", "mq", "notifications", "gui", "sec"],
                         "GLOBAL_PLUGINS"    => ["action.avatar", "action.disclaimer", "action.scheduler", "action.skeleton", "action.updater"]