Skip to content

Commit e6b7b59

Browse files
Merge pull request #14735 from mattwire/deprecated_getallpermissions
Remove use of deprecated path in function `CRM_Event_BAO_Event::checkPermission()`
2 parents 3a6012d + cfbfd40 commit e6b7b59

2 files changed

Lines changed: 6 additions & 2 deletions

File tree

CRM/Event/Form/ManageEvent/TabHeader.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,9 @@ public static function process(&$form) {
8686
$tabs['location'] = ['title' => ts('Event Location')] + $default;
8787
$tabs['fee'] = ['title' => ts('Fees')] + $default;
8888
$tabs['registration'] = ['title' => ts('Online Registration')] + $default;
89-
if (CRM_Core_Permission::check('administer CiviCRM') || CRM_Event_BAO_Event::checkPermission(NULL, CRM_Core_Permission::EDIT)) {
89+
// @fixme I don't understand the event permissions check here - can we just get rid of it?
90+
$permissions = CRM_Event_BAO_Event::getAllPermissions();
91+
if (CRM_Core_Permission::check('administer CiviCRM') || !empty($permissions[CRM_Core_Permission::EDIT])) {
9092
$tabs['reminder'] = ['title' => ts('Schedule Reminders'), 'class' => 'livePage'] + $default;
9193
}
9294
$tabs['conference'] = ['title' => ts('Conference Slots')] + $default;

CRM/Event/Page/ManageEvent.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,9 @@ public static function &tabs($enableCart) {
178178
'field' => 'is_online_registration',
179179
];
180180

181-
if (CRM_Core_Permission::check('administer CiviCRM') || CRM_Event_BAO_Event::checkPermission(NULL, CRM_Core_Permission::EDIT)) {
181+
// @fixme I don't understand the event permissions check here - can we just get rid of it?
182+
$permissions = CRM_Event_BAO_Event::getAllPermissions();
183+
if (CRM_Core_Permission::check('administer CiviCRM') || !empty($permissions[CRM_Core_Permission::EDIT])) {
182184
self::$_tabLinks[$cacheKey]['reminder']
183185
= [
184186
'title' => ts('Schedule Reminders'),

0 commit comments

Comments
 (0)