Skip to content

Commit

Permalink
Merge branch 'hotfix'
Browse files Browse the repository at this point in the history
  • Loading branch information
jimyhuang committed Sep 12, 2024
2 parents c91d971 + 12dbb4e commit 1d39d41
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 2 deletions.
2 changes: 1 addition & 1 deletion CRM/Core/BAO/UFGroup.php
Original file line number Diff line number Diff line change
Expand Up @@ -897,7 +897,7 @@ public static function getValues($cid, &$fields, &$values, $searchable = TRUE, $
}
elseif ($name == 'legal_identifier' || $name == 'custom_'.$customSerial) {
$params[$index] = $details->$name;
$values[$index] = $maskType ? CRM_Utils_String::mask($details->$name) : $details->$name;
$values[$index] = $maskType ? CRM_Utils_String::mask($details->$name, 'custom', 1, 0) : $details->$name;
}
else {
$processed = FALSE;
Expand Down
8 changes: 7 additions & 1 deletion templates/CRM/Event/Form/ManageEvent/EventInfo.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -71,9 +71,15 @@
<tr class="crm-event-manage-eventinfo-form-block-participant_listing_id">
<td class="label">{$form.participant_listing_id.label}</td>
<td>{$form.participant_listing_id.html}<br />
<span class="description"> {ts}To allow users to see a listing of participants, set this field to 'Name' (list names only), 'Name and Email', or 'Name, Status and Register Date'.{/ts}
<span class="description"> {ts}To allow users to see a listing of participants, set this field to 'Name' (list names only), 'Name and Email', or 'Name, Status and Register Date'.{/ts}
{help id="id-listing"} </span></td>
</tr>
{if $form.created_id}
<tr class="crm-event-manage-eventinfo-form-block-created_id">
<td class="label">{$form.created_id.label}</td>
<td>{$form.created_id.html}</td>
</tr>
{/if}
<tr class="crm-event-manage-eventinfo-form-block-title">
<td class="label">{$form.title.label} {if $action == 2}{include file='CRM/Core/I18n/Dialog.tpl' table='civicrm_event' field='title' id=$eventID}{/if}</td>
<td>{$form.title.html}<br />
Expand Down

0 comments on commit 1d39d41

Please sign in to comment.