maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

register our own autoloader and add PHPMailerAutoload so we don't need to patch phpMailer on every update

Browse Source 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann (d00p)
2013-09-21 13:10:04 +02:00
parent b894e273c7
commit fea16cd108
4 changed files with 40 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lib/classes/phpmailer/class.PHPMailer.php
View File

@@ -571,12 +571,9 @@ class PHPMailer
{
$this->exceptions = ($exceptions == true);
//Make sure our autoloader is loaded
/*
* 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';
// }
if (!in_array('PHPMailerAutoload', spl_autoload_functions())) {
require 'PHPMailerAutoload.php';
}
}
/**