aboutsummaryrefslogtreecommitdiff
path: root/engine/lib/database.php
diff options
context:
space:
mode:
authorbrettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-11-03 19:46:47 +0000
committerbrettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-11-03 19:46:47 +0000
commit998a39940b27561d7a2e98b68c8929dab68fe62f (patch)
tree79e73eb7bd8ae843609a2f4f0a526377800430e1 /engine/lib/database.php
parent4b3749440c560da36b7deadcee65133062fd10a1 (diff)
downloadelgg-998a39940b27561d7a2e98b68c8929dab68fe62f.tar.gz
elgg-998a39940b27561d7a2e98b68c8929dab68fe62f.tar.bz2
Refs #1320. Updated core to use elgg_echo()'s native string replacement.
git-svn-id: http://code.elgg.org/elgg/trunk@7227 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'engine/lib/database.php')
-rw-r--r--engine/lib/database.php8
1 files changed, 4 insertions, 4 deletions
diff --git a/engine/lib/database.php b/engine/lib/database.php
index 16efb5874..4a99afea1 100644
--- a/engine/lib/database.php
+++ b/engine/lib/database.php
@@ -95,13 +95,13 @@ function establish_db_link($dblinkname = "readwrite") {
// Connect to database
if (!$dblink[$dblinkname] = mysql_connect($dbhost, $dbuser, $dbpass, true)) {
- $msg = sprintf(elgg_echo('DatabaseException:WrongCredentials'),
- $dbuser, $dbhost, "****");
+ $msg = elgg_echo('DatabaseException:WrongCredentials',
+ array($dbuser, $dbhost, "****"));
throw new DatabaseException($msg);
}
if (!mysql_select_db($dbname, $dblink[$dblinkname])) {
- $msg = sprintf(elgg_echo('DatabaseException:NoConnect'), $dbname);
+ $msg = elgg_echo('DatabaseException:NoConnect', array($dbname));
throw new DatabaseException($msg);
}
@@ -640,7 +640,7 @@ function run_sql_script($scriptlocation) {
throw new DatabaseException($msg);
}
} else {
- $msg = sprintf(elgg_echo('DatabaseException:ScriptNotFound'), $scriptlocation);
+ $msg = elgg_echo('DatabaseException:ScriptNotFound', array($scriptlocation));
throw new DatabaseException($msg);
}
}