moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-05 08:56:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'MDL-56407-master-2' of git://github.com/junpataleta/moodle

Browse source
This commit is contained in:
Andrew Nicols 2016-11-22 09:06:09 +08:00
commit d10ca75b8c
6 changed files with 62 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

6
lib/deprecatedlib.php
View file

@ -5616,7 +5616,11 @@ function message_is_user_blocked($recipient, $sender = null) {
debugging('message_is_user_blocked() is deprecated and is no longer used, please use
\core_message\api::is_user_blocked() instead.', DEBUG_DEVELOPER);
return \core_message\api::is_user_blocked($recipient, $sender);
$senderid = null;
if ($sender !== null && isset($sender->id)) {
$senderid = $sender->id;
}
return \core_message\api::is_user_blocked($recipient->id, $senderid);
}
/**