Permalink
Browse files

MDL-9796 install - delete dataroot's env info (shouldn't exist) to fo…

…rce check against released one
  • Loading branch information...
1 parent ac04258 commit d3d4056087222a439a1db5fa5f9ceaed5f5b3da2 stronk7 committed Feb 14, 2009
Showing with 3 additions and 1 deletion.
  1. +3 −1 install.php
View
@@ -427,7 +427,8 @@
$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

0 comments on commit d3d4056

Please sign in to comment.