Index: pift.cron.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/project_issue_file_test/pift.cron.inc,v
retrieving revision 1.39
diff -u -r1.39 pift.cron.inc
--- pift.cron.inc	12 Nov 2009 20:11:26 -0000	1.39
+++ pift.cron.inc	13 Nov 2009 05:28:44 -0000
@@ -23,35 +23,38 @@
   // Only attempt query if both values are not empty.
   if ($api_versions && $sids) {
     $retest_time = time() - PIFT_RETEST;
-    db_query("UPDATE {pift_test}
-              SET status = %d
-              WHERE type = %d
-              AND id IN (
-                SELECT f.fid
-                FROM {files} f
-                LEFT JOIN {upload} u
-                  ON f.fid = u.fid
-                LEFT JOIN {comment_upload} cu
-                  ON f.fid = cu.fid
-
-                JOIN {project_issues} pi
-                  ON (u.nid = pi.nid OR cu.nid = pi.nid)
-                JOIN {pift_project} p
-                  ON pi.pid = p.pid
-                JOIN {project_release_nodes} r
-                  ON pi.rid = r.nid
-
-                JOIN {node} n
-                  ON r.nid = n.nid
-                JOIN {term_node} t
-                  ON (n.vid = t.vid AND t.tid IN(" . db_placeholders($api_versions, 'int') . "))
-
-                WHERE pi.sid IN (" . db_placeholders($sids, 'int') . ")
-              )
-              AND status > %d
-              AND last_tested < %d",
-              array_merge(array(PIFT_STATUS_QUEUE, PIFT_TYPE_FILE), $api_versions, $sids,
-                          array(PIFT_STATUS_SENT, $retest_time)));
+
+    foreach (array('u.nid = pi.nid', 'cu.nid = pi.nid') as $clause) {
+      db_query("UPDATE {pift_test}
+                SET status = %d
+                WHERE type = %d
+                AND id IN (
+                  SELECT f.fid
+                  FROM {files} f
+                  LEFT JOIN {upload} u
+                    ON f.fid = u.fid
+                  LEFT JOIN {comment_upload} cu
+                    ON f.fid = cu.fid
+
+                  JOIN {project_issues} pi
+                    ON " . $clause . "
+                  JOIN {pift_project} p
+                    ON pi.pid = p.pid
+                  JOIN {project_release_nodes} r
+                    ON pi.rid = r.nid
+
+                  JOIN {node} n
+                    ON r.nid = n.nid
+                  JOIN {term_node} t
+                    ON (n.vid = t.vid AND t.tid IN(" . db_placeholders($api_versions, 'int') . "))
+
+                  WHERE pi.sid IN (" . db_placeholders($sids, 'int') . ")
+                )
+                AND status > %d
+                AND last_tested < %d",
+                array_merge(array(PIFT_STATUS_QUEUE, PIFT_TYPE_FILE), $api_versions, $sids,
+                            array(PIFT_STATUS_SENT, $retest_time)));
+    }
   }
 }