projects
/
civicrm-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge remote-tracking branch 'upstream/4.5' into 4.5-master-2014-10-14-11-24-52
[civicrm-core.git]
/
CRM
/
Contribute
/
BAO
/
Contribution
/
Utils.php
diff --git
a/CRM/Contribute/BAO/Contribution/Utils.php
b/CRM/Contribute/BAO/Contribution/Utils.php
index 50a18dd8c969f4f34c71504f3463fa9f425c3568..849c61705c67f0e0e5129c9b2987d3f17294763f 100644
(file)
--- a/
CRM/Contribute/BAO/Contribution/Utils.php
+++ b/
CRM/Contribute/BAO/Contribution/Utils.php
@@
-330,7
+330,9
@@
class CRM_Contribute_BAO_Contribution_Utils {
);
}
$form->postProcessPremium($premiumParams, $contribution);
-
+ if (is_array($result) && !empty($result['trxn_id'])) {
+ $contribution->trxn_id = $result['trxn_id'];
+ }
$membershipResult[1] = $contribution;
}