X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=DataObjects%2FCore_watch.php;h=fcefdad53a7af98dd79d2c89177f946074f58e5c;hb=41258003a54804001df682c1a6973b2a5d31543f;hp=438884c006a0b4de316f77d62ba59a869882c53b;hpb=fc0afbc16b364ea50aa668cbe6cb451e4a74046d;p=Pman.Core

diff --git a/DataObjects/Core_watch.php b/DataObjects/Core_watch.php
index 438884c0..fcefdad5 100644
--- a/DataObjects/Core_watch.php
+++ b/DataObjects/Core_watch.php
@@ -1,4 +1,3 @@
-
 <?php
 /**
  * Table Definition for core_watch
@@ -58,8 +57,12 @@ class Pman_Core_DataObjects_Core_watch extends DB_DataObject
         if (!empty($q['_split_event_name'])) {
             $this->selectAdd("
                 
-                substr( event, substring_index(event, '.')) as event_left,
-                substr( event, 0, substring_index(event, '.')) as event_right        
+                substr( event, 1, LOCATE( '.',event) -1) as event_left,
+                substr( event,   LOCATE( '.',event) +1) as event_right,
+                (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
                              
             ");
             
@@ -80,11 +83,11 @@ class Pman_Core_DataObjects_Core_watch extends DB_DataObject
         $ret['event_right'] = $bits[1];
         // check core enu.
         if (!empty($ret['event_right'])) {
-            $ce = DB_DataObject::factory('core_enum')->lookup($q['_split_event_name'], $ret['event_right']);
-            $ret['event_right_display_name'] = $ce;
+            $ce = DB_DataObject::factory('core_enum')->lookupObject($q['_split_event_name'], $ret['event_right']);
+            $ret['event_right_display_name'] = $ce->display_name;
         }
         
-        
+        return $ret;
         
         
     }