--- week.module	29 Jun 2006 04:16:25 -0000	1.14.2.2
+++ week.module	30 Jun 2006 02:01:02 -0000
@@ -127,13 +127,15 @@
     $nodes_to_include[$key] = "'". db_escape_string($value) . "'";
   }
   // create the SQL for the query
-  $query_info[0] = db_rewrite_sql('SELECT n.nid FROM {node} n WHERE (n.created >= '.$start_date.') and (n.created <= '.$end_date.') AND (n.status = 1) ');
+  $query_info[0] = 'SELECT n.nid FROM {node} n WHERE (n.created >= '.$start_date.') and (n.created <= '.$end_date.') AND (n.status = 1) ';
   $query_info[0] .= count($nodes_to_include) > 0 ? 'AND n.type IN (' . implode(',', $nodes_to_include) . ') ': '';
   $query_info[0] .= 'ORDER BY n.created '. ($_week_config['week_rev_pagesort'] ? 'ASC' : 'DESC');
+  $query_info[0] = db_rewrite_sql($query_info[0], 'n', 'nid');
   $query_info[1] = $start_date;
   $query_info[2] = $end_date;
-  $query_info[3] = db_rewrite_sql('SELECT COUNT(n.nid) FROM {node} n WHERE (n.created >= '.$start_date.') AND (n.created <= '.$end_date.') AND (n.status = 1) ');
+  $query_info[3] = 'SELECT COUNT(n.nid) FROM {node} n WHERE (n.created >= '.$start_date.') AND (n.created <= '.$end_date.') AND (n.status = 1) ';
   $query_info[3] .= count($nodes_to_include) > 0 ? 'AND n.type IN (' . implode(',', $nodes_to_include) . ') ': '';
+  $query_info[3] = db_rewrite_sql($query_info[3], 'n', 'nid');
   return $query_info;
 }