From: Alan Knowles <alan@roojs.com>
Date: Sat, 8 Oct 2016 01:16:26 +0000 (+0800)
Subject: sync
X-Git-Url: http://git.roojs.org/?p=web.mtrack;a=commitdiff_plain;h=7f1fa7bdc277372991525a8b65294f9157eaa25d

sync
---

diff --git a/MTrackWeb/Attachment.php b/MTrackWeb/Attachment.php
index 844d89ae..32e8088b 100644
--- a/MTrackWeb/Attachment.php
+++ b/MTrackWeb/Attachment.php
@@ -1,7 +1,7 @@
 <?php # vim:ts=2:sw=2:et:
 /* For licensing and copyright terms, see the file named LICENSE */
 
-require_once 'MtrackWeb.php';
+require_once 'MTrackWeb.php';
 
 class MTrackWeb_Attachment extends MTrackWeb
 {
@@ -62,4 +62,4 @@ class MTrackWeb_Attachment extends MTrackWeb
     }
     
 }
- 
\ No newline at end of file
+ 
diff --git a/MTrackWeb/Hook/Git/Bridge.php b/MTrackWeb/Hook/Git/Bridge.php
index 9f13e1d5..026258c1 100644
--- a/MTrackWeb/Hook/Git/Bridge.php
+++ b/MTrackWeb/Hook/Git/Bridge.php
@@ -2,6 +2,8 @@
 
 
 // needs to be run from git-recieve (and it has to be the only thing run.
+/*
+require_once 'MTrackWeb/Hook/Bridge.php';
 
 class MTrackWeb_Hook_Git_Bridge extends  MTrackWeb_Hook_Bridge
 {
@@ -15,7 +17,7 @@ class MTrackWeb_Hook_Git_Bridge extends  MTrackWeb_Hook_Bridge
     
     /**
     * fills up repo, files, log, commits by running log on the STDIN
-    */
+    * /
     function __construct($repo) 
     {
         
@@ -110,4 +112,6 @@ class MTrackWeb_Hook_Git_Bridge extends  MTrackWeb_Hook_Bridge
         }
         return join(", ", $cs);
     }
-}
\ No newline at end of file
+}
+
+*/
diff --git a/index.php b/index.php
index ed1937b9..58448aff 100644
--- a/index.php
+++ b/index.php
@@ -25,10 +25,11 @@ new HTML_FlexyFramework(array(
 
         'class_location' => implode(PATH_SEPARATOR, array(
                 dirname(__FILE__). '/Pman/MTrack/DataObjects',
+                dirname(__FILE__). '/Pman/CoreBC/DataObjects',
                 dirname(__FILE__). '/Pman/Core/DataObjects',
                 
         )),
-        'class_prefix' => 'Pman_MTrack_DataObjects_:Pman_Core_DataObjects_:',
+        'class_prefix' => 'Pman_MTrack_DataObjects_:Pman_Core_BC_:Pman_Core_DataObjects_:',
         
         //'ini_mtrack' => implode(PATH_SEPARATOR, array(
         //        dirname(__FILE__). '/Pman/MTrack/DataObjects/pman.ini',