Skip to content

Commit

Permalink
Merge pull request #9722 from eileenmcnaughton/comments
Browse files Browse the repository at this point in the history
Comment fixes plus fix inconsistent unused return bool
  • Loading branch information
eileenmcnaughton authored Jan 25, 2017
2 parents d33b6fe + 2ea4879 commit 131ec23
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
4 changes: 2 additions & 2 deletions CRM/Core/BAO/FinancialTrxn.php
Original file line number Diff line number Diff line change
Expand Up @@ -598,7 +598,7 @@ public static function getMembershipRevenueAmount($lineItem) {
*
* @param array $lineItems
*
* @param array $contributionDetails
* @param CRM_Contribute_BAO_Contribution $contributionDetails
*
* @param bool $update
*
Expand All @@ -607,7 +607,7 @@ public static function getMembershipRevenueAmount($lineItem) {
*/
public static function createDeferredTrxn($lineItems, $contributionDetails, $update = FALSE, $context = NULL) {
if (empty($lineItems)) {
return FALSE;
return;
}
$revenueRecognitionDate = $contributionDetails->revenue_recognition_date;
if (!CRM_Utils_System::isNull($revenueRecognitionDate)) {
Expand Down
2 changes: 2 additions & 0 deletions CRM/Event/Form/Task/Batch.php
Original file line number Diff line number Diff line change
Expand Up @@ -507,6 +507,8 @@ public static function updateContributionStatus($params) {
}

//complete the contribution.
// @todo use the api - ie civicrm_api3('Contribution', 'completetransaction', $input);
// as this method is not preferred / supported.
$baseIPN->completeTransaction($input, $ids, $objects, $transaction, FALSE);

// reset template values before processing next transactions
Expand Down

0 comments on commit 131ec23

Please sign in to comment.