From ba70e17ad9229c5dce111152eda2029fb82166ee Mon Sep 17 00:00:00 2001 From: Neil Blakey-Milner Date: Mon, 6 Jun 2005 19:00:15 +0000 Subject: [PATCH] Set phpmailer language (to English, for now), and return PEAR Error instances instead of false. --- lib/email/Email.inc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/email/Email.inc b/lib/email/Email.inc index a278724..59e81d5 100644 --- a/lib/email/Email.inc +++ b/lib/email/Email.inc @@ -48,6 +48,7 @@ class Email { $this->oMailer->FromName = (strlen($sFromName) == 0) ? $default->emailFromName : $sFromName; $this->oMailer->WordWrap = 100; $this->oMailer->IsHTML(true); + $this->oMailer->SetLanguage('en', KT_DIR . '/phpmailer/language/'); } /** @@ -102,14 +103,14 @@ class Email { //send the email if(!$this->oMailer->Send()) { $default->log->error("Error sending mail to $mToEmail; mailer error code=" . $this->oMailer->ErrorInfo); - return false; + return PEAR::raiseError("Error sending mail to $mToEmail; mailer error code=" . $this->oMailer->ErrorInfo); } else { $default->log->info("Successfully sent mail to $mToEmail"); } return true; } else { // no valid email addresses supplied - return false; + return PEAR::raiseError("No valid email addresses supplied"); } } -- libgit2 0.21.4