Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
C
Core
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Container registry
Model registry
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
Repository analytics
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
justinfreeman (Agileware)
Core
Commits
f5f3f029
Commit
f5f3f029
authored
11 years ago
by
Kurund Jalmi
Browse files
Options
Downloads
Patches
Plain Diff
display fixes for confirm and thankyou screens, CRM-10976
parent
fd933dc5
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
CRM/Event/BAO/Event.php
+10
-7
10 additions, 7 deletions
CRM/Event/BAO/Event.php
with
10 additions
and
7 deletions
CRM/Event/BAO/Event.php
+
10
−
7
View file @
f5f3f029
...
...
@@ -1325,6 +1325,7 @@ WHERE civicrm_event.is_active = 1
*/
static
function
displayProfile
(
&
$params
,
$gid
,
&
$groupTitle
,
&
$values
,
&
$profileFields
=
array
())
{
if
(
$gid
)
{
$config
=
CRM_Core_Config
::
singleton
();
$session
=
CRM_Core_Session
::
singleton
();
$contactID
=
$session
->
get
(
'userID'
);
if
(
$contactID
)
{
...
...
@@ -1366,7 +1367,8 @@ WHERE civicrm_event.is_active = 1
}
}
elseif
(
'date'
==
substr
(
$name
,
-
4
))
{
$values
[
$index
]
=
$params
[
$name
];
$values
[
$index
]
=
CRM_Utils_Date
::
customFormat
(
CRM_Utils_Date
::
processDate
(
$params
[
$name
]),
$config
->
dateformatFull
);
}
elseif
(
'country'
==
substr
(
$name
,
0
,
7
))
{
if
(
$params
[
$name
])
{
...
...
@@ -1498,18 +1500,15 @@ WHERE civicrm_event.is_active = 1
else
{
if
(
$cfID
=
CRM_Core_BAO_CustomField
::
getKeyID
(
$name
))
{
$query
=
"
SELECT html_type, data_type
SELECT html_type, data_type
, date_format, time_format
FROM civicrm_custom_field
WHERE id =
$cfID
"
;
$dao
=
CRM_Core_DAO
::
executeQuery
(
$query
);
$dao
->
fetch
();
$htmlType
=
$dao
->
html_type
;
$dataType
=
$dao
->
data_type
;
if
(
$htmlType
==
'File'
)
{
//$fileURL = CRM_Core_BAO_CustomField::getFileURL( $contactID, $cfID );
//$params[$index] = $values[$index] = $fileURL['file_url'];
$values
[
$index
]
=
$params
[
$index
];
}
else
{
...
...
@@ -1522,9 +1521,13 @@ WHERE id = $cfID
$customVal
=
(
float
)(
$params
[
$name
]);
}
elseif
(
$dao
->
data_type
==
'Date'
)
{
$customVal
=
$displayValue
=
$params
[
$name
];
$customVal
=
$displayValue
=
CRM_Utils_Date
::
customFormat
(
CRM_Utils_Date
::
processDate
(
$params
[
$name
]),
$config
->
dateformatFull
);
if
(
!
empty
(
$params
[
$name
.
'_time'
]))
{
$customVal
=
$displayValue
=
$params
[
$name
]
.
' '
.
$params
[
$name
.
'_time'
];
$customVal
=
$displayValue
=
CRM_Utils_Date
::
customFormat
(
CRM_Utils_Date
::
processDate
(
$params
[
$name
],
$params
[
$name
.
'_time'
]),
$config
->
dateformatDateTime
);
}
$skip
=
TRUE
;
}
...
...
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