Skip to content
Snippets Groups Projects
Commit 9eb41381 authored by gitsync's avatar gitsync
Browse files

Merge branch '5.59' of github.com:civicrm/civicrm-core into 5.59

parents 42061484 26219aae
Branches
Tags
No related merge requests found
......@@ -444,7 +444,8 @@ class CRM_Event_Form_ManageEvent_Registration extends CRM_Event_Form_ManageEvent
if (($values['registration_link_text'] ?? '') === '') {
$errorMsg['registration_link_text'] = ts('Please enter Registration Link Text');
}
if (($values['confirm_title'] ?? '') === '') {
// Check if the confirm text is set if we have enabled the confirmation page or page is monetary which forces the confirm page.
if (($values['confirm_title'] ?? '') === '' && (!empty($values['is_confirm_enabled']) || CRM_Core_DAO::getFieldValue('CRM_Event_DAO_Event', $form->_id, 'is_monetary'))) {
$errorMsg['confirm_title'] = ts('Please enter a Title for the registration Confirmation Page');
}
if (($values['thankyou_title'] ?? '') === '') {
......
......@@ -58,7 +58,7 @@ class CRM_Utils_Check_Component_Timestamps extends CRM_Utils_Check_Component {
1 => 'target="_blank" href="https://dev.mysql.com/doc/refman/8.0/en/mysql-tzinfo-to-sql.html"',
]),
ts('MySQL Timezone Problem'),
\Psr\Log\LogLevel::WARNING,
\Psr\Log\LogLevel::NOTICE,
'fa-clock-o'
);
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment