X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=DataObjects%2FEvents.php;h=3614b0fd91005354249416bff3f0fc81c8b223c4;hb=a67cf0bd4e6769fb1da9f117cd5c95e6bd4ceae5;hp=7ab63eea7b4d74acc8cc978dc5dcc02d642eb66e;hpb=eaf32f9049fe7b599467164157d886b89eb538bb;p=Pman.Core

diff --git a/DataObjects/Events.php b/DataObjects/Events.php
index 7ab63eea..3614b0fd 100644
--- a/DataObjects/Events.php
+++ b/DataObjects/Events.php
@@ -256,7 +256,8 @@ class Pman_Core_DataObjects_Events extends DB_DataObject
         }
         if (!isset($q['_who'])) {
         	   $this->autoJoinExtData();
-            $this->autoJoinCorePerson();
+            //$this->autoJoinCorePerson();
+            $this->selectAddWho(); 
         }
         
         // since roo does not support autojoin yet..
@@ -722,24 +723,15 @@ class Pman_Core_DataObjects_Events extends DB_DataObject
     
     function autoJoinExtData()
     {
-       $this->_join .= "LEFT JOIN
+       $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, 
+       $this->selectAdd("             
             CASE
                 WHEN ext_data_id.in_middlename='' THEN
                     CONCAT_WS(' ', ext_data_id.in_firstname,ext_data_id.in_lastname)