Index: kernel/db/db_event_handler.php =================================================================== --- kernel/db/db_event_handler.php (revision 15446) +++ kernel/db/db_event_handler.php (working copy) @@ -2609,15 +2609,18 @@ $object = $event->getObject(); /* @var $object kDBItem */ - if ( $event->Name == 'OnAfterCopyToLive' ) { - $object->SwitchToLive(); - $object->Load($event->getEventParam('id')); + if ( $object->getUploaderFields() ) { + // this would prevent SQL error when loading "*-ci" prefix object + if ( $event->Name == 'OnAfterCopyToLive' ) { + $object->SwitchToLive(); + $object->Load($event->getEventParam('id')); - $object->processUploads($event->getEventParam('temp_id')); + $object->processUploads($event->getEventParam('temp_id')); + } + else { + $object->processUploads(); + } } - else { - $object->processUploads(); - } $var_name = $object->getPendingActionVariableName(); $schedule = $this->Application->RecallVar($var_name); Index: kernel/db/dbitem.php =================================================================== --- kernel/db/dbitem.php (revision 15455) +++ kernel/db/dbitem.php (working copy) @@ -536,7 +536,7 @@ public function processUploads($id = NULL) { $changed_fields = Array (); - $uploader_fields = $this->_getUploaderFields(); + $uploader_fields = $this->getUploaderFields(); foreach ($uploader_fields as $field) { $formatter = $this->Application->recallObject($this->GetFieldOption($field, 'formatter')); @@ -559,7 +559,7 @@ */ public function resetUploads($id = NULL) { - $uploader_fields = $this->_getUploaderFields(); + $uploader_fields = $this->getUploaderFields(); foreach ($uploader_fields as $field) { $this->Application->RemoveVar($this->getFileInfoVariableName($field, $id)); @@ -570,9 +570,9 @@ * Returns uploader fields * * @return Array - * @access protected + * @access public */ - protected function _getUploaderFields() + public function getUploaderFields() { $ret = Array ();