Clean up

PHPMailer · Apr 8, 2024 · fb317f2 · fb317f2
1 parent 4102780
commit fb317f2
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/src/PHPMailer.php b/src/PHPMailer.php
@@ -902,7 +902,7 @@ protected function edebug($str)
  }
  //Is this a PSR-3 logger?
  if ($this->Debugoutput instanceof \Psr\Log\LoggerInterface) {
- $this->Debugoutput->debug($str);
+ $this->Debugoutput->debug(rtrim($str, "\r\n"));
 
  return;
  }

diff --git a/src/SMTP.php b/src/SMTP.php
@@ -280,9 +280,8 @@ protected function edebug($str, $level = 0)
  }
  //Is this a PSR-3 logger?
  if ($this->Debugoutput instanceof \Psr\Log\LoggerInterface) {
- //Remove ending line breaks potentialy added by calls to SMTP::client_send()
- $str = rtrim($str, "\n\r");
- $this->Debugoutput->debug($str);
+ //Remove trailing line breaks potentially added by calls to SMTP::client_send()
+ $this->Debugoutput->debug(rtrim($str, "\r\n"));
 
  return;
  }