MDL-14077 Mails form messages not RFC2822 conform; merged from MOODLE_19_STABLE

diff --git a/message/lib.php b/message/lib.php
index 81f7a911c171b6df98278217c3c6a76db32435ad..76dcd2ec1918cc68103cdbf70794112922d1f479 100644 (file)
--- a/message/lib.php
+++ b/message/lib.php
@@ -966,8 +966,8 @@ function message_post_message($userfrom, $userto, $message, $format, $messagetyp
             $message = stripslashes_safe($message);
             $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
+            $messagesubject = preg_replace('/\s+/', ' ', strip_tags($message)); // make sure it's all on one line
+            $messagesubject = message_shorten_message($messagesubject, 30).'...';
 
             $messagetext = format_text_email($message, $format).
                            "\n\n--\n".$tagline."\n"."$CFG->wwwroot/message/index.php?popup=1";