Merge branch 'master' of /home/git/private/web.mtrack

[web.mtrack] / MTrack / Watch.php

diff --git a/MTrack/Watch.php b/MTrack/Watch.php
index 3953e52..e5034e1 100644 (file)
--- a/MTrack/Watch.php
+++ b/MTrack/Watch.php
@@ -166,10 +166,10 @@ HTML;
     $changesets_by_repo_and_rev = array();
     $related_projects = array();
 
-    foreach (MTrackDB::q('select repoid from repos')
-        ->fetchAll(PDO::FETCH_COLUMN, 0) as $repoid) {
-      $repo = MTrackRepo::loadById($repoid);
-      $repo_by_id[$repoid] = $repo;
+    foreach (MTrackDB::q('select id from repos')
+        ->fetchAll(PDO::FETCH_COLUMN, 0) as $id) {
+      $repo = MTrack_Repo::loadById($id);
+      $repo_by_id[$id] = $repo;
 
       foreach ($repo->history(null, MTrackDB::unixtime($last)) as $e) {
         /* SCM doesn't always respect our date range */
@@ -316,7 +316,7 @@ HTML;
           }
 
           if (isset($CS->ent)) {
-            $CS->_related[] = array('repo', $CS->ent->repo->repoid);
+            $CS->_related[] = array('repo', $CS->ent->repo->id);
           }
           if (isset($proj_by_tid[$tid])) {
             foreach ($proj_by_tid[$tid] as $pid) {
@@ -337,7 +337,7 @@ HTML;
       }
     }
     foreach ($changesets_by_repo_and_rev as $ent) {
-      $ent->_related[] = array('repo', $ent->repo->repoid);
+      $ent->_related[] = array('repo', $ent->repo->id);
     }
 
     /* having determined all changed items, make a pass through to determine
@@ -411,7 +411,7 @@ HTML;
       foreach ($items as $key => $obj) {
         if ($obj instanceof MTrackSCMEvent) {
           /* group by repo */
-          $nkey = "repo:" . $obj->repo->repoid;
+          $nkey = "repo:" . $obj->repo->id;
         } else {
           $nkey = $obj->object;
         }