MDL-9796 environment - make install & upgrade to ignore dataroot xml file (ENV_SELECT...

diff --git a/admin/cliupgrade.php b/admin/cliupgrade.php
index 619826afb2b24c8725c6aa46272b6b2c7a2441e4..aced5b844997a440c5c6e93b3f123d32611a65a6 100644 (file)
--- a/admin/cliupgrade.php
+++ b/admin/cliupgrade.php
@@ -488,8 +488,8 @@ if (!file_exists(dirname(dirname(__FILE__)) . '/config.php')) {
     //check connection to database
 
     if ($dbconnected) {
-        /// Execute environment check, printing results
-        if (!check_moodle_environment($INSTALL['release'], $environment_results, false)) {
+        /// Execute environment check, not printing results
+        if (!check_moodle_environment($INSTALL['release'], $environment_results, false, ENV_SELECT_RELEASE)) {
             $errormsg = get_string('errorsinenvironment', 'install') . "\n";
         }
     } else {
@@ -904,7 +904,7 @@ if ( file_exists(dirname(dirname(__FILE__)) . '/config.php')) {
                 require_once($CFG->libdir.'/environmentlib.php');
 
                 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
                     if ($verbose > CLI_NO) {
                         print_newline();

diff --git a/admin/index.php b/admin/index.php
index 37cabfa58e4bc23b4d29537e296f6d3857012638..37354978349802f8bd4f4ce288134381a412b03a 100644 (file)
--- a/admin/index.php
+++ b/admin/index.php
@@ -135,7 +135,7 @@
             print_box($releasenoteslink, 'generalbox boxaligncenter boxwidthwide');
 
             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");
             } else {
                 notify(get_string('environmentok', 'admin'), 'notifysuccess');
@@ -221,7 +221,7 @@
 
             require_once($CFG->libdir.'/environmentlib.php');
             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');
             } else {
                 notify(get_string('environmentok', 'admin'), 'notifysuccess');