Merged fix for MDL-10732 from stable

diff --git a/message/send.php b/message/send.php
index 989925d13b54a5a47f2b1d3903848d7ee90c7b8b..0e2bd28e30ca6a1851540737c2cbaa8cc57f53fd 100644 (file)
--- a/message/send.php
+++ b/message/send.php
@@ -49,13 +49,24 @@
             exit;
         }
     }
-    if (get_user_preferences('message_blocknoncontacts', 0, $user->id)) {  // User is blocking non-contacts
+    $userpreferences = get_user_preferences(NULL, NULL, $user->id);
+
+    if (!empty($userpreferences['message_blocknoncontacts'])) {  // User is blocking non-contacts
         if (empty($contact)) {   // We are not a contact!
             print_heading(get_string('userisblockingyounoncontact', 'message'));
             exit;
         }
     }
 
+/// Make sure the receiving user has preferences
+    if (!isset($userpreferences['message_showmessagewindow'])) {  // User has not used messaging before
+        set_user_preference('message_showmessagewindow', 1, $user->id);
+        set_user_preference('message_emailmessages', 1, $user->id);
+        set_user_preference('message_emailtimenosee', 10, $user->id);
+        set_user_preference('message_emailaddress', $user->email, $user->id);
+    }
+
+
     if ($message!='' and confirm_sesskey()) {   /// Current user has just sent a message
 
     /// Save it to the database...