From 9c7f8660b1f2ced92f3bbe6734ecd490df6e70d2 Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Tue, 29 Jun 2021 14:26:13 -0400
Subject: [PATCH] Fix often undefined variable $row.class in tpl tables

---
 templates/CRM/ACL/Page/ACL.tpl                        | 2 +-
 templates/CRM/ACL/Page/ACLBasic.tpl                   | 2 +-
 templates/CRM/ACL/Page/EntityRole.tpl                 | 2 +-
 templates/CRM/Activity/Form/Selector.tpl              | 2 +-
 templates/CRM/Activity/Selector/Activity.tpl          | 2 +-
 templates/CRM/Admin/Page/JobLog.tpl                   | 2 +-
 templates/CRM/Admin/Page/LabelFormats.tpl             | 2 +-
 templates/CRM/Admin/Page/LocationType.tpl             | 2 +-
 templates/CRM/Admin/Page/Mapping.tpl                  | 2 +-
 templates/CRM/Admin/Page/OptionGroup.tpl              | 2 +-
 templates/CRM/Admin/Page/ParticipantStatusType.tpl    | 2 +-
 templates/CRM/Admin/Page/PaymentProcessor.tpl         | 2 +-
 templates/CRM/Admin/Page/PaymentProcessorType.tpl     | 2 +-
 templates/CRM/Admin/Page/PdfFormats.tpl               | 2 +-
 templates/CRM/Admin/Page/PreferencesDate.tpl          | 2 +-
 templates/CRM/Admin/Page/RelationshipType.tpl         | 2 +-
 templates/CRM/Admin/Page/Reminders.tpl                | 2 +-
 templates/CRM/Badge/Page/Layout.tpl                   | 2 +-
 templates/CRM/Contribute/Page/ContributionType.tpl    | 2 +-
 templates/CRM/Contribute/Page/ManagePremiums.tpl      | 2 +-
 templates/CRM/Contribute/Page/PcpUserDashboard.tpl    | 2 +-
 templates/CRM/Contribute/Page/Premium.tpl             | 2 +-
 templates/CRM/Custom/Page/Group.tpl                   | 2 +-
 templates/CRM/Event/Page/List.tpl                     | 2 +-
 templates/CRM/Financial/Page/FinancialTypeAccount.tpl | 2 +-
 templates/CRM/Mailing/Page/Component.tpl              | 2 +-
 templates/CRM/Member/Page/MembershipType.tpl          | 2 +-
 templates/CRM/Price/Page/Field.tpl                    | 2 +-
 templates/CRM/Price/Page/Option.tpl                   | 2 +-
 templates/CRM/Price/Page/Set.tpl                      | 2 +-
 templates/CRM/SMS/Page/Provider.tpl                   | 2 +-
 templates/CRM/UF/Page/Field.tpl                       | 2 +-
 templates/CRM/UF/Page/Group.tpl                       | 4 ++--
 33 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/templates/CRM/ACL/Page/ACL.tpl b/templates/CRM/ACL/Page/ACL.tpl
index d1e07327ce..302c97a06c 100644
--- a/templates/CRM/ACL/Page/ACL.tpl
+++ b/templates/CRM/ACL/Page/ACL.tpl
@@ -35,7 +35,7 @@
             </thead>
             <tbody>
             {foreach from=$rows item=row key=aclID}
-              <tr id="acl-{$aclID}" class="{cycle values="odd-row,even-row"} {$row.class} crm-acl crm-entity {if NOT $row.is_active} disabled{/if}">
+              <tr id="acl-{$aclID}" class="{cycle values="odd-row,even-row"}{if !empty($row.class)} {$row.class}{/if} crm-acl crm-entity {if NOT $row.is_active} disabled{/if}">
                 <td class="crm-acl-entity">{$row.entity}</td>
                 <td class="crm-acl-operation" >{$row.operation}</td>
                 <td class="crm-acl-object_name">{$row.object_name}</td>
diff --git a/templates/CRM/ACL/Page/ACLBasic.tpl b/templates/CRM/ACL/Page/ACLBasic.tpl
index 8ecb0eee8a..f747719e1e 100644
--- a/templates/CRM/ACL/Page/ACLBasic.tpl
+++ b/templates/CRM/ACL/Page/ACLBasic.tpl
@@ -28,7 +28,7 @@
             <th></th>
         </tr>
         {foreach from=$rows item=row}
-        <tr class="{cycle values="odd-row,even-row"} {$row.class}{if NOT $row.is_active} disabled{/if}">
+        <tr class="{cycle values="odd-row,even-row"}{if !empty($row.class)} {$row.class}{/if}{if NOT $row.is_active} disabled{/if}">
           <td>{$row.entity}</td>
           <td>{$row.object_table}</td>
           <td>{$row.action}</td>
