DataObjects/Events.php

[Pman.Core] / DataObjects / Events.php

diff --git a/DataObjects/Events.php b/DataObjects/Events.php
index 9cc301d..d1dba13 100644 (file)
--- a/DataObjects/Events.php
+++ b/DataObjects/Events.php
@@ -611,21 +611,20 @@ class Pman_Core_DataObjects_Events extends DB_DataObject
                     empty($d['id']) || 
                     empty($d['_table']) || 
                     (
-                            !empty($d['_table'][$d['_table']]) && 
+                            !empty($restored[$d['_table']]) && 
                             in_array($d['id'], $restored[$d['_table']])
                     )
             ){
                 continue;
             }
             
-            
             if(!isset($restored[$d['_table']])){
                 $restored[$d['_table']] = array();
             }
             
-            $processed[$tableName][] = $d['id'];
+            $restored[$d['_table']][] = $d['id'];
             
-            $table = DB_DataObject::factory($tableName);
+            $table = DB_DataObject::factory($d['_table']);
             
             if (!is_a($table,'DB_DataObject')) {
                 continue;
@@ -634,23 +633,17 @@ class Pman_Core_DataObjects_Events extends DB_DataObject
             unset($d['_table']);
             
             $table->setFrom($d);
+            
+            /*
+             * need to use the old id
+             */
             $table->id = $d['id'];
             
             $table->sequenceKey(false,false);
             
-            $table->insert();
-            
-            if(!isset($restored[$table->tableName()])){
-                $restored[$table->tableName()] = array();
-            }
-            
-            $restored[$table->tableName()][$d['id']] = $table;
-            
-            $table = DB_DataObject::factory($tableName);
-            
-             
+            $table->insert();     
         }
-        print_R($affects);exit;
         
+        $roo->jok('RESTORE');
     }
 }