Merge branch 'MDL-64426' of git://github.com/stronk7/moodle

moodle · Jan 8, 2019 · a1b1892 · a1b1892
2 parents 6360f87 + c7f9834
commit a1b1892
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/message/classes/api.php b/message/classes/api.php
@@ -776,7 +776,7 @@ public static function get_conversations($userid, $limitfrom = 0, $limitnum = 20
             // Name should be formatted and depends on the context the conversation resides in.
             // If not set, the context is always context_user.
             if (is_null($conversation->contextid)) {
-                $convcontext = \context_user::instance_by_id($userid);
+                $convcontext = \context_user::instance($userid);
             } else {
                 $convcontext = \context::instance_by_id($conversation->contextid);
             }