MDL-14864 Removed old $db variable, replaced by global $DB. This was breaking install...

diff --git a/install.php b/install.php
index dbece00c0d0d844af6509481f863d433a3e7ccec..eb3413a0a060e8f9dbca6197bde47a0f3a3f556a 100644 (file)
--- a/install.php
+++ b/install.php
@@ -643,7 +643,7 @@ if ($nextstage == SAVE) {
 //==========================================================================//
 
 function form_table($nextstage, $formaction, $databases) {
-    global $INSTALL;
+    global $INSTALL, $DB;
 
     /// Print the standard form if we aren't in the DOWNLOADLANG page
     /// because it has its own form.
@@ -794,7 +794,7 @@ function form_table($nextstage, $formaction, $databases) {
                 <td colspan="2">
                 <?php
                     error_reporting(0);  // Hide errors
-                    $dbconnected = $db->Connect($INSTALL['dbhost'],$INSTALL['dbuser'],$INSTALL['dbpass'],$INSTALL['dbname']);
+                    $dbconnected = $DB->Connect($INSTALL['dbhost'],$INSTALL['dbuser'],$INSTALL['dbpass'],$INSTALL['dbname'], false, $INSTALL['prefix']);
                     error_reporting(38911);  // Show errors
                     if ($dbconnected) {
                     /// Execute environment check, printing results