diff options
author | Steven Wittens <steven@10.no-reply.drupal.org> | 2005-07-30 18:01:51 +0000 |
---|---|---|
committer | Steven Wittens <steven@10.no-reply.drupal.org> | 2005-07-30 18:01:51 +0000 |
commit | 897aae3e31d4bf0a3890fafab6322adf53f738da (patch) | |
tree | 3f51da9e8315ab6861693744359211f79e793e1c /includes/database.mysql.inc | |
parent | 017e3d148acc67b1bdf6972257cdb392d815cc16 (diff) | |
download | brdo-897aae3e31d4bf0a3890fafab6322adf53f738da.tar.gz brdo-897aae3e31d4bf0a3890fafab6322adf53f738da.tar.bz2 |
- #27846: Clean up dev_query code in db_query()
Diffstat (limited to 'includes/database.mysql.inc')
-rw-r--r-- | includes/database.mysql.inc | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/includes/database.mysql.inc b/includes/database.mysql.inc index 22012d432..27d195bc3 100644 --- a/includes/database.mysql.inc +++ b/includes/database.mysql.inc @@ -72,22 +72,16 @@ function db_connect($url) { * Helper function for db_query(). */ function _db_query($query, $debug = 0) { - global $active_db; - global $queries; - static $dev_query; + global $active_db, $queries; - if (!isset($dev_query)) { - $dev_query = function_exists('dev_query') ? variable_get('dev_query', 0) : $GLOBALS['conf']['dev_query']; - } - - if ($dev_query) { + if (variable_get('dev_query', 0)) { list($usec, $sec) = explode(' ', microtime()); $timer = (float)$usec + (float)$sec; } $result = mysql_query($query, $active_db); - if ($dev_query) { + if (variable_get('dev_query', 0)) { list($usec, $sec) = explode(' ', microtime()); $stop = (float)$usec + (float)$sec; $diff = $stop - $timer; |