diff --git a/templates/CRM/ACL/Page/EntityRole.tpl b/templates/CRM/ACL/Page/EntityRole.tpl
index d76a8fc56f..9d4fd90107 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"} {$row.class} 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"}{if !empty($row.class)} {$row.class}{/if} 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>
diff --git a/templates/CRM/Activity/Form/Selector.tpl b/templates/CRM/Activity/Form/Selector.tpl
index ab1e4f6e10..c8ac5d4ed1 100644
--- a/templates/CRM/Activity/Form/Selector.tpl
+++ b/templates/CRM/Activity/Form/Selector.tpl
@@ -35,7 +35,7 @@
 
   {counter start=0 skip=1 print=false}
   {foreach from=$rows item=row}
-  <tr id='rowid{$row.activity_id}' class="{cycle values="odd-row,even-row"} {$row.class}">
+  <tr id='rowid{$row.activity_id}' class="{cycle values="odd-row,even-row"}{if !empty($row.class)} {$row.class}{/if}">
   {if !$single }
         {if $context eq 'Search' }
           {assign var=cbName value=$row.checkbox}
diff --git a/templates/CRM/Activity/Selector/Activity.tpl b/templates/CRM/Activity/Selector/Activity.tpl
index 2d866e5b40..ce706a7c7a 100644
--- a/templates/CRM/Activity/Selector/Activity.tpl
+++ b/templates/CRM/Activity/Selector/Activity.tpl
@@ -34,7 +34,7 @@
 
       {counter start=0 skip=1 print=false}
       {foreach from=$rows item=row}
-      <tr class="{cycle values="odd-row,even-row"} {$row.class} crm-activity crm-activity_status-{$row.activity_status_id} crm-activity-type_{$row.activity_type_id}" id="crm-activity_{$row.activity_id}">
+      <tr class="{cycle values="odd-row,even-row"}{if !empty($row.class)} {$row.class}{/if} crm-activity crm-activity_status-{$row.activity_status_id} crm-activity-type_{$row.activity_type_id}" id="crm-activity_{$row.activity_id}">
         <td class="crm-activity-type crm-activity-type_{$row.activity_type_id}">{$row.activity_type}</td>
         <td class="crm-activity-subject">{$row.subject}</td>
         <td class="crm-activity-source_contact_name">
diff --git a/templates/CRM/Admin/Page/JobLog.tpl b/templates/CRM/Admin/Page/JobLog.tpl
index 5e93685a6a..4199bade94 100644
--- a/templates/CRM/Admin/Page/JobLog.tpl
+++ b/templates/CRM/Admin/Page/JobLog.tpl
@@ -36,7 +36,7 @@
             <th >{ts}Command{/ts}/{ts}Job Status{/ts}/{ts}Additional Information{/ts}</th>
         </tr>
         {foreach from=$rows item=row}
-        <tr id="job-{$row.id}" class="crm-entity {cycle values="odd-row,even-row"} {$row.class}">
+        <tr id="job-{$row.id}" class="crm-entity {cycle values="odd-row,even-row"}{if !empty($row.class)} {$row.class}{/if}">
             <td class="crm-joblog-run_datetime">{$row.run_time}</td>
             <td class="crm-joblog-name">{$row.name}</td>
             <td class="crm-joblog-details">
diff --git a/templates/CRM/Admin/Page/LabelFormats.tpl b/templates/CRM/Admin/Page/LabelFormats.tpl
index e2ddf676bd..4a4142f5f8 100644
--- a/templates/CRM/Admin/Page/LabelFormats.tpl
+++ b/templates/CRM/Admin/Page/LabelFormats.tpl
@@ -48,7 +48,7 @@
           </tr>
           </thead>
           {foreach from=$rows item=row}
-            <tr id="row_{$row.id}" class="crm-labelFormat {cycle values="odd-row,even-row"} {$row.class}">
+            <tr id="row_{$row.id}" class="crm-labelFormat {cycle values="odd-row,even-row"}{if !empty($row.class)} {$row.class}{/if}">
               <td class="crm-labelFormat-name">{$row.label}</td>
               <td class="crm-labelFormat-name">{$row.groupName}</td>
               <td class="crm-labelFormat-order nowrap">{$row.weight}</td>
diff --git a/templates/CRM/Admin/Page/LocationType.tpl b/templates/CRM/Admin/Page/LocationType.tpl
index 9802054b33..80e8b716aa 100644
--- a/templates/CRM/Admin/Page/LocationType.tpl
+++ b/templates/CRM/Admin/Page/LocationType.tpl
@@ -34,7 +34,7 @@
       </tr>
     </thead>
     {foreach from=$rows item=row}
