Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

php8.x fatal fix + bonus smarty consistency #27091

Merged
merged 1 commit into from
Aug 22, 2023
Merged

php8.x fatal fix + bonus smarty consistency #27091

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 5 additions & 12 deletions CRM/Event/BAO/Event.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1271,7 +1271,7 @@ public static function sendMail($contactID, $values, $participantId, $isTest = F
* Add the custom fields OR array of participant's profile info.
*
* @param int $id
* @param string $name
* @param string $name eg. customPre or additionalCustomPost to denote the profile location.
* @param int $cid
* @param \CRM_Core_Smarty $template
* @param int $participantId
Expand Down Expand Up @@ -1443,22 +1443,15 @@ public static function buildCustomDisplay(
}
}

if (count($val)) {
$template->assign($name, $val);
}

if (count($groupTitles)) {
$template->assign($name . '_grouptitle', $groupTitles);
}
$template->assign($name, $val);
$template->assign($name . '_grouptitle', $groupTitles);

//return if we only require array of participant's info.
if ($returnResults) {
if (count($val)) {
if ($val) {
return [$val, $groupTitles];
}
else {
return NULL;
}
return NULL;
}
}

Expand Down