MDL-56407 message: Indicate user is blocked in message area

2016-11-17 09:11:37 +08:00
parent b4d6669dd0
commit 26dca05d02
6 changed files with 62 additions and 16 deletions
@@ -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);
 }

 /**