mirror of
https://github.com/moodle/moodle.git
synced 2025-03-14 04:30:15 +01:00
Merge branch 'wip-MDL-27767-master' of git://github.com/samhemelryk/moodle
This commit is contained in:
commit
f477e8c1ce
@ -27,7 +27,7 @@
|
||||
defined('MOODLE_INTERNAL') || die();
|
||||
|
||||
function xmldb_main_install() {
|
||||
global $CFG, $DB, $SITE;
|
||||
global $CFG, $DB, $SITE, $OUTPUT;
|
||||
|
||||
/// Make sure system context exists
|
||||
$syscontext = context_system::instance(0, MUST_EXIST, false);
|
||||
@ -178,7 +178,7 @@ function xmldb_main_install() {
|
||||
$guest->timemodified= time();
|
||||
$guest->id = $DB->insert_record('user', $guest);
|
||||
if ($guest->id != 1) {
|
||||
throw new moodle_exception('generalexceptionmessage', 'error', '', 'Unexpected new guest user id!');
|
||||
echo $OUTPUT->notification('Unexpected id generated for the Guest account. Your database configuration or clustering setup may not be fully supported', 'notifyproblem');
|
||||
}
|
||||
// Store guest id
|
||||
set_config('siteguest', $guest->id);
|
||||
@ -201,10 +201,15 @@ function xmldb_main_install() {
|
||||
$admin->timemodified = time();
|
||||
$admin->lastip = CLI_SCRIPT ? '0.0.0.0' : getremoteaddr(); // installation hijacking prevention
|
||||
$admin->id = $DB->insert_record('user', $admin);
|
||||
|
||||
if ($admin->id != 2) {
|
||||
throw new moodle_exception('generalexceptionmessage', 'error', '', 'Unexpected new admin user id!');
|
||||
echo $OUTPUT->notification('Unexpected id generated for the Admin account. Your database configuration or clustering setup may not be fully supported', 'notifyproblem');
|
||||
}
|
||||
// Store list of admins
|
||||
if ($admin->id != ($guest->id + 1)) {
|
||||
echo $OUTPUT->notification('Nonconsecutive id generated for the Admin account. Your database configuration or clustering setup may not be fully supported.', 'notifyproblem');
|
||||
}
|
||||
|
||||
/// Store list of admins
|
||||
set_config('siteadmins', $admin->id);
|
||||
// Make sure user context exists
|
||||
context_user::instance($admin->id);
|
||||
|
Loading…
x
Reference in New Issue
Block a user