X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=DataObjects%2FEvents.php;h=aa786eed1bfc830e5a91287068ea61a35cb5c9df;hb=53904bb95e9e82c17fea5369826f00e738fac5f1;hp=fa764e4e863200bb1e6cc86e41e2302859c84912;hpb=c1d37c55dc0553171ad9214bcad5124a8288096e;p=Pman.Core

diff --git a/DataObjects/Events.php b/DataObjects/Events.php
index fa764e4e..aa786eed 100644
--- a/DataObjects/Events.php
+++ b/DataObjects/Events.php
@@ -217,7 +217,7 @@ class Pman_Core_DataObjects_Events extends DB_DataObject
             if (!$obj) {
                 $roo->jerr("ontable is invalid");
             }
-            /*
+            
             if (!method_exists($obj,'relatedWhere')) {
                 $roo->jerr( $q['_related_on_table'] . " Does not have method relatedWhere :" .
                            implode(',', get_class_methods($obj)));
@@ -241,17 +241,12 @@ class Pman_Core_DataObjects_Events extends DB_DataObject
                     
                 }
                 $this->whereAdd(implode(' OR ' , $w));
-            }*/
-            if ($obj && method_exists($obj,'relatedEventsWhere')) {
-                $a = $obj->relatedEventsWhere($q,$roo);
-                if($a){
-                    $this->whereAdd($a);
-                }
             }
             
             
             
             
+            
         }
         // since roo does not support autojoin yet..
         if (!isset($q['_distinct'])) {
@@ -333,21 +328,7 @@ class Pman_Core_DataObjects_Events extends DB_DataObject
             $cols = $this->tableColumns();
             $col = isset($cols[$col]) ? $col : 'person_id'; // for BC.... - revert to using person_id
             $this->{$col} = $au->pid();
-            //$this->person_id = $au ? (!empty($au->id) ? $au->id : $au->pid()) : -1;
-            
-            $this->who = $au->name;
-            
-            if($au->tableName() == "modx_users"){
-            	$e = PDO_DataObject::factory('ext_data');
-               $e->setFrom(array(            
-                  'userdata_id' => $au->pid(),            
-               ));
-               print_r($e);
-               exit;   
-               if($e->find()){
-                   $this->who = $e->getUserName();
-               }               
-            }
+            //$this->person_id = $au ? (!empty($au->id) ? $au->id : $au->pid()) : -1;            
         }
         $this->person_table = $au ? $au->tableName() : '';
         $this->ipaddr = isset($_SERVER["REMOTE_ADDR"]) ? $_SERVER["REMOTE_ADDR"] : 'cli';
@@ -444,7 +425,7 @@ class Pman_Core_DataObjects_Events extends DB_DataObject
             if (!empty($_SERVER['HTTP_X_FORWARDED_FOR'])) {
                 $this->ipaddr = $_SERVER['HTTP_X_FORWARDED_FOR'];
             }
-        }
+        }        
     }
     
     function beforeUpdate($old, $request,$roo)