projects
/
civicrm-core.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
4ca6eff
)
CRM-17860 - Mailing.preview API - Fix for PHP 5.4 testing
author
Tim Otten
<totten@civicrm.org>
Fri, 22 Jan 2016 20:23:59 +0000
(12:23 -0800)
committer
Tim Otten
<totten@civicrm.org>
Tue, 2 Feb 2016 04:56:23 +0000
(21:56 -0700)
api/v3/Mailing.php
patch
|
blob
|
blame
|
history
diff --git
a/api/v3/Mailing.php
b/api/v3/Mailing.php
index 7463032416d75a8f591dccc8157fc6df6e01b5dd..6b7d164058e5190894279865f3e7ecb25cf074da 100755
(executable)
--- a/
api/v3/Mailing.php
+++ b/
api/v3/Mailing.php
@@
-544,7
+544,7
@@
function civicrm_api3_mailing_preview($params) {
$details = CRM_Utils_Token::getTokenDetails($mailingParams, $returnProperties, TRUE, TRUE, NULL, $mailing->getFlattenedTokens());
- $mime =
&
$mailing->compose(NULL, NULL, NULL, $session->get('userID'), $fromEmail, $fromEmail,
+ $mime = $mailing->compose(NULL, NULL, NULL, $session->get('userID'), $fromEmail, $fromEmail,
TRUE, $details[0][$contactID], $attachments
);