MDL-18219 installer - respect $distro->dbtype after downloading langs

diff --git a/install.php b/install.php
index e6661c453fbe234eeaf87bddf98f93e6bdcdae9f..e55088c5e9222865b4f02dfb76d966757639b188 100644 (file)
--- a/install.php
+++ b/install.php
@@ -320,6 +320,47 @@ if ($config->stage == INSTALL_DATABASETYPE) {
 }
 
 
+if ($config->stage == INSTALL_DOWNLOADLANG) {
+    $downloaderror = '';
+
+/// Create necessary lang dir
+    if (!make_upload_directory('lang', false)) {
+        $downloaderror = get_string('cannotcreatelangdir', 'error');
+
+/// Download and install lang component
+    } else if ($cd = new component_installer('http://download.moodle.org', 'lang16', $CFG->lang.'.zip', 'languages.md5', 'lang')) {
+        if ($cd->install() == COMPONENT_ERROR) {
+            if ($cd->get_error() == 'remotedownloaderror') {
+                $a = new stdClass();
+                $a->url  = 'http://download.moodle.org/lang16/'.$INSTALL['language'].'.zip';
+                $a->dest = $CFG->dataroot.'/lang';
+                $downloaderror = get_string($cd->get_error(), 'error', $a);
+            } else {
+                $downloaderror = get_string($cd->get_error(), 'error');
+            }
+        } else {
+            // install parent lang if defined
+            if ($parentlang = get_parent_language()) {
+                if ($cd = new component_installer('http://download.moodle.org', 'lang16', $parentlang.'.zip', 'languages.md5', 'lang')) {
+                    $cd->install();
+                }
+            }
+        }
+    }
+
+    if ($downloaderror !== '') {
+        install_print_header($config, get_string('language'), get_string('langdownloaderror', 'install', $CFG->lang), $downloaderror);
+        install_print_footer($config);
+        die;
+    } else {
+        if (empty($distro->dbtype)) {
+            $config->stage = INSTALL_DATABASETYPE;
+        } else {
+            $config->stage = INSTALL_DATABASE;
+        }
+    }
+}
+
 
 if ($config->stage == INSTALL_DATABASE) {
     $database = moodle_database::get_driver_instance($config->dbtype, 'native');
@@ -375,46 +416,6 @@ if ($config->stage == INSTALL_DATABASE) {
 }
 
 
-
-if ($config->stage == INSTALL_DOWNLOADLANG) {
-    $downloaderror = '';
-
-/// Create necessary lang dir
-    if (!make_upload_directory('lang', false)) {
-        $downloaderror = get_string('cannotcreatelangdir', 'error');
-
-/// Download and install lang component
-    } else if ($cd = new component_installer('http://download.moodle.org', 'lang16', $CFG->lang.'.zip', 'languages.md5', 'lang')) {
-        if ($cd->install() == COMPONENT_ERROR) {
-            if ($cd->get_error() == 'remotedownloaderror') {
-                $a = new stdClass();
-                $a->url  = 'http://download.moodle.org/lang16/'.$INSTALL['language'].'.zip';
-                $a->dest = $CFG->dataroot.'/lang';
-                $downloaderror = get_string($cd->get_error(), 'error', $a);
-            } else {
-                $downloaderror = get_string($cd->get_error(), 'error');
-            }
-        } else {
-            // install parent lang if defined
-            if ($parentlang = get_parent_language()) {
-                if ($cd = new component_installer('http://download.moodle.org', 'lang16', $parentlang.'.zip', 'languages.md5', 'lang')) {
-                    $cd->install();
-                }
-            }
-        }
-    }
-
-    if ($downloaderror !== '') {
-        install_print_header($config, get_string('language'), get_string('langdownloaderror', 'install', $CFG->lang), $downloaderror);
-        install_print_footer($config);
-        die;
-    } else {
-        $config->stage = INSTALL_DATABASETYPE;
-    }
-}
-
-
-
 if ($config->stage == INSTALL_DATABASETYPE) {
     /// Finally ask for DB type
     install_print_header($config, get_string('database', 'install'),