#746182 by Berdir | lasac: Fixed \!pm_subject adds linebreak.

diff --git a/pm_email_notify/pm_email_notify.module b/pm_email_notify/pm_email_notify.module
index 80555ed..98e1ca0 100644 (file)
--- a/pm_email_notify/pm_email_notify.module
+++ b/pm_email_notify/pm_email_notify.module
@@ -126,8 +126,8 @@ function pm_email_notify_mail($key, &$message, $params) {
 function _pm_email_notify_token($recipient, $message) {
   $tokens = array(
     '!author' => $message['author']->name,
-    '!pm_subject' => drupal_html_to_text(check_plain($message['subject'])),
-    '!pm_body' => drupal_html_to_text(check_markup($message['body'], $message['format'], FALSE)),
+    '!pm_subject' => trim(drupal_html_to_text(check_plain($message['subject']))),
+    '!pm_body' => trim(drupal_html_to_text(check_markup($message['body'], $message['format'], FALSE))),
     '!thread' => $message['thread_id'],
     '!user_uid' => $recipient->uid,
     '!message' => url('messages/view/' . $message['thread_id'], array('absolute' => TRUE)),