holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

move debug to be the first thing in send->send; make SmtpSend public as it is used by MDN

Browse Source
This commit is contained in:
Klaus Leithoff 2010-05-21 11:19:29 +00:00
parent 50af95793b
commit 3b427a4062
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
phpgwapi/inc/class.phpmailer.inc.php
View File

@ -698,7 +698,7 @@ class PHPMailer {
* @access protected
* @return bool
*/
protected function SmtpSend($header, $body) {
public function SmtpSend($header, $body) {
require_once $this->PluginDir . 'class.smtp.php';
$bad_rcpt = array();

2
phpgwapi/inc/class.send.inc.php
View File

@ -41,12 +41,12 @@
*/
function send()
{
if ($this->debug && is_numeric($this->debug)) $this->SMTPDebug = $this->debug;
if ($this->Subject || $this->Body || count($this->to))
{
if ($this->debug) error_log(__METHOD__." ".print_r($this->Subject,true)." to be send");
return PHPMailer::Send();
}
if ($this->debug && is_numeric($this->debug)) $this->SMTPDebug = $this->debug;
$this->CharSet = $GLOBALS['egw']->translation->charset();
list($lang,$nation) = explode('-',$GLOBALS['egw_info']['user']['preferences']['common']['lang']);
$lang_path = EGW_SERVER_ROOT.'/phpgwapi/setup/';