Index: branches/5.2.x/core/kernel/db/dbitem.php =================================================================== diff -u -N -r15541 -r15729 --- branches/5.2.x/core/kernel/db/dbitem.php (.../dbitem.php) (revision 15541) +++ branches/5.2.x/core/kernel/db/dbitem.php (.../dbitem.php) (revision 15729) @@ -1,6 +1,6 @@ getUploaderFields(); - - foreach ($uploader_fields as $field) { - $formatter = $this->Application->recallObject($this->GetFieldOption($field, 'formatter')); - /* @var $formatter kUploadFormatter */ - - $changed_fields = array_merge($changed_fields, $formatter->processFlashUpload($this, $field, $id)); - } - - if ( $changed_fields ) { - $this->Update(null, array_unique($changed_fields)); - } - } - - /** - * Removes any info about queued uploaded files - * - * @param int $id - * @return void - * @access public - */ - public function resetUploads($id = NULL) - { - $uploader_fields = $this->getUploaderFields(); - - foreach ($uploader_fields as $field) { - $this->Application->RemoveVar($this->getFileInfoVariableName($field, $id)); - } - } - - /** - * Returns uploader fields - * - * @return Array - * @access public - */ - public function getUploaderFields() - { - $ret = Array (); - - foreach ($this->Fields as $field => $options) { - if ( !isset($options['formatter']) ) { - continue; - } - - $formatter = $this->Application->recallObject($options['formatter']); - /* @var $formatter kUploadFormatter */ - - if ( $formatter instanceof kUploadFormatter ) { - $ret[] = $field; - } - } - - return $ret; - } - - /** * Returns variable name, used to store pending file actions * * @return string @@ -606,25 +540,6 @@ } /** - * Returns variable name, which stores file information for object/field/window combination - * - * @param string $field_name - * @param int $id - * @return string - * @access public - */ - public function getFileInfoVariableName($field_name, $id = NULL) - { - if ( !isset($id) ) { - $id = $this->GetID(); - } - - $window_id = $this->Application->GetTopmostWid($this->Prefix); - - return $this->Prefix . '[' . $id . '][' . $field_name . ']_file_info' . $window_id; - } - - /** * Allows to skip certain fields from getting into sql queries * * @param string $field_name