mirror of
https://github.com/moodle/moodle.git
synced 2025-04-22 08:55:15 +02:00
Merged fix for MDL-10732 from stable
This commit is contained in:
parent
5c5085bada
commit
6200420dc6
@ -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...
|
||||
|
Loading…
x
Reference in New Issue
Block a user