From d3d4056087222a439a1db5fa5f9ceaed5f5b3da2 Mon Sep 17 00:00:00 2001
From: stronk7 <stronk7>
Date: Sat, 14 Feb 2009 11:03:42 +0000
Subject: [PATCH] MDL-9796 install - delete dataroot's env info (shouldn't
 exist) to force check against released one

---
 install.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/install.php b/install.php
index 25f77e0d849..895d448090e 100644
--- a/install.php
+++ b/install.php
@@ -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