Fixes #12810: getChildRoles() throws an exception when role has no children

This commit is contained in:
Pavel Dovlatov
2016-10-24 14:11:09 +03:00
committed by Alexander Makarov
parent f71a14c284
commit 73a30780b3
4 changed files with 11 additions and 2 deletions

View File

@ -481,7 +481,7 @@ class DbManager extends BaseManager
throw new InvalidParamException("Role \"$roleName\" not found.");
}
/** @var $result Item[] */
$result = [];
$this->getChildrenRecursive($roleName, $this->getChildrenList(), $result);
$roles = [$roleName => $role];

View File

@ -407,7 +407,7 @@ class PhpManager extends BaseManager
throw new InvalidParamException("Role \"$roleName\" not found.");
}
/** @var $result Item[] */
$result = [];
$this->getChildrenRecursive($roleName, $result);
$roles = [$roleName => $role];