Reedy has submitted this change and it was merged.
Change subject: Update path
......................................................................
Update path
Only read template if it exists
Prevent undefined index
Change-Id: I00dab18947d1d50f68e46b5a1e15fa4a76f1a73f
---
M cli/wm-scripts/bv2013/sendMails.php
1 file changed, 8 insertions(+), 4 deletions(-)
Approvals:
Reedy: Verified; Looks good to me, approved
jenkins-bot: Checked
diff --git a/cli/wm-scripts/bv2013/sendMails.php
b/cli/wm-scripts/bv2013/sendMails.php
index 9d2fb31..e8a9de7 100644
--- a/cli/wm-scripts/bv2013/sendMails.php
+++ b/cli/wm-scripts/bv2013/sendMails.php
@@ -20,7 +20,11 @@
$transTemplates = array();
foreach ( $langs as $lang ) {
- $transTemplates[$lang] = file_get_contents( 'email-translations/' .
$lang );
+ $file = "/a/common/elections-2013-spam/email-translations/$lang";
+ if ( !file_exists( $file ) ) {
+ continue;
+ }
+ $transTemplates[$lang] = file_get_contents( $file );
}
while ( !is_null( $line = fgets( $in ) ) ) {
@@ -34,9 +38,9 @@
continue;
}
- $content = $transTemplates[$lang];
-
- if ( !$content ) {
+ if ( isset( $transTemplates[$lang] ) ) {
+ $content = $transTemplates[$lang];
+ } else {
$content = $transTemplates['en'];
$lang = 'en';
}
--
To view, visit https://gerrit.wikimedia.org/r/68820
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I00dab18947d1d50f68e46b5a1e15fa4a76f1a73f
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/SecurePoll
Gerrit-Branch: master
Gerrit-Owner: Reedy <[email protected]>
Gerrit-Reviewer: Reedy <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
