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
49d8a1a2
Unverified
Commit
49d8a1a2
authored
5 years ago
by
eileen
Committed by
GitHub
5 years ago
Browse files
Options
Downloads
Plain Diff
Merge pull request #14236 from seamuslee001/activity_test
Fix Failing Activity Test
parents
6ed8da0b
ab64b46a
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
CRM/Activity/BAO/Activity.php
+1
-1
1 addition, 1 deletion
CRM/Activity/BAO/Activity.php
with
1 addition
and
1 deletion
CRM/Activity/BAO/Activity.php
+
1
−
1
View file @
49d8a1a2
...
...
@@ -766,7 +766,7 @@ class CRM_Activity_BAO_Activity extends CRM_Activity_DAO_Activity {
'subject'
=>
CRM_Utils_Array
::
value
(
'subject'
,
$activity
),
'assignee_contact_name'
=>
CRM_Utils_Array
::
value
(
'assignee_contact_sort_name'
,
$activity
,
[]),
'source_contact_id'
=>
CRM_Utils_Array
::
value
(
'source_contact_id'
,
$activity
),
'source_contact_name'
=>
CRM_Utils_Array
::
value
(
'source_contact_name'
,
$activity
),
'source_contact_name'
=>
CRM_Utils_Array
::
value
(
'source_contact_
sort_
name'
,
$activity
),
];
$activities
[
$id
][
'activity_type_name'
]
=
CRM_Core_PseudoConstant
::
getName
(
'CRM_Activity_BAO_Activity'
,
'activity_type_id'
,
$activity
[
'activity_type_id'
]);
$activities
[
$id
][
'activity_type'
]
=
CRM_Core_PseudoConstant
::
getLabel
(
'CRM_Activity_BAO_Activity'
,
'activity_type_id'
,
$activity
[
'activity_type_id'
]);
...
...
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