diff options
| author | cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2010-10-20 11:24:41 +0000 |
|---|---|---|
| committer | cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2010-10-20 11:24:41 +0000 |
| commit | bc440080560ba18d2371320334aa37619489f00f (patch) | |
| tree | 14d3ee73bd47d67fd129b7a928a04d9b3422168e | |
| parent | 81c1ee6e7d08ece79919fe7fd438f07f89d00eed (diff) | |
| download | elgg-bc440080560ba18d2371320334aa37619489f00f.tar.gz elgg-bc440080560ba18d2371320334aa37619489f00f.tar.bz2 | |
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
| -rw-r--r-- | engine/lib/database.php | 8 |
1 files changed, 4 insertions, 4 deletions
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); } |