Skip to content
Snippets Groups Projects
Unverified Commit c5f1d72c authored by Eileen McNaughton's avatar Eileen McNaughton Committed by GitHub
Browse files

Merge pull request #20271 from totten/5.38ormaster-perm-cleanup

(REF) #2601 - Cleanup stale parameter
parents 139a7318 1a1100ef
No related branches found
No related tags found
No related merge requests found
......@@ -591,7 +591,7 @@ class CRM_Core_Permission {
$permissions = self::getCoreAndComponentPermissions($all);
// Add any permissions defined in hook_civicrm_permission implementations.
$module_permissions = CRM_Core_Config::singleton()->userPermissionClass->getAllModulePermissions(TRUE, $permissions);
$module_permissions = CRM_Core_Config::singleton()->userPermissionClass->getAllModulePermissions(TRUE);
$permissions = array_merge($permissions, $module_permissions);
if (!$descriptions) {
foreach ($permissions as $name => $attr) {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment