Mwalker has uploaded a new change for review. https://gerrit.wikimedia.org/r/104181
Change subject: Improvements for Thank You ...................................................................... Improvements for Thank You * Templates now ** use contact ID instead of contribution ID ** are pretty printed * Thank you itself now correctly uses the List-Unsubscribe header Change-Id: I7f59ccae3b774e72f7f21db3c7ee4ad83619a20a --- M sites/all/modules/thank_you/generators/RenderTranslatedPage.php M sites/all/modules/thank_you/generators/ThankYou2012.php M sites/all/modules/thank_you/generators/ThankYou20131202.php M sites/all/modules/thank_you/thank_you.module 4 files changed, 5 insertions(+), 4 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm refs/changes/81/104181/1 diff --git a/sites/all/modules/thank_you/generators/RenderTranslatedPage.php b/sites/all/modules/thank_you/generators/RenderTranslatedPage.php index 24cc017..7f7b4e9 100644 --- a/sites/all/modules/thank_you/generators/RenderTranslatedPage.php +++ b/sites/all/modules/thank_you/generators/RenderTranslatedPage.php @@ -289,10 +289,11 @@ // Save it, not outputting the freaking <xml> header and <chunk> tags $result = array(); + $dom->formatOutput = true; foreach( $dom->firstChild->childNodes as $node ) { $result[] = $dom->saveXML( $node ); } - return implode( "\n", $result ); + return implode( "\n\n", $result ); } /** diff --git a/sites/all/modules/thank_you/generators/ThankYou2012.php b/sites/all/modules/thank_you/generators/ThankYou2012.php index 84863a7..5944463 100644 --- a/sites/all/modules/thank_you/generators/ThankYou2012.php +++ b/sites/all/modules/thank_you/generators/ThankYou2012.php @@ -9,7 +9,7 @@ '/\[given name\]/' => '{{contact.first_name}}', '/\[date\]/' => '{{contribution.receive_date}}', '/\[amount\]/' => '{{contribution.contribution_source|l10n_currency(locale)}}', - '/\[contributionId\]/' => '{{contribution.id}}', + '/\[contributionId\]/' => '{{contribution.contact_id}}', '/\[ifRecurring\]/' => '{% if recurring %}', '/\[endifRecurring\]/' => '{% endif %}', diff --git a/sites/all/modules/thank_you/generators/ThankYou20131202.php b/sites/all/modules/thank_you/generators/ThankYou20131202.php index 570f5aa..c1e2623 100644 --- a/sites/all/modules/thank_you/generators/ThankYou20131202.php +++ b/sites/all/modules/thank_you/generators/ThankYou20131202.php @@ -9,7 +9,7 @@ '/\[given name\]/' => '{{contact.first_name}}', '/\[date\]/' => '{{contribution.receive_date}}', '/\[amount\]/' => '{{contribution.contribution_source|l10n_currency(locale)}}', - '/\[contributionId\]/' => '{{contribution.id}}', + '/\[contributionId\]/' => '{{contribution.contact_id}}', '/\[ifRecurring\]/' => '{% if recurring %}', '/\[endifRecurring\]/' => '{% endif %}', diff --git a/sites/all/modules/thank_you/thank_you.module b/sites/all/modules/thank_you/thank_you.module index b9bf5fe..d06167f 100644 --- a/sites/all/modules/thank_you/thank_you.module +++ b/sites/all/modules/thank_you/thank_you.module @@ -342,7 +342,7 @@ $email_success = $mailer->send( $email, - array( 'List-Unsubscribe' => build_unsub_link( $contribution_id, $email['to_address'], $language) ) + array( 'List-Unsubscribe' => '<' . build_unsub_link( $contribution_id, $email['to_address'], $language) . '>' ) ); } catch (phpmailerException $e) { -- To view, visit https://gerrit.wikimedia.org/r/104181 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7f59ccae3b774e72f7f21db3c7ee4ad83619a20a Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/fundraising/crm Gerrit-Branch: master Gerrit-Owner: Mwalker <mwal...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits