Merge pull request #15679 from eileenmcnaughton/script_fee

[civicrm-core.git] / xml / templates / dao.tpl

diff --git a/xml/templates/dao.tpl b/xml/templates/dao.tpl
index 8e634226a353ef342a5d97859825bc48121c11dd..b9cebe59abb6bce3025e795602d547f739ce6646 100644 (file)
--- a/xml/templates/dao.tpl
+++ b/xml/templates/dao.tpl
@@ -30,7 +30,7 @@ class {$table.className} extends CRM_Core_DAO {ldelim}
 {foreach from=$table.fields item=field}
     /**
 {if $field.comment}
-     * {$field.comment}
+     * {$field.comment|regex_replace:"/\n[ ]*/":"\n* "}
      *
 {/if}
      * @var {$field.phpType}
@@ -128,8 +128,8 @@ class {$table.className} extends CRM_Core_DAO {ldelim}
 {if $field.rule}
                       'rule'      => '{$field.rule}',
 {/if} {* field.rule *}
-{if $field.protected}
-                      'protected'      => '{$field.protected}',
+{if !empty($field.permission)}
+                      'permission'      => {$field.permission|@print_array},
 {/if}
 {if $field.default || $field.default === '0'}
                          'default'   => '{if ($field.default[0]=="'" or $field.default[0]=='"')}{$field.default|substring:1:-1}{else}{$field.default}{/if}',
@@ -146,6 +146,9 @@ class {$table.className} extends CRM_Core_DAO {ldelim}
 {if $field.serialize}
   'serialize' => self::SERIALIZE_{$field.serialize|strtoupper},
 {/if}
+{if $field.uniqueTitle}
+  'unique_title' => {$tsFunctionName}('{$field.uniqueTitle}'),
+{/if}
 {if $field.html}
   'html' => array(
   {foreach from=$field.html item=val key=key}