-    <tr id="location_type-{$row.id}"  data-action="setvalue" class="{cycle values="odd-row,even-row"} {$row.class} crm-entity {if NOT $row.is_active} disabled{/if}">
+    <tr id="location_type-{$row.id}"  data-action="setvalue" class="{cycle values="odd-row,even-row"}{if !empty($row.class)} {$row.class}{/if} crm-entity {if NOT $row.is_active} disabled{/if}">
         <td class="crmf-name">{$row.name}</td>
         <td class="crmf-display_name crm-editable">{$row.display_name}</td>
         <td class="crmf-vcard_name crm-editable">{if !empty($row.vcard_name)}{$row.vcard_name}{/if}</td>
diff --git a/templates/CRM/Admin/Page/Mapping.tpl b/templates/CRM/Admin/Page/Mapping.tpl
index 8f34ebc4a5..d7b3ba0538 100644
--- a/templates/CRM/Admin/Page/Mapping.tpl
+++ b/templates/CRM/Admin/Page/Mapping.tpl
@@ -27,7 +27,7 @@
               <th></th>
             </tr>
             {foreach from=$rows item=row}
-            <tr class="{cycle values="odd-row,even-row"} {$row.class} crm-mapping">
+            <tr class="{cycle values="odd-row,even-row"}{if !empty($row.class)} {$row.class}{/if} crm-mapping">
                 <td class="crm-mapping-name">{$row.name}</td>
                 <td class="crm-mapping-description">{$row.description}</td>
                 <td class="crm-mapping-mapping_type">{$row.mapping_type}</td>
diff --git a/templates/CRM/Admin/Page/OptionGroup.tpl b/templates/CRM/Admin/Page/OptionGroup.tpl
index ca9abf7251..1d72cb849c 100644
--- a/templates/CRM/Admin/Page/OptionGroup.tpl
+++ b/templates/CRM/Admin/Page/OptionGroup.tpl
@@ -39,7 +39,7 @@
           <th></th>
         </tr>
         {foreach from=$rows item=row}
-        <tr id="optionGroup-{$row.id}" class="crm-entity {cycle values="odd-row,even-row"} {$row.class}{if NOT $row.is_active} disabled{/if}">
+        <tr id="optionGroup-{$row.id}" class="crm-entity {cycle values="odd-row,even-row"}{if !empty($row.class)} {$row.class}{/if}{if NOT $row.is_active} disabled{/if}">
           <td class="crm-admin-optionGroup-title">{if $row.title}{$row.title}{else}( {ts}none{/ts} ){/if}</td>
           <td class="crm-admin-optionGroup-name">{$row.name}</td>
           <td class="crm-admin-optionGroup-is_reserved">{if $row.is_reserved eq 1} {ts}Yes{/ts} {else} {ts}No{/ts} {/if}</td>
diff --git a/templates/CRM/Admin/Page/ParticipantStatusType.tpl b/templates/CRM/Admin/Page/ParticipantStatusType.tpl
index 273d3b728d..a32d84cd41 100644
--- a/templates/CRM/Admin/Page/ParticipantStatusType.tpl
+++ b/templates/CRM/Admin/Page/ParticipantStatusType.tpl
@@ -29,7 +29,7 @@
         <th></th>
       </thead>
       {foreach from=$rows item=row}
-       <tr id="participant_status_type-{$row.id}" class="crm-entity crm-participant_{$row.id} {cycle values="odd-row,even-row"} {$row.class}{if NOT $row.is_active} disabled{/if}">
+       <tr id="participant_status_type-{$row.id}" class="crm-entity crm-participant_{$row.id} {cycle values="odd-row,even-row"}{if !empty($row.class)} {$row.class}{/if}{if NOT $row.is_active} disabled{/if}">
           <td class="crmf-label crm-editable" data-field="label">{$row.label}</td>
           <td class="crmf-name">{$row.name} ({$row.id})</td>
           <td class="crmf-class {if empty($row.is_reserved)} crm-editable {/if}" data-type="select">{$row.class}</td>
diff --git a/templates/CRM/Admin/Page/PaymentProcessor.tpl b/templates/CRM/Admin/Page/PaymentProcessor.tpl
index 2323dffa9c..4e12846cfd 100644
--- a/templates/CRM/Admin/Page/PaymentProcessor.tpl
+++ b/templates/CRM/Admin/Page/PaymentProcessor.tpl
@@ -34,7 +34,7 @@
             <th></th>
         </tr>
         {foreach from=$rows item=row}
