Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

#302395 by chx: Minor DBTNG clean-up.

merge-requests/26/head
Angie Byron 2008-09-03 12:04:49 +00:00
parent c17a5e70bc
commit df7bcec717
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
includes/database/database.inc
View File

@ -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));
}