From: moodler <moodler>
Date: Thu, 7 Feb 2008 05:21:58 +0000 (+0000)
Subject: Fix subject lines and corrupted emails from messages  MDL-13364
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=a017dea6121faa636e8b236553defc4afeca9e62;p=moodle.git

Fix subject lines and corrupted emails from messages  MDL-13364
---

diff --git a/message/lib.php b/message/lib.php
index 84d1f040f9..81f7a911c1 100644
--- a/message/lib.php
+++ b/message/lib.php
@@ -967,6 +967,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";