-        <tr id="payment_processor-{$row.id}" class="crm-entity {cycle values="odd-row,even-row"} {$row.class}{if NOT $row.is_active} disabled{/if}">
+        <tr id="payment_processor-{$row.id}" class="crm-entity {cycle values="odd-row,even-row"}{if !empty($row.class)} {$row.class}{/if}{if NOT $row.is_active} disabled{/if}">
             <td class="crmf-id center">{$row.id}</td>
             <td class="crmf-test_id center">{$row.test_id}</td>
             <td class="crmf-name">{$row.name}</td>
diff --git a/templates/CRM/Admin/Page/PaymentProcessorType.tpl b/templates/CRM/Admin/Page/PaymentProcessorType.tpl
index 9c1f9b5171..2340f7e653 100644
--- a/templates/CRM/Admin/Page/PaymentProcessorType.tpl
+++ b/templates/CRM/Admin/Page/PaymentProcessorType.tpl
@@ -31,7 +31,7 @@
             <th></th>
         </tr>
         {foreach from=$rows item=row}
-        <tr id="paymentProcessorType-{$row.id}" class="{cycle values="odd-row,even-row"} {$row.class} crm-entity {if NOT $row.is_active} disabled{/if}">
+        <tr id="paymentProcessorType-{$row.id}" class="{cycle values="odd-row,even-row"}{if !empty($row.class)} {$row.class}{/if} crm-entity {if NOT $row.is_active} disabled{/if}">
           <td class="crm-paymentProcessorType-name">{$row.name}</td>
           <td class="crm-paymentProcessorType-title crm-editable" data-field="title">{$row.title}</td>
             <td class="crm-paymentProcessorType-description">{if isset($row.description)}{$row.description}{/if}</td>
diff --git a/templates/CRM/Admin/Page/PdfFormats.tpl b/templates/CRM/Admin/Page/PdfFormats.tpl
index 063a160ff1..b715a07bca 100644
--- a/templates/CRM/Admin/Page/PdfFormats.tpl
+++ b/templates/CRM/Admin/Page/PdfFormats.tpl
@@ -47,7 +47,7 @@
         </tr>
         </thead>
         {foreach from=$rows item=row}
-        <tr id="row_{$row.id}" class="crm-pdfFormat {cycle values="odd-row,even-row"} {$row.class}">
+        <tr id="row_{$row.id}" class="crm-pdfFormat {cycle values="odd-row,even-row"}{if !empty($row.class)} {$row.class}{/if}">
             <td class="crm-pdfFormat-name">{$row.name}</td>
             <td class="crm-pdfFormat-description">{$row.description}</td>
             <td class="crm-pdfFormat-is_default">{icon condition=$row.is_default}{ts}Default{/ts}{/icon}&nbsp;</td>
diff --git a/templates/CRM/Admin/Page/PreferencesDate.tpl b/templates/CRM/Admin/Page/PreferencesDate.tpl
index 96f806dbd7..aa39aefd0a 100644
--- a/templates/CRM/Admin/Page/PreferencesDate.tpl
+++ b/templates/CRM/Admin/Page/PreferencesDate.tpl
@@ -25,7 +25,7 @@
                 <th ></th>
             </tr>
             {foreach from=$rows item=row}
-            <tr class="{cycle values="odd-row,even-row"} {$row.class}">
+            <tr class="{cycle values="odd-row,even-row"}{if !empty($row.class)} {$row.class}{/if}">
                 <td>{$row.name}</td>
                 <td>{$row.description}</td>
                 <td class="nowrap">{if !$row.date_format}{ts}Default{/ts}{else}{$row.date_format}{/if}</td>
diff --git a/templates/CRM/Admin/Page/RelationshipType.tpl b/templates/CRM/Admin/Page/RelationshipType.tpl
index 974033dba4..f1f5c79bd5 100644
--- a/templates/CRM/Admin/Page/RelationshipType.tpl
+++ b/templates/CRM/Admin/Page/RelationshipType.tpl
@@ -44,7 +44,7 @@
         </tr>
         </thead>
         {foreach from=$rows item=row}
-        <tr id="relationship_type-{$row.id}" class="crm-entity {cycle values="odd-row,even-row"} {$row.class}{if NOT $row.is_active} disabled{/if} crm-relationship">
+        <tr id="relationship_type-{$row.id}" class="crm-entity {cycle values="odd-row,even-row"}{if !empty($row.class)} {$row.class}{/if}{if NOT $row.is_active} disabled{/if} crm-relationship">
             <td class="crm-relationship-label_a_b crm-editable" data-field="label_a_b">{$row.label_a_b}</td>
             <td class="crm-relationship-label_b_a crm-editable" data-field="label_b_a">{$row.label_b_a}</td>
             <td class="crm-relationship-contact_type_a_display">
