MDL-9574 + MDL-9607 fixed undefined $user->id in personal context

diff --git a/user/edit.php b/user/edit.php
index 116e79eaca33bef0d02146b603ec9c1fb55c0118..094525328d1ba78f6a3aa2f62a503d1d7d1cd3dc 100644 (file)
--- a/user/edit.php
+++ b/user/edit.php
@@ -24,9 +24,6 @@
         redirect($CFG->httpswwwroot.'/login/index.php');
     }
 
-    $systemcontext   = get_context_instance(CONTEXT_SYSTEM);
-    $personalcontext = get_context_instance(CONTEXT_USER, $user->id);
-
     // Guest can not edit
     if (isguestuser()) {
         print_error('guestnoeditprofile');
@@ -45,7 +42,7 @@
     // User interests separated by commas
     if (!empty($CFG->usetags)) {
         require_once($CFG->dirroot.'/tag/lib.php');
-        $user->interests = tag_names_csv(get_item_tags('user',$userid));
+        $user->interests = tag_names_csv(get_item_tags('user', $user->id));
     }
 
     // remote users cannot be edited
@@ -53,6 +50,9 @@
         redirect($CFG->wwwroot . "/user/view.php?course={$course->id}");
     }
 
+    $systemcontext   = get_context_instance(CONTEXT_SYSTEM);
+    $personalcontext = get_context_instance(CONTEXT_USER, $user->id);
+
     // check access control
     if ($user->id == $USER->id) {
         //editing own profile