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
7ec15a3f
Commit
7ec15a3f
authored
11 years ago
by
Dave Greenberg
Browse files
Options
Downloads
Plain Diff
Merge pull request #2250 from davecivicrm/CRM-14025
CRM-14025 committing PR-2247 to 4.4 branch as intended.
parents
2f9d667b
b8696654
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.php
+1
-1
1 addition, 1 deletion
CRM/Event/Form/ManageEvent.php
api/v3/UFField.php
+1
-1
1 addition, 1 deletion
api/v3/UFField.php
with
2 additions
and
2 deletions
CRM/Event/Form/ManageEvent.php
+
1
−
1
View file @
7ec15a3f
...
...
@@ -350,7 +350,7 @@ class CRM_Event_Form_ManageEvent extends CRM_Core_Form {
CRM_Event_BAO_Event
::
updateParticipantCampaignID
(
$eventID
,
$newCampaignID
);
}
}
$this
->
postProcessHook
();
if
(
$this
->
controller
->
getButtonName
(
'submit'
)
==
"_qf_
{
$className
}
_upload_done"
)
{
if
(
$this
->
_isTemplate
)
{
CRM_Utils_System
::
redirect
(
CRM_Utils_System
::
url
(
'civicrm/admin/eventTemplate'
,
...
...
This diff is collapsed.
Click to expand it.
api/v3/UFField.php
+
1
−
1
View file @
7ec15a3f
...
...
@@ -77,7 +77,7 @@ function civicrm_api3_uf_field_create($params) {
$fieldId
=
CRM_Utils_Array
::
value
(
'id'
,
$params
);
if
(
!
empty
(
$fieldId
))
{
$UFField
=
new
CRM_
c
ore_BAO_UFField
();
$UFField
=
new
CRM_
C
ore_BAO_UFField
();
$UFField
->
id
=
$fieldId
;
if
(
$UFField
->
find
(
TRUE
))
{
$ids
[
'uf_group'
]
=
$UFField
->
uf_group_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