From bc440080560ba18d2371320334aa37619489f00f Mon Sep 17 00:00:00 2001 From: cash Date: Wed, 20 Oct 2010 11:24:41 +0000 Subject: 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 --- engine/lib/database.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'engine/lib/database.php') diff --git a/engine/lib/database.php b/engine/lib/database.php index 34ff3b305..76ca6c193 100644 --- 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); } -- cgit v1.2.3