Merge branch 'master' of https://github.com/PHPMailer/PHPMailer

jimjag · jimjag · commit c65a8ed1caab · 2018-10-10T07:51:33.000-04:00
diff --git a/src/PHPMailer.php b/src/PHPMailer.php
@@ -2122,7 +2122,7 @@ public function wrapText($message, $length, $qp_mode = false)
         }
         // If utf-8 encoding is used, we will need to make sure we don't
         // split multibyte characters when we wrap
-        $is_utf8 = 'utf-8' == strtolower($this->CharSet);
+        $is_utf8 = static::CHARSET_UTF8 === strtolower($this->CharSet);
         $lelen = strlen(static::$LE);
         $crlflen = strlen(static::$LE);
 

Original file line number	Diff line number	Diff line change
`@@ -2122,7 +2122,7 @@ public function wrapText($message, $length, $qp_mode = false)`
`2122`	`2122`	`}`
`2123`	`2123`	`// If utf-8 encoding is used, we will need to make sure we don't`
`2124`	`2124`	`// split multibyte characters when we wrap`
`2125`		`- $is_utf8 = 'utf-8' == strtolower($this->CharSet);`
	`2125`	`+ $is_utf8 = static::CHARSET_UTF8 === strtolower($this->CharSet);`
`2126`	`2126`	`$lelen = strlen(static::$LE);`
`2127`	`2127`	`$crlflen = strlen(static::$LE);`
`2128`	`2128`