Commit 8dd4725e authored by Dries's avatar Dries
Browse files

- Patch #855376 by aspilicious: fix newlines in mail.inc.

parent c804c97c
...@@ -87,6 +87,7 @@ ...@@ -87,6 +87,7 @@
* @param $send * @param $send
* Send the message directly, without calling drupal_mail_system()->mail() * Send the message directly, without calling drupal_mail_system()->mail()
* manually. * manually.
*
* @return * @return
* The $message array structure containing all details of the * The $message array structure containing all details of the
* message. If already sent ($send = TRUE), then the 'result' element * message. If already sent ($send = TRUE), then the 'result' element
...@@ -218,6 +219,7 @@ function drupal_mail($module, $key, $to, $language, $params = array(), $from = N ...@@ -218,6 +219,7 @@ function drupal_mail($module, $key, $to, $language, $params = array(), $from = N
* @param $key * @param $key
* A key to identify the e-mail sent. The final e-mail ID for the e-mail * A key to identify the e-mail sent. The final e-mail ID for the e-mail
* alter hook in drupal_mail() would have been {$module}_{$key}. * alter hook in drupal_mail() would have been {$module}_{$key}.
*
* @return MailSystemInterface * @return MailSystemInterface
*/ */
function drupal_mail_system($module, $key) { function drupal_mail_system($module, $key) {
...@@ -287,6 +289,7 @@ public function format(array $message); ...@@ -287,6 +289,7 @@ public function format(array $message);
* - headers: Associative array containing all additional mail headers not * - headers: Associative array containing all additional mail headers not
* defined by one of the other parameters. PHP's mail() looks for Cc * defined by one of the other parameters. PHP's mail() looks for Cc
* and Bcc headers and sends the mail to addresses in these headers too. * and Bcc headers and sends the mail to addresses in these headers too.
*
* @return * @return
* TRUE if the mail was successfully accepted for delivery, otherwise FALSE. * TRUE if the mail was successfully accepted for delivery, otherwise FALSE.
*/ */
...@@ -354,6 +357,7 @@ function drupal_wrap_mail($text, $indent = '') { ...@@ -354,6 +357,7 @@ function drupal_wrap_mail($text, $indent = '') {
* @param $allowed_tags (optional) * @param $allowed_tags (optional)
* If supplied, a list of tags that will be transformed. If omitted, all * If supplied, a list of tags that will be transformed. If omitted, all
* all supported tags are transformed. * all supported tags are transformed.
*
* @return * @return
* The transformed string. * The transformed string.
*/ */
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment