From 7b11eace1cde7949bf8cda9a09635622ec863bd0 Mon Sep 17 00:00:00 2001 From: eileen Date: Fri, 12 Mar 2021 17:29:57 +1300 Subject: [PATCH] [REF] Stop passing paramter not recognised by getCorePermissions getCorePermissions does not accept any parameters so this stops passing them --- CRM/Core/Permission.php | 2 +- distmaker/utils/joomlaxml.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CRM/Core/Permission.php b/CRM/Core/Permission.php index edce29ae2f7e..4ff3f9210e2a 100644 --- a/CRM/Core/Permission.php +++ b/CRM/Core/Permission.php @@ -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')]; diff --git a/distmaker/utils/joomlaxml.php b/distmaker/utils/joomlaxml.php index 15c1fd1f8252..5367d1cbc44b 100644 --- a/distmaker/utils/joomlaxml.php +++ b/distmaker/utils/joomlaxml.php @@ -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';