mirror
/
PHPMailer
mirror of https://github.com/PHPMailer/PHPMailer.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into 6.0 

# Conflicts:
#	class.phpmaileroauth.php
#	examples/scripts/shLegacy.js
#	extras/htmlfilter.php
#	extras/ntlm_sasl_client.php
#	src/SMTP.php
This commit is contained in:
Marcus Bointon 2016-10-17 18:37:28 +02:00
parent 90532789b6 a4de1ca5ef
commit 9875dc1faa
No known key found for this signature in database
GPG Key ID: DE31CD6EB646AA24
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/SMTP.php
View File

@ -210,7 +210,7 @@ class SMTP
}
//Avoid clash with built-in function names
if (!in_array($this->Debugoutput, ['error_log', 'html', 'echo']) and is_callable($this->Debugoutput)) {
call_user_func($this->Debugoutput, $str, $this->do_debug);
call_user_func($this->Debugoutput, $str, $level);
return;
}
switch ($this->Debugoutput) {