3 files changed, 22 insertions, 2 deletions
diff --git a/includes/common.inc b/includes/common.inc
index 86a7ae9f7..3e5d6f936 100644
--- a/includes/common.inc
+++ b/includes/common.inc
@@ -422,7 +422,14 @@ function timer_print() {
   global $timer;
   $stop = explode(" ", microtime());
   $diff = $stop[0] - $timer[0];
-  print "<PRE>execution time: $diff ms</PRE>";
+  print "<pre>execution time: $diff ms</pre>";
+}
+
+function query_print() {
+  global $queries;
+  print "<pre>";
+  print_r($queries);
+  print "</pre>";
 }
 
 function page_header() {
@@ -443,6 +450,10 @@ function page_footer() {
     timer_print();
   }
 
+  if (variable_get("dev_query", 0)) {
+    query_print();
+  }
+
   if (variable_get("cache", 0)) {
     cache_set();
   }
diff --git a/includes/database.mysql.inc b/includes/database.mysql.inc
index 1b14da5cd..1dd190077 100644
--- a/includes/database.mysql.inc
+++ b/includes/database.mysql.inc
@@ -10,6 +10,11 @@ function db_connect($url) {
 }
 
 function db_query($query, $debug = 0) {
+  global $queries;
+
+  if (variable_get("dev_query", 0)) {
+    $queries[] = $query;
+  }
 
   $result = mysql_query($query);
 
diff --git a/includes/database.pear.inc b/includes/database.pear.inc
index c0aeb9b7e..c48ffbb35 100644
--- a/includes/database.pear.inc
+++ b/includes/database.pear.inc
@@ -16,7 +16,11 @@ function db_connect($url) {
 }
 
 function db_query($query, $debug = 0) {
-  global $db_handle;
+  global $db_handle, $queries;
+
+  if (variable_get("dev_query", 0)) {
+    $queries[] = $query;
+  }
 
   $result = $db_handle->query($query);