Fix #6661 - modify hooks to update timeshetet

[web.mtrack] / MTrackWeb / Hook / git.php

diff --git a/MTrackWeb/Hook/git.php b/MTrackWeb/Hook/git.php
index 28b10e3..ce00629 100755 (executable)
--- a/MTrackWeb/Hook/git.php
+++ b/MTrackWeb/Hook/git.php
@@ -73,7 +73,7 @@ class MTrackWeb_Hook_git extends MTrackWeb
             
             $who = $revs[0]->changebyToEmail();
             
-            $this->authUser = DB_DataObject::factory('Person');
+            $this->authUser = DB_DataObject::factory('core_person');
             $this->authUser->get('email', $who); 
             
             $cfg = HTML_FlexyFramework::get()->MTrackWeb;
@@ -89,7 +89,6 @@ class MTrackWeb_Hook_git extends MTrackWeb
                     'authUser' => $this->authUser,
             ));
              
-             
             switch ($action) {
                 
                 case 'pre':
@@ -110,8 +109,9 @@ class MTrackWeb_Hook_git extends MTrackWeb
                         if (!$res) {
                             echo "Skip - commit already exists\n";
                         }
-                        
                     }
+                    
+                    // in our system this happens when we merge normally.
                     foreach($checker->deferred as $ticket=> $info) {
                         foreach($info['changes'] as $ev) {
                             $cg = DB_DataObject::factory('mtrack_change');