Merge remote-tracking branch 'upstream/master'

2013-09-20 09:18:26 +02:00 · 2013-09-20 09:18:26 +02:00 · 7492986b81
parent 4e1cab46df 562a35dcee
commit 7492986b81
1 changed files with 1 additions and 1 deletions
--- a/class.phpmailer.php
+++ b/class.phpmailer.php
@ -571,7 +571,7 @@ class PHPMailer
    {
        $this->exceptions = ($exceptions == true);
        //Make sure our autoloader is loaded
-        if (!in_array('PHPMailerAutoload', spl_autoload_functions())) {
+        if (!spl_autoload_functions() || !in_array('PHPMailerAutoload', spl_autoload_functions())) {
            require 'PHPMailerAutoload.php';
        }
    }