diff --git a/templates/CRM/Admin/Page/Reminders.tpl b/templates/CRM/Admin/Page/Reminders.tpl
index 39b11de446..3a08352e62 100644
--- a/templates/CRM/Admin/Page/Reminders.tpl
+++ b/templates/CRM/Admin/Page/Reminders.tpl
@@ -28,7 +28,7 @@
     </thead>
     {if $rows and is_array($rows)}
       {foreach from=$rows item=row}
-        <tr id="action_schedule-{$row.id}" class="crm-entity {cycle values="odd-row,even-row"} {$row.class}{if NOT $row.is_active} disabled{/if}">
+        <tr id="action_schedule-{$row.id}" class="crm-entity {cycle values="odd-row,even-row"}{if !empty($row.class)} {$row.class}{/if}{if NOT $row.is_active} disabled{/if}">
           <td class="crm-scheduleReminders-title crm-editable" data-field="title">{$row.title}</td>
           <td class="crm-scheduleReminders-value">{$row.entity} - {$row.value}</td>
           <td class="crm-scheduleReminders-description">{if $row.absolute_date}{$row.absolute_date|crmDate}{else}{$row.start_action_offset}&nbsp;{$row.start_action_unit}{if $row.start_action_offset > 1}{ts}(s){/ts}{/if}&nbsp;{$row.start_action_condition}&nbsp;{$row.entityDate}{/if}</td>
diff --git a/templates/CRM/Badge/Page/Layout.tpl b/templates/CRM/Badge/Page/Layout.tpl
index a69b549b34..88bca86ec1 100644
--- a/templates/CRM/Badge/Page/Layout.tpl
+++ b/templates/CRM/Badge/Page/Layout.tpl
@@ -32,7 +32,7 @@
           </tr>
           </thead>
           {foreach from=$rows item=row}
-            <tr id="print_label-{$row.id}" class="crm-entity {cycle values="odd-row,even-row"} {$row.class} crm-badge-layout {if NOT $row.is_active} disabled{/if}">
+            <tr id="print_label-{$row.id}" class="crm-entity {cycle values="odd-row,even-row"}{if !empty($row.class)} {$row.class}{/if} crm-badge-layout {if NOT $row.is_active} disabled{/if}">
               <td class="crm-badge-layout-title crm-editable" data-field="title">{$row.title}</td>
               <td class="crm-badge-layout-description crm-editable" data-field="description" data-type="textarea">{$row.description}</td>
               <td id="row_{$row.id}_status" class="crm-badge-layout-is_active">
diff --git a/templates/CRM/Contribute/Page/ContributionType.tpl b/templates/CRM/Contribute/Page/ContributionType.tpl
index 25103e624d..8a82454224 100644
--- a/templates/CRM/Contribute/Page/ContributionType.tpl
+++ b/templates/CRM/Contribute/Page/ContributionType.tpl
@@ -32,7 +32,7 @@
             <th></th>
           </thead>
          {foreach from=$rows item=row}
-        <tr id="contribution_type-{$row.id}" class="crm-entity {cycle values="odd-row,even-row"} {$row.class}{if NOT $row.is_active} disabled{/if}">
+        <tr id="contribution_type-{$row.id}" class="crm-entity {cycle values="odd-row,even-row"}{if !empty($row.class)} {$row.class}{/if}{if NOT $row.is_active} disabled{/if}">
           <td>{$row.name}</td>
           <td>{$row.description}</td>
               <td>{$row.accounting_code}</td>
diff --git a/templates/CRM/Contribute/Page/ManagePremiums.tpl b/templates/CRM/Contribute/Page/ManagePremiums.tpl
index 6f2d632329..f80c43e5dc 100644
--- a/templates/CRM/Contribute/Page/ManagePremiums.tpl
+++ b/templates/CRM/Contribute/Page/ManagePremiums.tpl
@@ -43,7 +43,7 @@
            </tr>
           </thead>
         {foreach from=$rows item=row}
-        <tr id="product-{$row.id}" class="crm-entity {cycle values="odd-row,even-row"} {$row.class}{if NOT $row.is_active} disabled{/if}">
+        <tr id="product-{$row.id}" class="crm-entity {cycle values="odd-row,even-row"}{if !empty($row.class)} {$row.class}{/if}{if NOT $row.is_active} disabled{/if}">
           <td class="crm-contribution-form-block-name crm-editable" data-field="name">{$row.name}</td>
           <td class="crm-contribution-form-block-sku crm-editable" data-field="sku">{$row.sku}</td>
           <td class="crm-contribution-form-block-price">{$row.price|crmMoney}</td>
