Index: branches/5.2.x/core/kernel/utility/temp_handler.php =================================================================== diff -u -N -r13840 -r14095 --- branches/5.2.x/core/kernel/utility/temp_handler.php (.../temp_handler.php) (revision 13840) +++ branches/5.2.x/core/kernel/utility/temp_handler.php (.../temp_handler.php) (revision 14095) @@ -1,6 +1,6 @@ Conn =& $this->Application->GetADODBConnection(); - } - function SetTables($tables) { // set tablename as key for tables array @@ -262,6 +247,8 @@ } $object =& $this->Application->recallObject($prefix.'.'.$special, $prefix, Array('skip_autoload' => true)); + /* @var $object kDBItem */ + $object->PopulateMultiLangFields(); foreach ($ids as $id) { @@ -276,7 +263,7 @@ } $object->Load($id); - $original_values = $object->FieldValues; + $original_values = $object->GetFieldValues(); if (!$skip_filenames) { $object->NameCopy($master, $foreign_key); @@ -314,7 +301,7 @@ if ( is_array(getArrayValue($master, 'SubTables')) ) { foreach($master['SubTables'] as $sub_table) { if (!getArrayValue($sub_table, 'AutoClone')) continue; - $sub_TableName = ($object->mode == 't') ? $this->GetTempName($sub_table['TableName']) : $sub_table['TableName']; + $sub_TableName = $object->IsTempTable() ? $this->GetTempName($sub_table['TableName']) : $sub_table['TableName']; $foreign_key_field = is_array($sub_table['ForeignKey']) ? $sub_table['ForeignKey'][$master['Prefix']] : $sub_table['ForeignKey']; $parent_key_field = is_array($sub_table['ParentTableKey']) ? $sub_table['ParentTableKey'][$master['Prefix']] : $sub_table['ParentTableKey']; @@ -362,17 +349,18 @@ //recalling by different name, because we may get kDBList, if we recall just by prefix $recall_prefix = $prefix_special.($special ? '' : '.').'-item'; $object =& $this->Application->recallObject($recall_prefix, $prefix, Array('skip_autoload' => true)); + /* @var $object kDBItem */ foreach ($ids as $id) { $object->Load($id); - $original_values = $object->FieldValues; + $original_values = $object->GetFieldValues(); if( !$object->Delete($id) ) continue; if ( is_array(getArrayValue($master, 'SubTables')) ) { foreach($master['SubTables'] as $sub_table) { if (!getArrayValue($sub_table, 'AutoDelete')) continue; - $sub_TableName = ($object->mode == 't') ? $this->GetTempName($sub_table['TableName']) : $sub_table['TableName']; + $sub_TableName = $object->IsTempTable() ? $this->GetTempName($sub_table['TableName']) : $sub_table['TableName']; $foreign_key_field = is_array($sub_table['ForeignKey']) ? getArrayValue($sub_table, 'ForeignKey', $master['Prefix']) : $sub_table['ForeignKey']; $parent_key_field = is_array($sub_table['ParentTableKey']) ? getArrayValue($sub_table, 'ParentTableKey', $master['Prefix']) : $sub_table['ParentTableKey']; @@ -801,7 +789,7 @@ $this->Application->HandleEvent($event); } - return $event->status == erSUCCESS; + return $event->status == kEvent::erSUCCESS; } function DropTempTable($table)