4 files changed, 6 insertions, 2 deletions
diff --git a/modules/system.module b/modules/system.module
index d9d5c633c..f84c204f8 100644
--- a/modules/system.module
+++ b/modules/system.module
@@ -72,6 +72,8 @@ function system_view_options() {
   // development settings:
   $output .= "<h3>Development settings</h3>\n";
   $output .= form_select("Display timer information", "dev_timer", variable_get("dev_timer", 0), array("Disabled", "Enabled"), "Display the time it took to generate a page.  For Drupal development only.");
+  $output .= form_select("Display query log", "dev_query", variable_get("dev_query", 0), array("Disabled", "Enabled"), "Display a log of the database queries needed to generate the current page.");
+
   $output .= "<hr />\n";
 
   foreach (module_list() as $name) {
diff --git a/modules/system/system.module b/modules/system/system.module
index d9d5c633c..f84c204f8 100644
--- a/modules/system/system.module
+++ b/modules/system/system.module
@@ -72,6 +72,8 @@ function system_view_options() {
   // development settings:
   $output .= "<h3>Development settings</h3>\n";
   $output .= form_select("Display timer information", "dev_timer", variable_get("dev_timer", 0), array("Disabled", "Enabled"), "Display the time it took to generate a page.  For Drupal development only.");
+  $output .= form_select("Display query log", "dev_query", variable_get("dev_query", 0), array("Disabled", "Enabled"), "Display a log of the database queries needed to generate the current page.");
+
   $output .= "<hr />\n";
 
   foreach (module_list() as $name) {
diff --git a/modules/user.module b/modules/user.module
index 6e0e0a943..f4e8f9cac 100644
--- a/modules/user.module
+++ b/modules/user.module
@@ -65,7 +65,7 @@ function user_load($array = array()) {
       $query .= "u.$key = '". addslashes($value) ."' AND ";
     }
   }
-  $result = db_query("SELECT u.*, r.perm FROM users u LEFT JOIN role r ON u.role = r.name WHERE $query u.status < 3");
+  $result = db_query("SELECT u.*, r.perm FROM users u LEFT JOIN role r ON u.role = r.name WHERE $query u.status < 3 LIMIT 1");
 
   $user = db_fetch_object($result);
 
diff --git a/modules/user/user.module b/modules/user/user.module
index 6e0e0a943..f4e8f9cac 100644
--- a/modules/user/user.module
+++ b/modules/user/user.module
@@ -65,7 +65,7 @@ function user_load($array = array()) {
       $query .= "u.$key = '". addslashes($value) ."' AND ";
     }
   }
-  $result = db_query("SELECT u.*, r.perm FROM users u LEFT JOIN role r ON u.role = r.name WHERE $query u.status < 3");
+  $result = db_query("SELECT u.*, r.perm FROM users u LEFT JOIN role r ON u.role = r.name WHERE $query u.status < 3 LIMIT 1");
 
   $user = db_fetch_object($result);