Handle failure of Mail::factory() gracefully

diff --git a/includes/UserMailer.php b/includes/UserMailer.php
index 892bf65..78a8be9 100644 (file)
--- a/includes/UserMailer.php
+++ b/includes/UserMailer.php
@@ -104,6 +104,11 @@ function userMailer( $to, $from, $subject, $body, $replyto=false ) {
 
                // Create the mail object using the Mail::factory method
                $mail_object =& Mail::factory('smtp', $wgSMTP);
+               if( PEAR::isError( $mail_object ) ) {
+                       wfDebug( "PEAR::Mail factory failed: " . $mail_object->getMessage() . "\n" );
+                       return $mail_object->getMessage();
+               }
+
                wfDebug( "Sending mail via PEAR::Mail to $dest\n" );
                $mailResult =& $mail_object->send($dest, $headers, $body);