- Patch #18213 by chx: boostrap system. Modified to work with HEAD, tidied

  up the documentation a little.

  chx: can you double-check whether the global $conf variable is secure?
       (That is, make sure it can't be send using the URL or something.)

1 files changed, 7 insertions, 2 deletions

diff --git a/includes/database.pgsql.inc b/includes/database.pgsql.inc
index 15eda4d83..9e4ecf21b 100644
--- a/includes/database.pgsql.inc
+++ b/includes/database.pgsql.inc
@@ -36,15 +36,20 @@ function db_connect($url) {
 function _db_query($query, $debug = 0) {
   global $active_db, $last_result;
   global $queries;
+  static $dev_query;
 
-  if (variable_get('dev_query', 0)) {
+  if (!isset($dev_query)) {
+    $dev_query = function_exists('dev_query') ? variable_get('dev_query', 0) : $GLOBALS['conf']['dev_query'];
+  }
+
+  if ($dev_query) {
     list($usec, $sec) = explode(' ', microtime());
     $timer = (float)$usec + (float)$sec;
   }
 
   $last_result = pg_query($active_db, $query);
 
-  if (variable_get('dev_query', 0)) {
+  if ($dev_query) {
     list($usec, $sec) = explode(' ', microtime());
     $stop = (float)$usec + (float)$sec;
     $diff = $stop - $timer;