OK, aligning this to the same as STABLE ... there's been a bit of a mixup

about this file.  It's now standard with the single addition of a constructor
to set this->PluginDir, and this is now used for the language file includes.

diff --git a/lib/phpmailer/class.phpmailer.php b/lib/phpmailer/class.phpmailer.php
index 87f8890f9587bc119fbe2b11ac359b9422487380..d76defcccf243474b71ec35e4d1d711b2cc6b3de 100644 (file)
--- a/lib/phpmailer/class.phpmailer.php
+++ b/lib/phpmailer/class.phpmailer.php
@@ -471,7 +471,7 @@ class PHPMailer
      * @return bool
      */
     function SmtpSend($header, $body) {
-        include_once($this->PluginDir . "class.smtp.php");
+        include_once("class.smtp.php");
         $error = "";
         $bad_rcpt = array();