MDL-12212 fixed missing course setup + tags incorrect $id parameter

diff --git a/user/edit.php b/user/edit.php
index 0caeb37395be486d6ac1c0518ff026c615c47af9..1b770aef58fd6a8f38b4beeff6baf38d51a3c12f 100644 (file)
--- a/user/edit.php
+++ b/user/edit.php
@@ -23,6 +23,8 @@
             $SESSION->wantsurl = $CFG->httpswwwroot.'/user/edit.php';
         }
         redirect(get_login_url());
+    } else {
+        $PAGE->set_course($course);
     }
 
     // Guest can not edit
@@ -43,7 +45,7 @@
     // User interests separated by commas
     if (!empty($CFG->usetags)) {
         require_once($CFG->dirroot.'/tag/lib.php');
-        $user->interests = tag_get_tags_array('user', $id);
+        $user->interests = tag_get_tags_array('user', $user->id);
     }
 
     // remote users cannot be edited