From 2bff64d017632e7852743e32d60d9e2ec8d0ae47 Mon Sep 17 00:00:00 2001
From: moodler <moodler>
Date: Thu, 7 Feb 2008 05:20:57 +0000
Subject: [PATCH] Fix subject lines and corrupted emails from messages 
 MDL-13364 (merged)

---
 message/lib.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/message/lib.php b/message/lib.php
index 72a9aa612fe..2c6811d6564 100644
--- a/message/lib.php
+++ b/message/lib.php
@@ -994,6 +994,7 @@ function message_post_message($userfrom, $userto, $message, $format, $messagetyp
             $tagline = get_string('emailtagline', 'message', $SITE->shortname);
             
             $messagesubject = message_shorten_message(strip_tags($message), 30).'...';
+            $messagesubject = str_replace("\n", ' ', $messagesubject);  // make sure it's all on one line
 
             $messagetext = format_text_email($message, $format).
                            "\n\n--\n".$tagline."\n"."$CFG->wwwroot/message/index.php?popup=1";