Ejegg has uploaded a new change for review.
https://gerrit.wikimedia.org/r/303718
Change subject: Don't crash Mailer on missing locale
......................................................................
Don't crash Mailer on missing locale
Change-Id: Id15c33f3b6b81e9cc8ee24b105828c850ff38016
---
M sites/all/modules/wmf_communication/Mailer.php
1 file changed, 3 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm
refs/changes/18/303718/1
diff --git a/sites/all/modules/wmf_communication/Mailer.php
b/sites/all/modules/wmf_communication/Mailer.php
index 1bc38ad..f446d11 100644
--- a/sites/all/modules/wmf_communication/Mailer.php
+++ b/sites/all/modules/wmf_communication/Mailer.php
@@ -176,6 +176,9 @@
$mailer->Subject = $email['subject'];
# n.b. - must set AltBody after MsgHTML(), or the text will be
overwritten.
+ if ( empty( $email['locale'] ) ) {
+ $email['locale'] = 'en';
+ }
$mailer->MsgHTML( $this->wrapHtmlSnippet( $email['html'],
$email['locale'] ) );
$this->normalizeContent( $email );
$mailer->AltBody = $email['plaintext'];
--
To view, visit https://gerrit.wikimedia.org/r/303718
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id15c33f3b6b81e9cc8ee24b105828c850ff38016
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: master
Gerrit-Owner: Ejegg <eeggles...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
