From bccf92a80776196c632e7c5d1a56aa67e72a6d90 Mon Sep 17 00:00:00 2001
From: David Anderson <davea@ssl.berkeley.edu>
Date: Fri, 6 Jun 2014 22:59:18 -0700
Subject: [PATCH] web: fix friends-and-family email function using PHPMailer

---
 html/user/ffmail_action.php | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/html/user/ffmail_action.php b/html/user/ffmail_action.php
index ac6b73bd08..bd0c682e8f 100644
--- a/html/user/ffmail_action.php
+++ b/html/user/ffmail_action.php
@@ -67,7 +67,7 @@ if ($action=='Preview') {
         $e = get_str("e$i", true);
         if ($n && $e) {
             $found = true;
-            $mail = new PHPMailer();
+            $mail = make_php_mailer();
             $mail->AddAddress($e, $n);
             $mail->Subject = $subject;
             if ($html) {
@@ -78,8 +78,6 @@ if ($action=='Preview') {
             }
             $mail->From = $uemail;
             $mail->FromName = $uname;
-            $mail->Host = $PHPMAILER_HOST;
-            $mail->Mailer = $PHPMAILER_MAILER;
             if ($mail->Send()) {
                 echo "<br>".tra("email sent successfully to %1", $e)."\n";
             } else {