mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-18 22:08:20 +01:00
Code Issues Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
skodak 2008-03-27 17:09:36 +00:00
parent 95c2d696c4
commit 59c0c3f9f8
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
message/lib.php
View File

@ -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";