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

2019-01-09 06:38:34 +08:00
parent 279df86c7f db729d9510
commit 0f44be2b7a
1 changed files with 1 additions and 1 deletions
@@ -776,7 +776,7 @@ class api {
            // 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);
            }