mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-06-02 06:05:31 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch 'wip_MDL-47754_m28_installredir' of git://github.com/skodak/moodle

Browse Source
This commit is contained in:
Marina Glancy 2014-10-20 17:02:28 +08:00
commit 24c11785b3
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
user/editadvanced.php
View File

@ -41,6 +41,9 @@ $PAGE->set_url('/user/editadvanced.php', array('course' => $course, 'id' => $id)
$course = $DB->get_record('course', array('id' => $course), '*', MUST_EXIST);
if (!empty($USER->newadminuser)) {
// Ignore double clicks, we must finish all operations before cancelling request.
ignore_user_abort(true);
$PAGE->set_course($SITE);
$PAGE->set_pagelayout('maintenance');
} else {
@ -274,9 +277,14 @@ if ($usernew = $userform->get_data()) {
if (!empty($USER->newadminuser)) {
unset($USER->newadminuser);
// Apply defaults again - some of them might depend on admin user info, backup, roles, etc.
admin_apply_default_settings(null , false);
admin_apply_default_settings(null, false);
// Admin account is fully configured - set flag here in case the redirect does not work.
unset_config('adminsetuppending');
// Redirect to admin/ to continue with installation.
redirect("$CFG->wwwroot/$CFG->admin/");
} else if (empty($SITE->fullname)) {
// Somebody double clicked when editing admin user during install.
redirect("$CFG->wwwroot/$CFG->admin/");
} else {
redirect("$CFG->wwwroot/user/view.php?id=$USER->id&course=$course->id");
}