diff --git a/templates/CRM/Contribute/Page/PcpUserDashboard.tpl b/templates/CRM/Contribute/Page/PcpUserDashboard.tpl
index 60c4752846..23c59e8283 100644
--- a/templates/CRM/Contribute/Page/PcpUserDashboard.tpl
+++ b/templates/CRM/Contribute/Page/PcpUserDashboard.tpl
@@ -25,7 +25,7 @@
   </tr>
 
   {foreach from=$pcpInfo item=row}
-  <tr class="{cycle values="odd-row,even-row"} {$row.class}">
+  <tr class="{cycle values="odd-row,even-row"}{if !empty($row.class)} {$row.class}{/if}">
         <td class="bold"><a href="{crmURL p='civicrm/pcp/info' q="reset=1&id=`$row.pcpId`" a=1}" title="{ts}Preview your Personal Campaign Page{/ts}">{$row.pcpTitle}</a></td>
         <td>{$row.pageTitle}</td>
         <td>{if $row.end_date}{$row.end_date|truncate:10:''|crmDate}{else}({ts}ongoing{/ts}){/if}</td>
diff --git a/templates/CRM/Contribute/Page/Premium.tpl b/templates/CRM/Contribute/Page/Premium.tpl
index 5dd5aa9157..18a30af042 100644
--- a/templates/CRM/Contribute/Page/Premium.tpl
+++ b/templates/CRM/Contribute/Page/Premium.tpl
@@ -27,7 +27,7 @@
             <th></th>
         </tr>
         {foreach from=$rows item=row}
-        <tr class="{cycle values='odd-row,even-row'} {$row.class}{if NOT $row.is_active} disabled{/if}">
+        <tr class="{cycle values='odd-row,even-row'}{if !empty($row.class)} {$row.class}{/if}{if NOT $row.is_active} disabled{/if}">
           <td class="crm-contribution-form-block-product_name">{$row.product_name}</td>
           <td class="crm-contribution-form-block-sku">{$row.sku}</td>
           <td class="crm-contribution-form-block-price">{$row.price|crmMoney}</td>
diff --git a/templates/CRM/Custom/Page/Group.tpl b/templates/CRM/Custom/Page/Group.tpl
index d430a99f3b..2b2b7e6b5b 100644
--- a/templates/CRM/Custom/Page/Group.tpl
+++ b/templates/CRM/Custom/Page/Group.tpl
@@ -40,7 +40,7 @@
         </thead>
         <tbody>
         {foreach from=$rows item=row}
-        <tr id="CustomGroup-{$row.id}" data-action="setvalue" class="crm-entity {cycle values="odd-row,even-row"} {$row.class}{if NOT $row.is_active} disabled{/if}">
+        <tr id="CustomGroup-{$row.id}" data-action="setvalue" class="crm-entity {cycle values="odd-row,even-row"}{if !empty($row.class)} {$row.class}{/if}{if NOT $row.is_active} disabled{/if}">
           <td>{$row.id}</td>
           <td class="crmf-title crm-editable">{$row.title}</td>
           <td id="row_{$row.id}_status">{if $row.is_active eq 1} {ts}Yes{/ts} {else} {ts}No{/ts} {/if}</td>
diff --git a/templates/CRM/Event/Page/List.tpl b/templates/CRM/Event/Page/List.tpl
index e4578b1d49..50da60fd8b 100644
--- a/templates/CRM/Event/Page/List.tpl
+++ b/templates/CRM/Event/Page/List.tpl
@@ -26,7 +26,7 @@
     </tr>
     </thead>
     {foreach from=$events key=uid item=event}
-      <tr class="{cycle values="odd-row,even-row"} {$row.class}">
+      <tr class="{cycle values="odd-row,even-row"}{if !empty($row.class)} {$row.class}{/if}">
         <td><a href="{crmURL p='civicrm/event/info' q="reset=1&id=`$event.event_id`"}" title="{ts}read more{/ts}"><strong>{$event.title}</strong></a></td>
         <td>{if $event.summary}{$event.summary|purify} (<a href="{crmURL p='civicrm/event/info' q="reset=1&id=`$event.event_id`"}" title="{ts}details...{/ts}">{ts}read more{/ts}...</a>){else}&nbsp;{/if}</td>
         <td class="nowrap" data-order="{$event.start_date|crmDate:'%Y-%m-%d'}">
diff --git a/templates/CRM/Financial/Page/FinancialTypeAccount.tpl b/templates/CRM/Financial/Page/FinancialTypeAccount.tpl
index 5bc7943483..c3af8775a1 100644
--- a/templates/CRM/Financial/Page/FinancialTypeAccount.tpl
+++ b/templates/CRM/Financial/Page/FinancialTypeAccount.tpl
@@ -33,7 +33,7 @@
           <th></th>
         </thead>
         {foreach from=$rows item=row}
