- Patch #71194 by Goba: introducing hook_mail_alter(), chaning user_mail() to drupal_mail().

1 files changed, 5 insertions, 5 deletions

diff --git a/modules/contact.module b/modules/contact.module
index 86793a943..2ff6546dd 100644
--- a/modules/contact.module
+++ b/modules/contact.module
@@ -396,11 +396,11 @@ function contact_mail_user_submit($form_id, $edit) {
   $body = implode("\n\n", $message);
 
   // Send the e-mail:
-  user_mail($to, $subject, $body, "From: $from\nReply-to: $from\nX-Mailer: Drupal\nReturn-path: $from\nErrors-to: $from");
+  drupal_mail('contact-user-mail', $to, $subject, $body, $from);
 
   // Send a copy if requested:
   if ($edit['copy']) {
-    user_mail($from, $subject, $body, "From: $from\nReply-to: $from\nX-Mailer: Drupal\nReturn-path: $from\nErrors-to: $from");
+    drupal_mail('contact-user-copy', $from, $subject, $body, $from);
   }
 
   // Log the operation:
@@ -537,16 +537,16 @@ function contact_mail_page_submit($form_id, $edit) {
   $body = implode("\n\n", $message);
 
   // Send the e-mail to the recipients:
-  user_mail($contact->recipients, $subject, $body, "From: $from\nReply-to: $from\nX-Mailer: Drupal\nReturn-path: $from\nErrors-to: $from");
+  drupal_mail('contact-page-mail', $contact->recipients, $subject, $body, $from);
 
   // If the user requests it, send a copy.
   if ($edit['copy']) {
-    user_mail($from, $subject, $body, "From: $from\nReply-to: $from\nX-Mailer: Drupal\nReturn-path: $from\nErrors-to: $from");
+    drupal_mail('contact-page-copy', $from, $subject, $body, $from);
   }
 
   // Send an auto-reply if necessary:
   if ($contact->reply) {
-    user_mail($from, $subject, wordwrap($contact->reply), "From: $contact->recipients\nReply-to: $contact->recipients\nX-Mailer: Drupal\nReturn-path: $contact->recipients\nErrors-to: $contact->recipients");
+    drupal_mail('contact-page-autoreply', $from, $subject, wordwrap($contact->reply), $contact->recipients);
   }
 
   // Log the operation: