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

MDL-9796 environment - make install & upgrade to ignore dataroot xml file (ENV_SELECT_RELEASE)

Browse source
This commit is contained in:
stronk7 2009-02-14 23:12:04 +00:00
parent 829fa07417
commit 493c3651bf
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
admin/cliupgrade.php
View file

@ -488,8 +488,8 @@ if (!file_exists(dirname(dirname(__FILE__)) . '/config.php')) {
//check connection to database //check connection to database
if ($dbconnected) { if ($dbconnected) {
/// Execute environment check, printing results /// Execute environment check, not printing results
if (!check_moodle_environment($INSTALL['release'], $environment_results, false)) { if (!check_moodle_environment($INSTALL['release'], $environment_results, false, ENV_SELECT_RELEASE)) {
$errormsg = get_string('errorsinenvironment', 'install') . "\n"; $errormsg = get_string('errorsinenvironment', 'install') . "\n";
} }
} else { } else {
@ -904,7 +904,7 @@ if ( file_exists(dirname(dirname(__FILE__)) . '/config.php')) {
require_once($CFG->libdir.'/environmentlib.php'); require_once($CFG->libdir.'/environmentlib.php');
console_write('environment', 'admin'); console_write('environment', 'admin');
if (!check_moodle_environment($release, $environment_results, false)) { if (!check_moodle_environment($release, $environment_results, false, ENV_SELECT_RELEASE)) {
// Print Environment Status // Print Environment Status
if ($verbose > CLI_NO) { if ($verbose > CLI_NO) {
print_newline(); print_newline();

4
admin/index.php
View file

@ -135,7 +135,7 @@
print_box($releasenoteslink, 'generalbox boxaligncenter boxwidthwide'); print_box($releasenoteslink, 'generalbox boxaligncenter boxwidthwide');
require_once($CFG->libdir.'/environmentlib.php'); require_once($CFG->libdir.'/environmentlib.php');
if (!check_moodle_environment($release, $environment_results, true)) { if (!check_moodle_environment($release, $environment_results, true, ENV_SELECT_RELEASE)) {
print_upgrade_reload("index.php?agreelicense=1&lang=$CFG->lang"); print_upgrade_reload("index.php?agreelicense=1&lang=$CFG->lang");
} else { } else {
notify(get_string('environmentok', 'admin'), 'notifysuccess'); notify(get_string('environmentok', 'admin'), 'notifysuccess');
@ -221,7 +221,7 @@
require_once($CFG->libdir.'/environmentlib.php'); require_once($CFG->libdir.'/environmentlib.php');
print_heading(get_string('environment', 'admin')); print_heading(get_string('environment', 'admin'));
if (!check_moodle_environment($release, $environment_results, true)) { if (!check_moodle_environment($release, $environment_results, true, ENV_SELECT_RELEASE)) {
print_upgrade_reload('index.php?confirmupgrade=1'); print_upgrade_reload('index.php?confirmupgrade=1');
} else { } else {
notify(get_string('environmentok', 'admin'), 'notifysuccess'); notify(get_string('environmentok', 'admin'), 'notifysuccess');