Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
CiviCRM Core
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Container registry
Model registry
Analyze
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Development
CiviCRM Core
Commits
9eb41381
Commit
9eb41381
authored
2 years ago
by
gitsync
Browse files
Options
Downloads
Plain Diff
Merge branch '5.59' of github.com:civicrm/civicrm-core into 5.59
parents
42061484
26219aae
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
CRM/Event/Form/ManageEvent/Registration.php
+2
-1
2 additions, 1 deletion
CRM/Event/Form/ManageEvent/Registration.php
CRM/Utils/Check/Component/Timestamps.php
+1
-1
1 addition, 1 deletion
CRM/Utils/Check/Component/Timestamps.php
with
3 additions
and
2 deletions
CRM/Event/Form/ManageEvent/Registration.php
+
2
−
1
View file @
9eb41381
...
...
@@ -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'
]
??
''
)
===
''
)
{
...
...
This diff is collapsed.
Click to expand it.
CRM/Utils/Check/Component/Timestamps.php
+
1
−
1
View file @
9eb41381
...
...
@@ -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'
);
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment