Merge remote-tracking branch 'upstream/master'

Tv2Csports · Sep 20, 2013 · 7492986 · 7492986
2 parents 4e1cab4 + 562a35d
commit 7492986
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/class.phpmailer.php b/class.phpmailer.php
@@ -571,7 +571,7 @@ public function __construct($exceptions = false)
     {
         $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';
         }
     }