"MDL-16554, strip slashes in email, checkin the patch"

This commit is contained in:
dongsheng
2008-09-22 03:21:39 +00:00
parent 49feaa5d5f
commit 70fa4b2963
+2 -2
View File
@@ -4110,7 +4110,7 @@ function email_to_user($user, $from, $subject, $messagetext, $messagehtml='', $a
$mail->From = $CFG->noreplyaddress;
$mail->FromName = $from;
} else if ($usetrueaddress and $from->maildisplay) {
$mail->From = $from->email;
$mail->From = stripslashes($from->email);
$mail->FromName = fullname($from);
} else {
$mail->From = $CFG->noreplyaddress;
@@ -4126,7 +4126,7 @@ function email_to_user($user, $from, $subject, $messagetext, $messagehtml='', $a
$mail->Subject = substr($subject, 0, 900);
$mail->AddAddress($user->email, fullname($user) );
$mail->AddAddress(stripslashes($user->email), fullname($user) );
$mail->WordWrap = $wordwrapwidth; // set word wrap