DataObjects/Core_person_signup.php

[Pman.Core] / DataObjects / Events.php

diff --git a/DataObjects/Events.php b/DataObjects/Events.php
index 48bd9c3..20cc591 100644 (file)
--- a/DataObjects/Events.php
+++ b/DataObjects/Events.php
@@ -40,23 +40,26 @@ class Pman_Core_DataObjects_Events extends DB_DataObject
         if(!empty($q['person_table'])){
             $jt = DB_DataObject::factory($q['person_table']);
             
-            $keys = $jt->keys();
-            
-            $this->_join = "LEFT JOIN {$jt->tableName()} AS join_person_id_id ON (join_person_id_id.{$keys[0]}=Events.person_id)";
-            $this->selectAdd();
-            $this->selectAs();
-            
-            $this->selectAs($jt, 'person_id_%s', 'join_person_id_id');
-        
-            if (method_exists($jt,'nameColumn')) {
-                $this->selectAdd("join_person_id_id.{$jt->nameColumn()} as person_id_name");
-            }
+            if(!array_key_exists("{$jt->tableName()}_id", $this->table())){ // coz we have triiger on mysql...
+                
+                $keys = $jt->keys();
             
-            if (method_exists($jt,'emailColumn')) {
-                $this->selectAdd("join_person_id_id.{$jt->emailColumn()} as person_id_email");
+                $this->_join = "LEFT JOIN {$jt->tableName()} AS join_person_id_id ON (join_person_id_id.{$keys[0]}=Events.person_id)";
+                $this->selectAdd();
+                $this->selectAs();
+
+                $this->selectAs($jt, 'person_id_%s', 'join_person_id_id');
+
+                if (method_exists($jt,'nameColumn')) {
+                    $this->selectAdd("join_person_id_id.{$jt->nameColumn()} as person_id_name");
+                }
+
+                if (method_exists($jt,'emailColumn')) {
+                    $this->selectAdd("join_person_id_id.{$jt->emailColumn()} as person_id_email");
+                }
+                
             }
         
-        
         } else {
             $person = 'Person';
             $cfg = HTML_FlexyFramework::get()->Pman;
@@ -309,8 +312,7 @@ class Pman_Core_DataObjects_Events extends DB_DataObject
             $col = $au->tableName() == "Person" ? 'person_id' : $au->tableName() . '_id';
             // does $col exist?
             $cols = $this->table();
-            $col = isset($cols[$col]) ? $col : 'person_id'; // for BC....
-            if ($this->table())
+            $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;
         }
@@ -419,14 +421,8 @@ class Pman_Core_DataObjects_Events extends DB_DataObject
     
     
     // log deleting of a record so that it can be written later..
-    function logDeletedRecord($obj = false, $reset = false)
+    function logDeletedRecord($obj = false)
     {
-        
-        if(!empty($reset)){
-            self::$deleted = array();
-        }
-        
-        
         if (is_array($obj)) {
             $ret = false;
             foreach($obj as $o) {
@@ -443,10 +439,6 @@ class Pman_Core_DataObjects_Events extends DB_DataObject
         
         $del = $obj->toArray();
         $del['_table'] = $obj->tableName();
-
-        if(method_exists($obj, 'toDeletedArray')){
-            $del = $obj->toDeletedArray();
-        }
         
         self::$deleted[] = $del;
         return true;