-        <tr id="row_{$row.id}"class="{cycle values="odd-row,even-row"} {$row.class}{if NOT $row.is_active} disabled{/if}">
+        <tr id="row_{$row.id}"class="{cycle values="odd-row,even-row"}{if !empty($row.class)} {$row.class}{/if}{if NOT $row.is_active} disabled{/if}">
           <td>{$row.account_relationship}</td>
           <td>{$row.financial_account}</td>
           <td>{$row.accounting_code}</td>
diff --git a/templates/CRM/Mailing/Page/Component.tpl b/templates/CRM/Mailing/Page/Component.tpl
index ee7b47880d..ccc1db657f 100644
--- a/templates/CRM/Mailing/Page/Component.tpl
+++ b/templates/CRM/Mailing/Page/Component.tpl
@@ -29,7 +29,7 @@
         <th></th>
         </thead>
        {foreach from=$rows item=row}
-         <tr id="mailing_component-{$row.id}" class="crm-entity {cycle values="odd-row,even-row"} {$row.class}{if NOT $row.is_active} disabled{/if}">
+         <tr id="mailing_component-{$row.id}" class="crm-entity {cycle values="odd-row,even-row"}{if !empty($row.class)} {$row.class}{/if}{if NOT $row.is_active} disabled{/if}">
            <td class="crm-editable" data-field="name">{$row.name}</td>
            <td>{$row.component_type}</td>
            <td>{$row.subject}</td>
diff --git a/templates/CRM/Member/Page/MembershipType.tpl b/templates/CRM/Member/Page/MembershipType.tpl
index 04dc38cc7d..74fff6a6f4 100644
--- a/templates/CRM/Member/Page/MembershipType.tpl
+++ b/templates/CRM/Member/Page/MembershipType.tpl
@@ -37,7 +37,7 @@
       </tr>
       </thead>
       {foreach from=$rows item=row}
-        <tr id="membership_type-{$row.id}" class="crm-entity {cycle values='odd-row,even-row'} {$row.class} crm-membership-type {if NOT $row.is_active} disabled{/if}">
+        <tr id="membership_type-{$row.id}" class="crm-entity {cycle values='odd-row,even-row'}{if !empty($row.class)} {$row.class}{/if} crm-membership-type {if NOT $row.is_active} disabled{/if}">
           <td class="crmf-name crm-editable" data-field="name">{$row.name}</td>
           <td class="crmf-period_type crm-editable" data-type="select">{$row.period_type}</td>
           <td class="crmf-fixed_period_start_day">{$row.fixed_period_start_day}</td>
diff --git a/templates/CRM/Price/Page/Field.tpl b/templates/CRM/Price/Page/Field.tpl
index 665ab2add5..9b6153ec04 100644
--- a/templates/CRM/Price/Page/Field.tpl
+++ b/templates/CRM/Price/Page/Field.tpl
@@ -58,7 +58,7 @@
       </tr>
       </thead>
       {foreach from=$priceField key=fid item=row}
-      <tr id="price_field-{$row.id}" class="crm-entity {cycle values="odd-row,even-row"} {$row.class}{if NOT $row.is_active} disabled{/if}">
+      <tr id="price_field-{$row.id}" class="crm-entity {cycle values="odd-row,even-row"}{if !empty($row.class)} {$row.class}{/if}{if NOT $row.is_active} disabled{/if}">
         <td class="crm-editable" data-field="label">{$row.label}</td>
         <td>{$row.html_type_display}</td>
         <td class="nowrap">{$row.weight}</td>
diff --git a/templates/CRM/Price/Page/Option.tpl b/templates/CRM/Price/Page/Option.tpl
index 0f4a5b079a..7889a67cd2 100644
--- a/templates/CRM/Price/Page/Option.tpl
+++ b/templates/CRM/Price/Page/Option.tpl
@@ -58,7 +58,7 @@
           </thead>
           <tbody>
           {foreach from=$customOption item=row}
-            <tr id="price_field_value-{$row.id}" class="crm-entity {cycle values="odd-row,even-row"} {$row.class}{if NOT $row.is_active} disabled{/if}">
+            <tr id="price_field_value-{$row.id}" class="crm-entity {cycle values="odd-row,even-row"}{if !empty($row.class)} {$row.class}{/if}{if NOT $row.is_active} disabled{/if}">
               <td class="crm-price-option-label crm-editable" data-field="label">{$row.label}</td>
               <td class="crm-price-option-value">{$row.amount|crmMoney}</td>
               <td class="crm-price-option-non-deductible-amount">{$row.non_deductible_amount|crmMoney}</td>
