Skip to content

Commit

Permalink
Remove another use of loadRelatedObjects() as we call it again before…
Browse files Browse the repository at this point in the history
… using
  • Loading branch information
mattwire committed Feb 2, 2021
1 parent 9a7736c commit 63f1c79
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions CRM/Contribute/BAO/Contribution.php
Original file line number Diff line number Diff line change
Expand Up @@ -2795,7 +2795,7 @@ public function loadRelatedObjects($input, &$ids, $loadAll = FALSE) {
* @throws Exception
*/
public function composeMessageArray(&$input, &$ids, &$values, $returnMessageText = TRUE) {
$this->loadRelatedObjects($input, $ids);
$this->loadRelatedObjects($input, $ids, TRUE);

if (empty($this->_component)) {
$this->_component = $input['component'] ?? NULL;
Expand Down Expand Up @@ -4345,7 +4345,6 @@ public static function sendMail($input, $ids, $contributionID, $returnMessageTex
if (!$contribution->find(TRUE)) {
throw new CRM_Core_Exception('Contribution does not exist');
}
$contribution->loadRelatedObjects($input, $ids, TRUE);
// set receipt from e-mail and name in value
if (!$returnMessageText) {
list($values['receipt_from_name'], $values['receipt_from_email']) = self::generateFromEmailAndName($input, $contribution);
Expand Down

0 comments on commit 63f1c79

Please sign in to comment.