--- C:\Documents and Settings\acfulton\Desktop\jobtrack\jobtrack.user.inc	2009-03-20 10:09:44.416349500 +1300
+++ C:\Documents and Settings\acfulton\Desktop\jobtrack\jobtrack.user.inc.old	2009-02-19 02:47:42.000000000 +1300
@@ -25,17 +25,16 @@
     $header[] = array('data' => t('Client'), 'field' => 't.client');
   }
 
-  $sql = "SELECT DISTINCT(n.nid), n.title, n.type, n.changed, n.uid, u.name, GREATEST(n.changed, l.last_comment_timestamp) AS last_updated, l.comment_count, t.state, t.priority, t.client FROM {node} n LEFT JOIN {jobtrack_ticket} t ON n.nid = t.nid INNER JOIN {node_comment_statistics} l ON n.nid = l.nid INNER JOIN {users} u ON n.uid = u.uid LEFT JOIN {comments} c ON n.nid = c.nid WHERE (c.status = ". COMMENT_PUBLISHED ." OR c.status IS NULL) AND n.status = 1 AND n.type = 'jobtrack_ticket'";
+  $sql = "SELECT DISTINCT(n.nid), n.title, n.type, n.changed, n.uid, u.name, GREATEST(n.changed, l.last_comment_timestamp) AS last_updated, l.comment_count, t.state, t.priority, t.client FROM {node} n LEFT JOIN {jobtrack_ticket} t ON n.nid = t.nid INNER JOIN {node_comment_statistics} l ON n.nid = l.nid INNER JOIN {users} u ON n.uid = u.uid LEFT JOIN {comments} c ON n.nid = c.nid WHERE (c.status = ". COMMENT_PUBLISHED ." OR c.status IS NULL) AND n.status = 1 AND n.type = 'jobtrack_ticket' AND (n.uid = $user->uid OR c.uid = $user->uid)";
   if ($assigned) {
     $sql .= " AND t.assigned = $user->uid";
   }
   $sql = db_rewrite_sql($sql);
-
-  $sql_count = 'SELECT COUNT(DISTINCT(n.nid)) FROM {node} n LEFT JOIN {comments} c ON n.nid = c.nid AND (c.status = %d OR c.status IS NULL) WHERE n.status = 1';
+  $sql_count = 'SELECT COUNT(DISTINCT(n.nid)) FROM {node} n LEFT JOIN {comments} c ON n.nid = c.nid AND (c.status = %d OR c.status IS NULL) WHERE n.status = 1 AND (n.uid = %d OR c.uid = %d)';
   $sql_count = db_rewrite_sql($sql_count);
 
   $sql .= tablesort_sql($header);
-  $result = pager_query($sql, 50, 0);
+  $result = pager_query($sql, 50, 0, $sql_count);
   $row = 0;
   $rows = array();
   while ($ticket = db_fetch_object($result)) {
@@ -59,5 +58,5 @@
     }
     $row++;
   }
-  return theme('table', $header, $rows, array('class' => 'jobtrack')) . theme('pager');
+  return theme('table', $header, $rows, array('class' => 'jobtrack'));
 }