Browse Source

Merge branch 'prod' into homeV2

Bachir Soussi Chiadmi 9 years ago
parent
commit
1f211d5348
1 changed files with 3 additions and 2 deletions
  1. 3 2
      sites/all/modules/gui/materiobasemod/materio_user.module

+ 3 - 2
sites/all/modules/gui/materiobasemod/materio_user.module

@@ -659,7 +659,8 @@ function materio_user_get_role_by_name($name) {
  *   Associative array containing the send result, including the status.
  */
 function materio_user_mandrill_mailsend_result($result) {
-  if ( in_array($result['status'], array('rejected', 'invalid', 'error')) ) {
+  $status = $result['status'];
+  if ( in_array($status, array('rejected', 'invalid', 'error')) ) {
     $email = $result['email'];
 
     // remove email from pool
@@ -667,7 +668,7 @@ function materio_user_mandrill_mailsend_result($result) {
     simplenews_delete_spool(array('mail'=>$email));
     watchdog("materio_user", "@mail rejected by mandrill, removed from simplenews spool", array("@mail"=>$email));
 
-    if ( in_array($result['status'], array('invalid')) ) {
+    if ( in_array($status, array('invalid')) ) {
       // unsubscribe user if mail does not exists
       $subscriber = simplenews_subscriber_load_by_mail($email);
       if ($subscriber) {