Issue #52: Update backdrop_mail implementation to respect 'from' param.

backdrop-contrib · Jan 31, 2025 · 64e6509 · 64e6509
1 parent e985b1f
commit 64e6509
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/includes/registration.forms.inc b/includes/registration.forms.inc
@@ -393,11 +393,13 @@ function registration_send_confirmation($form, &$form_state) {
         'subject' => $subject,
         'message' => $message,
       );
+      if (!empty($settings['settings']['from_address'])) {
+        $params['from'] = $settings['settings']['from_address'];
+      }
       global $language;
-      $from = $settings['settings']['from_address'];
 
       // Send the confirmation email.
-      backdrop_mail('registration', 'confirmation', $email, $language, $params, $from);
+      backdrop_mail('registration', 'confirmation', $email, $language, $params);
     }
   }
 }

diff --git a/registration.module b/registration.module
@@ -1202,7 +1202,7 @@ function registration_send_broadcast($entity_type, $entity_id, $subject, $messag
 
   // grab registration entity settings
   $settings = registration_entity_settings($entity_type, $entity_id);
-  $from = $settings['settings']['from_address'];
+  $from = $settings['settings']['from_address'] ? $settings['settings']['from_address'] : '';
 
   // grab all registrations
   $query = new EntityFieldQuery();
@@ -1256,10 +1256,9 @@ function registration_send_broadcast($entity_type, $entity_id, $subject, $messag
       );
       $message = token_replace($message_template, $data, array('clear' => TRUE));
       $params['message'] = $message;
+      $params['from'] = $from;
 
-      $result = backdrop_mail('registration', 'broadcast',
-        $wrapper->mail->value(), $language, $params, $from
-      );
+      $result = backdrop_mail('registration', 'broadcast', $wrapper->mail->value(), $language, $params);
       if ($result['result'] !== FALSE) {
         $success_count++;
       }