Skip to content

Commit

Permalink
(REF) dev/core#2601 - Cleanup stale parameter
Browse files Browse the repository at this point in the history
Overview
--------

This cleans up a parameter that became unused/unnecessary in civicrm#20256.

History
-------

This revision is a little bouncy. Instead of before/after, here's a history:

* `<= v5.36`: `getAllModulePermissions($descriptions = FALSE)`
* `=  v5.37.0`: `getAllModulePermissions($descriptions = FALSE, &$permissions)`
* `>= v.37.1`: `getAllModulePermissions($descriptions = FALSE)`

I grepped `universe` to confirm that no other repos were using the intermediate signature.
  • Loading branch information
totten committed May 11, 2021
1 parent 8df81b0 commit 1a1100e
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion CRM/Core/Permission.php
Original file line number Diff line number Diff line change
Expand Up @@ -591,7 +591,7 @@ public static function assembleBasicPermissions($all = FALSE, $descriptions = FA
$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) {
Expand Down

0 comments on commit 1a1100e

Please sign in to comment.