From 05c411cb669235ecdde0e2f5916447afe39464b2 Mon Sep 17 00:00:00 2001
From: Eileen McNaughton <emcnaughton@wikimedia.org>
Date: Wed, 5 Jan 2022 13:34:37 +1300
Subject: [PATCH] enotice fix (with default modifiers)

---
 CRM/ACL/Page/EntityRole.php           | 2 +-
 templates/CRM/ACL/Page/EntityRole.tpl | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CRM/ACL/Page/EntityRole.php b/CRM/ACL/Page/EntityRole.php
index 0e7b5b8097..3eea492223 100644
--- a/CRM/ACL/Page/EntityRole.php
+++ b/CRM/ACL/Page/EntityRole.php
@@ -124,7 +124,7 @@ class CRM_ACL_Page_EntityRole extends CRM_Core_Page_Basic {
     $groups = CRM_Core_PseudoConstant::staticGroup();
 
     while ($dao->fetch()) {
-      $entityRoles[$dao->id] = [];
+      $entityRoles[$dao->id] = ['class' => ''];
       CRM_Core_DAO::storeValues($dao, $entityRoles[$dao->id]);
 
       $entityRoles[$dao->id]['acl_role'] = $aclRoles[$dao->acl_role_id] ?? NULL;
diff --git a/templates/CRM/ACL/Page/EntityRole.tpl b/templates/CRM/ACL/Page/EntityRole.tpl
index 9d4fd90107..d76a8fc56f 100644
--- a/templates/CRM/ACL/Page/EntityRole.tpl
+++ b/templates/CRM/ACL/Page/EntityRole.tpl
@@ -31,7 +31,7 @@
         </thead>
         <tbody>
         {foreach from=$rows item=row}
-          <tr id="acl_role-{$row.id}" class="{cycle values="odd-row,even-row"}{if !empty($row.class)} {$row.class}{/if} crm-acl_entity_role crm-entity {if NOT $row.is_active} disabled{/if}">
+          <tr id="acl_role-{$row.id}" class="{cycle values="odd-row,even-row"} {$row.class} crm-acl_entity_role crm-entity {if NOT $row.is_active} disabled{/if}">
             <td class="crm-acl_entity_role-acl_role">{$row.acl_role}</td>
             <td class="crm-acl_entity_role-entity">{$row.entity}</td>
             <td class="crm-acl_entity_role-is_active" id="row_{$row.id}_status">{if $row.is_active eq 1} {ts}Yes{/ts} {else} {ts}No{/ts} {/if}</td>
-- 
2.25.1