From cfbfd4069e44be2eb41ca6c51b0474ad66a95ef0 Mon Sep 17 00:00:00 2001 From: "Matthew Wire (MJW Consulting)" Date: Thu, 4 Jul 2019 14:42:39 +0100 Subject: [PATCH] Remove use of deprecated function --- CRM/Event/Form/ManageEvent/TabHeader.php | 4 +++- CRM/Event/Page/ManageEvent.php | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/CRM/Event/Form/ManageEvent/TabHeader.php b/CRM/Event/Form/ManageEvent/TabHeader.php index d77440c1a0..c373f901a8 100644 --- a/CRM/Event/Form/ManageEvent/TabHeader.php +++ b/CRM/Event/Form/ManageEvent/TabHeader.php @@ -86,7 +86,9 @@ class CRM_Event_Form_ManageEvent_TabHeader { $tabs['location'] = ['title' => ts('Event Location')] + $default; $tabs['fee'] = ['title' => ts('Fees')] + $default; $tabs['registration'] = ['title' => ts('Online Registration')] + $default; - if (CRM_Core_Permission::check('administer CiviCRM') || CRM_Event_BAO_Event::checkPermission(NULL, CRM_Core_Permission::EDIT)) { + // @fixme I don't understand the event permissions check here - can we just get rid of it? + $permissions = CRM_Event_BAO_Event::getAllPermissions(); + if (CRM_Core_Permission::check('administer CiviCRM') || !empty($permissions[CRM_Core_Permission::EDIT])) { $tabs['reminder'] = ['title' => ts('Schedule Reminders'), 'class' => 'livePage'] + $default; } $tabs['conference'] = ['title' => ts('Conference Slots')] + $default; diff --git a/CRM/Event/Page/ManageEvent.php b/CRM/Event/Page/ManageEvent.php index c2b0a3a550..73eb67af1d 100644 --- a/CRM/Event/Page/ManageEvent.php +++ b/CRM/Event/Page/ManageEvent.php @@ -178,7 +178,9 @@ class CRM_Event_Page_ManageEvent extends CRM_Core_Page { 'field' => 'is_online_registration', ]; - if (CRM_Core_Permission::check('administer CiviCRM') || CRM_Event_BAO_Event::checkPermission(NULL, CRM_Core_Permission::EDIT)) { + // @fixme I don't understand the event permissions check here - can we just get rid of it? + $permissions = CRM_Event_BAO_Event::getAllPermissions(); + if (CRM_Core_Permission::check('administer CiviCRM') || !empty($permissions[CRM_Core_Permission::EDIT])) { self::$_tabLinks[$cacheKey]['reminder'] = [ 'title' => ts('Schedule Reminders'), -- 2.25.1