moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-05 08:56:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'MDL-64561-master-test' of git://github.com/rezaies/moodle

Browse source
This commit is contained in:
Andrew Nicols 2019-02-25 15:50:56 +08:00
commit 77f404ffd3
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
admin/cli/install_database.php
View file

@ -82,11 +82,6 @@ require_once($CFG->libdir.'/installlib.php');
require_once($CFG->libdir.'/adminlib.php'); require_once($CFG->libdir.'/adminlib.php');
require_once($CFG->libdir.'/componentlib.class.php'); require_once($CFG->libdir.'/componentlib.class.php');
// make sure no tables are installed yet
if ($DB->get_tables() ) {
cli_error(get_string('clitablesexist', 'install'));
}
$CFG->early_install_lang = true; $CFG->early_install_lang = true;
get_string_manager(true); get_string_manager(true);
@ -109,12 +104,17 @@ list($options, $unrecognized) = cli_get_params(
) )
); );
// We show help text even if tables are installed.
if ($options['help']) { if ($options['help']) {
echo $help; echo $help;
die; die;
} }
// Make sure no tables are installed yet.
if ($DB->get_tables() ) {
cli_error(get_string('clitablesexist', 'install'));
}
if (!$options['agree-license']) { if (!$options['agree-license']) {
cli_error('You have to agree to the license. --help prints out the help'); // TODO: localize cli_error('You have to agree to the license. --help prints out the help'); // TODO: localize
} }