From df7bcec717ad586b35b42dc850775e097ce384cc Mon Sep 17 00:00:00 2001 From: Angie Byron Date: Wed, 3 Sep 2008 12:04:49 +0000 Subject: #302395 by chx: Minor DBTNG clean-up. --- includes/database/database.inc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'includes/database/database.inc') diff --git a/includes/database/database.inc b/includes/database/database.inc index ea95fc331..2dafd3d2e 100644 --- a/includes/database/database.inc +++ b/includes/database/database.inc @@ -250,7 +250,7 @@ abstract class DatabaseConnection extends PDO { /** * Prepare a query string and return the prepared statement. - * + * * This method statically caches prepared statements, reusing them when * possible. It also prefixes tables names enclosed in curly-braces. * @@ -712,7 +712,7 @@ abstract class Database { * TRUE if there is at least one database connection established, FALSE otherwise. */ final public static function isActiveConnection() { - return !empty(self::$connections); + return !empty(self::$activeKey) && !empty(self::$connections) && !empty(self::$connections[self::$activeKey]); } /** @@ -1356,7 +1356,7 @@ function db_escape_table($table) { * query: the SQL query executed, passed through check_plain() */ function update_sql($sql) { - $result = Database::getActiveConnection()->query($sql/*, array(true)*/); + $result = Database::getActiveConnection()->query($sql); return array('success' => $result !== FALSE, 'query' => check_plain($sql)); } -- cgit v1.2.3