diff --git a/templates/CRM/Price/Page/Set.tpl b/templates/CRM/Price/Page/Set.tpl
index e145781fe9..4b90dce429 100644
--- a/templates/CRM/Price/Page/Set.tpl
+++ b/templates/CRM/Price/Page/Set.tpl
@@ -48,7 +48,7 @@
         </tr>
         </thead>
         {foreach from=$rows item=row}
-      <tr id="price_set-{$row.id}" class="crm-entity crm-price-set_{$row.id} {cycle values="even-row,odd-row"} {$row.class}{if NOT $row.is_active} disabled{/if}">
+      <tr id="price_set-{$row.id}" class="crm-entity crm-price-set_{$row.id} {cycle values="even-row,odd-row"}{if !empty($row.class)} {$row.class}{/if}{if NOT $row.is_active} disabled{/if}">
           <td class="crmf-title crm-editable">{$row.title}</td>
           <td class="crmf-extends">{$row.extends}</td>
           <td class="crmf-is_active">{if $row.is_active eq 1} {ts}Yes{/ts} {else} {ts}No{/ts} {/if}</td>
diff --git a/templates/CRM/SMS/Page/Provider.tpl b/templates/CRM/SMS/Page/Provider.tpl
index 9a9deac2c2..3ebf7393f7 100644
--- a/templates/CRM/SMS/Page/Provider.tpl
+++ b/templates/CRM/SMS/Page/Provider.tpl
@@ -29,7 +29,7 @@
             <th >{ts}Action{/ts}</th>
         </tr>
         {foreach from=$rows item=row}
-        <tr id="sms_provider-{$row.id}" class="crm-entity {cycle values="odd-row,even-row"} {$row.class}{if NOT $row.is_active} disabled{/if}">
+        <tr id="sms_provider-{$row.id}" class="crm-entity {cycle values="odd-row,even-row"}{if !empty($row.class)} {$row.class}{/if}{if NOT $row.is_active} disabled{/if}">
             <td class="crm-provider-name"><strong>{$row.name}</strong> ({$row.title})<br/>
                 {ts}API Type:{/ts} {$row.api_type}<br/>
                 {ts}API Url:{/ts} {$row.api_url}<br/>
diff --git a/templates/CRM/UF/Page/Field.tpl b/templates/CRM/UF/Page/Field.tpl
index 75229e7bc6..64f0b23ab2 100644
--- a/templates/CRM/UF/Page/Field.tpl
+++ b/templates/CRM/UF/Page/Field.tpl
@@ -42,7 +42,7 @@
             </tr>
             </thead>
             {foreach from=$ufField item=row}
-            <tr id="UFField-{$row.id}" data-action="setvalue" class="crm-entity {cycle values="odd-row,even-row"} {$row.class}{if NOT $row.is_active} disabled{/if}">
+            <tr id="UFField-{$row.id}" data-action="setvalue" class="crm-entity {cycle values="odd-row,even-row"}{if !empty($row.class)} {$row.class}{/if}{if NOT $row.is_active} disabled{/if}">
                 <td><span class="crmf-label crm-editable">{$row.label}</span>({$row.field_type})</td>
                 {if in_array("Profile",$otherModules) or in_array("Search Profile",$otherModules) }
                 <td class="crm-editable crmf-visibility" data-type="select">{$row.visibility_display}</td>
diff --git a/templates/CRM/UF/Page/Group.tpl b/templates/CRM/UF/Page/Group.tpl
index d77ffdede5..4fcc269f5d 100644
--- a/templates/CRM/UF/Page/Group.tpl
+++ b/templates/CRM/UF/Page/Group.tpl
@@ -69,7 +69,7 @@
             <tbody>
             {foreach from=$rows item=row}
             {if !$row.is_reserved }
-              <tr id="UFGroup-{$row.id}" data-action="setvalue" class="crm-entity {$row.class}{if NOT $row.is_active} disabled{/if}">
+              <tr id="UFGroup-{$row.id}" data-action="setvalue" class="crm-entity{if !empty($row.class)} {$row.class}{/if}{if NOT $row.is_active} disabled{/if}">
                 <td class="crmf-title crm-editable">{$row.title}</td>
                 <td class="crmf-frontend_title crm-editable">{$row.frontend_title}</td>
                 <td>
@@ -114,7 +114,7 @@
             <tbody>
             {foreach from=$rows item=row}
             {if $row.is_reserved}
-              <tr id="UFGroup-{$row.id}" class="crm-entity {$row.class}{if NOT $row.is_active} disabled{/if}">
+              <tr id="UFGroup-{$row.id}" class="crm-entity{if !empty($row.class)} {$row.class}{/if}{if NOT $row.is_active} disabled{/if}">
                 <td>{$row.title}</td>
                 <td>{$row.frontend_title}</td>
                 <td>
-- 
2.25.1