--- quota_by_role.module	2008-01-17 12:26:11.000000000 +0100
+++ quota_by_role.module	2008-02-07 17:53:47.646984944 +0100
@@ -87,7 +87,7 @@
   );
 
   // Select all current defined user quotas
-  $sql_result_object = db_query("SELECT q.*, r.name FROM {quota_by_role_rules q, role r} WHERE q.rid = r.rid ORDER BY q.weight asc");
+  $sql_result_object = db_query("SELECT q.*, r.name FROM {quota_by_role_rules} q, {role} r WHERE q.rid = r.rid ORDER BY q.weight asc");
   $rows = array();
   while($r = db_fetch_object($sql_result_object)) {
     // Convert time back into string
@@ -239,7 +239,7 @@
   $user_roles = $user->roles;
 
   // Retrieve list of all the quota_by_role
-  $sql_result_object = db_query("SELECT q.*, r.name FROM {quota_by_role_rules q, role r} WHERE q.rid = r.rid ORDER BY q.weight ASC");
+  $sql_result_object = db_query("SELECT q.*, r.name FROM {quota_by_role_rules} q, {role} r WHERE q.rid = r.rid ORDER BY q.weight ASC");
   while($r = db_fetch_object($sql_result_object)) {
    
     // Now we need to do a node create count for every role in the quota_by_role array
@@ -288,8 +288,8 @@
 // Fetches the count of content type
 function _quota_by_role_fetch_count($table, $per, $uid) {
   switch ($table) {
-    case 'node' : return db_query("SELECT COUNT(*) AS cnt FROM {node t} WHERE t.created >= %d AND t.uid = %d", time() - $per, $uid); break;
-    case 'comments' : return db_query("SELECT COUNT(*) AS cnt FROM {comments t} WHERE t.timestamp >= %d AND t.uid = %d", time() - $per, $uid); break;
+    case 'node' : return db_query("SELECT COUNT(*) AS cnt FROM {node} t WHERE t.created >= %d AND t.uid = %d", time() - $per, $uid); break;
+    case 'comments' : return db_query("SELECT COUNT(*) AS cnt FROM {comments} t WHERE t.timestamp >= %d AND t.uid = %d", time() - $per, $uid); break;
   }
 } 
 
