Mwalker has submitted this change and it was merged.
Change subject: Be more assertive about missing arguments to unsubscribe
......................................................................
Be more assertive about missing arguments to unsubscribe
Change-Id: Ic77263b8a98a5d129b7ae8566dc7d8a42e120295
---
M sites/all/modules/queue2civicrm/unsubscribe/wmf_unsubscribe_qc.module
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Mwalker: Looks good to me, approved
diff --git
a/sites/all/modules/queue2civicrm/unsubscribe/wmf_unsubscribe_qc.module
b/sites/all/modules/queue2civicrm/unsubscribe/wmf_unsubscribe_qc.module
index ef3aa99..793a69e 100644
--- a/sites/all/modules/queue2civicrm/unsubscribe/wmf_unsubscribe_qc.module
+++ b/sites/all/modules/queue2civicrm/unsubscribe/wmf_unsubscribe_qc.module
@@ -109,7 +109,7 @@
// Sanity checking :)
$body = json_decode($msg->body, TRUE);
- if (( !array_key_exists('email', $body) ) ||
(!array_key_exists('contribution-id', $body) )) {
+ if ( empty($body['email']) or empty( $body['contribution-id'] ) ) {
$error = "$txnid: Required field not present! Dropping message on
floor.";
throw new WmfException( 'UNSUBSCRIBE', $error );
}
--
To view, visit https://gerrit.wikimedia.org/r/110906
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic77263b8a98a5d129b7ae8566dc7d8a42e120295
Gerrit-PatchSet: 2
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: master
Gerrit-Owner: Adamw <[email protected]>
Gerrit-Reviewer: Katie Horn <[email protected]>
Gerrit-Reviewer: Mwalker <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits