DataObjects/Core_person.php

[Pman.Core] / DataObjects / Core_watch.php

diff --git a/DataObjects/Core_watch.php b/DataObjects/Core_watch.php
index 8e1fc9a..4a30b81 100644 (file)
--- a/DataObjects/Core_watch.php
+++ b/DataObjects/Core_watch.php
@@ -26,7 +26,7 @@
  * 
  * 
  */
-require_once 'DB/DataObject.php';
+class_exists('DB_DataObject') ? '' : require_once 'DB/DataObject.php';
 
 class Pman_Core_DataObjects_Core_watch extends DB_DataObject 
 {
@@ -62,7 +62,7 @@ class Pman_Core_DataObjects_Core_watch extends DB_DataObject
                 (SELECT
                     display_name FROM core_enum where etype = '{$this->escape($q['_split_event_name'])}'
                     AND name = substr( event,   LOCATE( '.',event) +1)
-                )
+                ) as event_right_display_name
                              
             ");
             
@@ -218,7 +218,7 @@ class Pman_Core_DataObjects_Core_watch extends DB_DataObject
     function notifyEvent($event)
     {
         //print_r($event);
-       //DB_DataObject::DebugLevel(1);
+        //DB_DataObject::DebugLevel(1);
         // see if there are any watches on events..
         // notify everyone flagged except the person doing it...
         // this is very basic logic... -
@@ -235,12 +235,14 @@ class Pman_Core_DataObjects_Core_watch extends DB_DataObject
         $w->event  = $event->action;
         $w->active = 1;
         
-        
-        $w->whereAdd('person_id != '. (int) $event->person_id);
+        // not sure why this is here... - it breaks on the reader article -> 
+        if ($event->person_id) {
+            $w->whereAdd('person_id != '. (int) $event->person_id);
+        }
  
         $watches = $w->fetchAll();
         
-        //print_R($watches); //exit;
+        //print_R($watches); 
         
         $nn = DB_DataObject::Factory('core_notify');
         $nn->ontable    = $event->on_table;