From 349394108980090bfbb20efdc601726afbc45d28 Mon Sep 17 00:00:00 2001 From: Franky Van Liedekerke Date: Fri, 12 Aug 2016 10:00:51 +0200 Subject: [PATCH] Disabled role causes php notices --- CRM/ACL/Page/ACL.php | 2 +- CRM/ACL/Page/EntityRole.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CRM/ACL/Page/ACL.php b/CRM/ACL/Page/ACL.php index 0e0da8ed2a..0131eee3d0 100644 --- a/CRM/ACL/Page/ACL.php +++ b/CRM/ACL/Page/ACL.php @@ -185,7 +185,7 @@ ORDER BY entity_id $acl[$dao->id]['is_active'] = $dao->is_active; if ($acl[$dao->id]['entity_id']) { - $acl[$dao->id]['entity'] = $roles[$acl[$dao->id]['entity_id']]; + $acl[$dao->id]['entity'] = CRM_Utils_Array::value($acl[$dao->id]['entity_id'], $roles); } else { $acl[$dao->id]['entity'] = ts('Everyone'); diff --git a/CRM/ACL/Page/EntityRole.php b/CRM/ACL/Page/EntityRole.php index 44dbff44ef..a98a4cac02 100644 --- a/CRM/ACL/Page/EntityRole.php +++ b/CRM/ACL/Page/EntityRole.php @@ -154,7 +154,7 @@ class CRM_ACL_Page_EntityRole extends CRM_Core_Page_Basic { $entityRoles[$dao->id] = array(); CRM_Core_DAO::storeValues($dao, $entityRoles[$dao->id]); - $entityRoles[$dao->id]['acl_role'] = $aclRoles[$dao->acl_role_id]; + $entityRoles[$dao->id]['acl_role'] = CRM_Utils_Array::value($dao->acl_role_id, $aclRoles); $entityRoles[$dao->id]['entity'] = $groups[$dao->entity_id]; // form all action links -- 2.25.1