Skip to content

Commit

Permalink
[REF] Stop passing paramter not recognised by getCorePermissions
Browse files Browse the repository at this point in the history
getCorePermissions does not accept any parameters so this stops passing them
  • Loading branch information
eileenmcnaughton committed Mar 12, 2021
1 parent 77d871a commit 7b11eac
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion CRM/Core/Permission.php
Original file line number Diff line number Diff line change
Expand Up @@ -589,7 +589,7 @@ public static function basicPermissions($all = FALSE, $descriptions = FALSE) {
public static function assembleBasicPermissions($all = FALSE, $descriptions = FALSE) {
$config = CRM_Core_Config::singleton();
$prefix = ts('CiviCRM') . ': ';
$permissions = self::getCorePermissions($descriptions);
$permissions = self::getCorePermissions();

if (self::isMultisiteEnabled()) {
$permissions['administer Multiple Organizations'] = [$prefix . ts('administer Multiple Organizations')];
Expand Down
2 changes: 1 addition & 1 deletion distmaker/utils/joomlaxml.php
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ function generateJoomlaConfig($version) {
require_once 'CRM/Core/Permission.php';
require_once 'CRM/Utils/String.php';
require_once 'CRM/Core/I18n.php';
$permissions = CRM_Core_Permission::getCorePermissions(TRUE);
$permissions = CRM_Core_Permission::getCorePermissions();

$crmFolderDir = $sourceCheckoutDir . DIRECTORY_SEPARATOR . 'CRM';

Expand Down

0 comments on commit 7b11eac

Please sign in to comment.