X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=DataObjects%2FEvents.php;h=7abc664a5497d2fedf5fda41f53579be08163901;hb=6b2e1da2fec30e3bec6dbf31a7a1332ca27be69a;hp=42912d60494bd5a07ed6f20753488899f44e3cca;hpb=3119d6e80fd2ee7f393f92c6d98e13431b0bc379;p=Pman.Core

diff --git a/DataObjects/Events.php b/DataObjects/Events.php
index 42912d60..7abc664a 100644
--- a/DataObjects/Events.php
+++ b/DataObjects/Events.php
@@ -254,10 +254,12 @@ class Pman_Core_DataObjects_Events extends DB_DataObject
             
             
         }
-        if (!isset($q['_who'])) {
-        	   $this->autoJoinExtData();
-            $this->autoJoinCorePerson();
-            $this->selectAddWho(); 
+        if (isset($q['_who'])) {
+        	   
+        	   //$e = PDO_DataObject::factory('ext_data');
+        	   //$this->joinAdd($e,'LEFT');
+            //$this->autoJoinCorePerson();
+            //$this->selectAddWho(); 
         }
         
         // since roo does not support autojoin yet..
@@ -721,32 +723,5 @@ class Pman_Core_DataObjects_Events extends DB_DataObject
         
     }
     
-    function autoJoinExtData()
-    {
-       $this->_join .= "LEFT JOIN
-                            ext_data AS ext_data_id
-                        ON
-                            Events.modx_users_id = ext_data_id.userdata_id";                            
-    }
     
-    function autoJoinCorePerson()
-    {
-       $this->_join .= "LEFT JOIN                             
-                             core_person AS core_person_id
-                        ON
-                             Events.person_id = core_person_id.id";                             
-    }
-    
-    function selectAddWho() 
-    {
-       $this->selectAdd("
-            core_person_id.name AS person_name, 
-            CASE
-                WHEN ext_data_id.in_middlename='' THEN
-                    CONCAT_WS(' ', ext_data_id.in_firstname,ext_data_id.in_lastname)
-                ELSE
-                    CONCAT_WS(' ', ext_data_id.in_firstname,ext_data_id.in_middlename,ext_data_id.in_lastname)
-            END AS ext_data_full_name 
-       ");
-    }
 }