email MDL-23240 commented out the use of php's quoted_printable_encode()

This commit is contained in:
Andrew Davis 2010-08-08 04:34:03 +00:00
parent 3e1752ccb9
commit 4aebb58ded

View file

@ -1690,9 +1690,10 @@ class PHPMailer {
* @author Marcus Bointon * @author Marcus Bointon
*/ */
public function EncodeQP($string, $line_max = 76, $space_conv = false) { public function EncodeQP($string, $line_max = 76, $space_conv = false) {
if (function_exists('quoted_printable_encode')) { //Use native function if it's available (>= PHP5.3) //MDL-23240 php's implementation causes problems for some users
return quoted_printable_encode($string); //if (function_exists('quoted_printable_encode')) { //Use native function if it's available (>= PHP5.3)
} // return quoted_printable_encode($string);
//}
$filters = stream_get_filters(); $filters = stream_get_filters();
if (!in_array('convert.*', $filters)) { //Got convert stream filter? if (!in_array('convert.*', $filters)) { //Got convert stream filter?
return $this->EncodeQPphp($string, $line_max, $space_conv); //Fall back to old implementation return $this->EncodeQPphp($string, $line_max, $space_conv); //Fall back to old implementation