Merge branch 'MDL-45961_MOODLE_26_STABLE' of https://github.com/NeillM/moodle into MOODLE_26_STABLE

user/profile.php

@@ -156,7 +156,7 @@ if ($PAGE->user_allowed_editing()) {
             // If we are viewing a system page as ordinary user, and the user turns
             // editing on, copy the system pages as new user pages, and get the
             // new page record
-            if (!$currentpage = my_copy_page($USER->id, MY_PAGE_PUBLIC, 'user-profile')) {
+            if (!$currentpage = my_copy_page($userid, MY_PAGE_PUBLIC, 'user-profile')) {
                 print_error('mymoodlesetup');
             }
             $PAGE->set_context($usercontext);
@@ -175,7 +175,7 @@ if ($PAGE->user_allowed_editing()) {
     }
 
     // Add button for editing page
-    $params = array('edit' => !$edit);
+    $params = array('edit' => !$edit, 'id' => $userid);
 
     if (!$currentpage->userid) {
         // viewing a system page -- let the user customise it