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.

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();