Refs #2474 - merged [6976] from 1.7 branch into trunk

git-svn-id: http://code.elgg.org/elgg/trunk@7103 36083f99-b078-4883-b0ff-0f9b5a30f544

diff --git a/engine/lib/database.php b/engine/lib/database.php
index 34ff3b305e8b77912a406a232217869cd36efbbe..76ca6c1938d8bf5d01960e13c45b18ea20fa388c 100644 (file)
--- a/engine/lib/database.php
+++ b/engine/lib/database.php
@@ -91,14 +91,14 @@ function establish_db_link($dblinkname = "readwrite") {
        }
 
        // Connect to database
-       if (!$dblink[$dblinkname] = mysql_connect($CONFIG->dbhost, $CONFIG->dbuser, $CONFIG->dbpass, true)) {
+       if (!$dblink[$dblinkname] = mysql_connect($dbhost, $dbuser, $dbpass, true)) {
                $msg = sprintf(elgg_echo('DatabaseException:WrongCredentials'),
-                               $CONFIG->dbuser, $CONFIG->dbhost, "****");
+                               $dbuser, $dbhost, "****");
                throw new DatabaseException($msg);
        }
 
-       if (!mysql_select_db($CONFIG->dbname, $dblink[$dblinkname])) {
-               $msg = sprintf(elgg_echo('DatabaseException:NoConnect'), $CONFIG->dbname);
+       if (!mysql_select_db($dbname, $dblink[$dblinkname])) {
+               $msg = sprintf(elgg_echo('DatabaseException:NoConnect'), $dbname);
                throw new DatabaseException($msg);
        }