diff options
| -rw-r--r-- | includes/database.mysql.inc | 12 | ||||
| -rw-r--r-- | includes/database.pgsql.inc | 12 |
2 files changed, 6 insertions, 18 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; diff --git a/includes/database.pgsql.inc b/includes/database.pgsql.inc index 46acbe14a..c418c2dd9 100644 --- a/includes/database.pgsql.inc +++ b/includes/database.pgsql.inc @@ -59,22 +59,16 @@ function db_connect($url) { * Helper function for db_query(). */ function _db_query($query, $debug = 0) { - global $active_db, $last_result; - global $queries; - static $dev_query; + global $active_db, $last_result, $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; } $last_result = pg_query($active_db, $query); - if ($dev_query) { + if (variable_get('dev_query', 0)) { list($usec, $sec) = explode(' ', microtime()); $stop = (float)$usec + (float)$sec; $diff = $stop - $timer; |