mirror of
https://git.code.sf.net/p/seeddms/code
synced 2025-05-13 13:11:31 +00:00
use utf-8 in email subject
This commit is contained in:
parent
c0961ae809
commit
616c6c3706
|
@ -49,7 +49,8 @@ class SeedDMS_Email extends SeedDMS_Notify {
|
||||||
$message = getMLText("email_header", array(), "", $lang)."\r\n\r\n".getMLText($message, $params, "", $lang);
|
$message = getMLText("email_header", array(), "", $lang)."\r\n\r\n".getMLText($message, $params, "", $lang);
|
||||||
$message .= "\r\n\r\n".getMLText("email_footer", array(), "", $lang);
|
$message .= "\r\n\r\n".getMLText("email_footer", array(), "", $lang);
|
||||||
|
|
||||||
mail($recipient->getEmail(), getMLText($subject, $params, "", $lang), $message, implode("\r\n", $headers));
|
$subject = "=?UTF-8?B?".base64_encode(getMLText($subject, $params, "", $lang))."?=";
|
||||||
|
mail($recipient->getEmail(), $subject, $message, implode("\r\n", $headers));
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
} /* }}} */
|
} /* }}} */
|
||||||
|
@ -86,10 +87,11 @@ class SeedDMS_Email extends SeedDMS_Notify {
|
||||||
$headers = array();
|
$headers = array();
|
||||||
$headers[] = "MIME-Version: 1.0";
|
$headers[] = "MIME-Version: 1.0";
|
||||||
$headers[] = "Content-type: text/plain; charset=utf-8";
|
$headers[] = "Content-type: text/plain; charset=utf-8";
|
||||||
$headers[] = "From: ". $settings->_smtpSendFrom();
|
$headers[] = "From: ". $settings->_smtpSendFrom;
|
||||||
$headers[] = "Reply-To: ". $settings->_smtpSendFrom();
|
$headers[] = "Reply-To: ". $settings->_smtpSendFrom;
|
||||||
|
|
||||||
return (mail($recipient->getEmail(), $this->replaceMarker($subject), $this->replaceMarker($message), implode("\r\n", $header)) ? 0 : -1);
|
$subject = "=?UTF-8?B?".base64_encode($this->replaceMarker($subject))."?=";
|
||||||
|
return (mail($recipient->getEmail(), $subject, $this->replaceMarker($message), implode("\r\n", $header)) ? 0 : -1);
|
||||||
} /* }}} */
|
} /* }}} */
|
||||||
}
|
}
|
||||||
?>
|
?>
|
||||||
|
|
Loading…
Reference in New Issue
Block a user