From b894e273c7f818ecde1f90b9e9004b9aedfee57b Mon Sep 17 00:00:00 2001 From: "Michael Kaufmann (d00p)" Date: Sat, 21 Sep 2013 13:03:04 +0200 Subject: [PATCH] remove requirement of PHPMailerAutoloader as we have our own Signed-off-by: Michael Kaufmann (d00p) --- lib/classes/phpmailer/class.PHPMailer.php | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/lib/classes/phpmailer/class.PHPMailer.php b/lib/classes/phpmailer/class.PHPMailer.php index fe37a93b..29ec3118 100644 --- a/lib/classes/phpmailer/class.PHPMailer.php +++ b/lib/classes/phpmailer/class.PHPMailer.php @@ -571,9 +571,12 @@ class PHPMailer { $this->exceptions = ($exceptions == true); //Make sure our autoloader is loaded - if (!in_array('PHPMailerAutoload', spl_autoload_functions())) { - require 'PHPMailerAutoload.php'; - } +/* + * commented out for Froxlor as we have our own Autoloader to take care of this stuff + */ +// if (!in_array('PHPMailerAutoload', spl_autoload_functions())) { +// require 'PHPMailerAutoload.php'; +// } } /**