merged fix for MDL-7696, adding addslash for bulk messaging

diff --git a/user/messageselect.php b/user/messageselect.php
index 73408ff8f0c93b1ab3070554a8e4f7356fa024c6..9ea6a7c869791d85d27d86d64b013410e0ab2320 100644 (file)
--- a/user/messageselect.php
+++ b/user/messageselect.php
@@ -86,7 +86,7 @@
                 $good = 1;
                 $teachers = array();
                 foreach ($SESSION->emailto[$id] as $user) {
-                    $good = $good && message_post_message($USER,$user,$messagebody,$format,'direct');
+                    $good = $good && message_post_message($USER,$user,addslashes($messagebody),$format,'direct');
                     if ($user->teacher) {
                         $teachers[] = $user->id;
                     }