L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MDL-9796 install - delete dataroot's env info (shouldn't exist) to force check against released one

Browse Source
This commit is contained in:
stronk7
2009-02-14 11:03:42 +00:00
parent ac04258a92
commit d3d4056087
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
install.php
+3 -1
View File
@@ -427,7 +427,8 @@ if ($INSTALL['stage'] == ENVIRONMENT) {
$dbconnected = $db->Connect($INSTALL['dbhost'],$INSTALL['dbuser'],$INSTALL['dbpass'],$INSTALL['dbname']);
error_reporting(7); // Show errors
if ($dbconnected) {
/// Execute environment check, printing results
/// Execute environment check, not printing results
@remove_dir($INSTALL['dataroot'] . '/environment'); /// Always delete downloaded env. info to force use of the released one. MDL-9796
if (!check_moodle_environment($INSTALL['release'], $environment_results, false)) {
$nextstage = ENVIRONMENT;
}
@@ -867,6 +868,7 @@ function form_table($nextstage = WELCOME, $formaction = "install.php") {
error_reporting(7); // Show errors
if ($dbconnected) {
/// Execute environment check, printing results
@remove_dir($INSTALL['dataroot'] . '/environment'); /// Always delete downloaded env. info to force use of the released one. MDL-9796
check_moodle_environment($INSTALL['release'], $environment_results, true);
} else {
/// We never should reach this because DB has been tested before arriving here