From 800d92409e8b33e5e50e9ca56da12e33796c1d3a Mon Sep 17 00:00:00 2001 From: eileen Date: Wed, 22 May 2019 15:10:36 +1200 Subject: [PATCH] Add trailing comma to pseudoconstant array in DAOs Code change only includes sample - full regenerate will follow after merge --- CRM/ACL/DAO/ACL.php | 2 +- xml/templates/dao.tpl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CRM/ACL/DAO/ACL.php b/CRM/ACL/DAO/ACL.php index 3e59f9d2f9..28656e49e3 100644 --- a/CRM/ACL/DAO/ACL.php +++ b/CRM/ACL/DAO/ACL.php @@ -223,7 +223,7 @@ class CRM_ACL_DAO_ACL extends CRM_Core_DAO { ], 'pseudoconstant' => [ 'callback' => 'CRM_ACL_BAO_ACL::operation', - ] + ], ], 'object_table' => [ 'name' => 'object_table', diff --git a/xml/templates/dao.tpl b/xml/templates/dao.tpl index f03e96eef6..8e634226a3 100644 --- a/xml/templates/dao.tpl +++ b/xml/templates/dao.tpl @@ -154,7 +154,7 @@ class {$table.className} extends CRM_Core_DAO {ldelim} ), {/if} {if $field.pseudoconstant} - 'pseudoconstant' => {$field.pseudoconstant|@print_array} + 'pseudoconstant' => {$field.pseudoconstant|@print_array}, {/if} {* field.pseudoconstant *} ), {/foreach} {* table.fields *} ); -- 2.25.1