Index: webform_report.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/webform_report/webform_report.module,v
retrieving revision 1.2.2.66
diff -u -r1.2.2.66 webform_report.module
--- webform_report.module	22 Mar 2010 16:45:06 -0000	1.2.2.66
+++ webform_report.module	29 Mar 2010 15:38:23 -0000
@@ -72,10 +72,18 @@
       // this query deals with node objects
       $return = array();
       if (!user_access('access webform reports')) {
-        if ($primary_table != 'n') {
+        if ($primary_table != 'n' && $primary_table != 'node') {
           $return['join'] = "LEFT JOIN {node} n ON $primary_table.nid = n.nid";
+          $return['where'] = "n.type <> 'webform_report'";
+        }
+        else {
+          if ($primary_table == 'n') {
+            $return['where'] = "n.type <> 'webform_report'";
+          }
+          if ($primary_table == 'node') {
+            $return['where'] = "node.type <> 'webform_report'";
+          }
         }
-        $return['where'] = "n.type <> 'webform_report'";
         return $return;
       }
       break;
@@ -469,7 +477,7 @@
  * in an associative array
  */
 function _webform_report_get_webforms($first = NULL) {
-  $result = db_query(db_rewrite_sql("SELECT nid FROM {node} n WHERE type = 'webform'"));
+  $result = db_query(db_rewrite_sql("SELECT nid FROM {node} n WHERE n.type = 'webform'"));
 
   $webforms = array(0 => $first);
   while ($row = db_fetch_object($result)) {
@@ -810,7 +818,7 @@
                           'colspan' => '4')
                     );
 
-    $result = db_query(db_rewrite_sql("SELECT nid, title FROM {node} n WHERE type='webform_report'"));
+    $result = db_query(db_rewrite_sql("SELECT nid, title FROM {node} n WHERE n.type='webform_report'"));
 
     while ($node = db_fetch_object($result)) {
       $rows[] = array(l($node->title,'node/' . $node->nid),