Index: trunk/core/units/general/cat_dbitem_export.php =================================================================== diff -u -r3543 -r3616 --- trunk/core/units/general/cat_dbitem_export.php (.../cat_dbitem_export.php) (revision 3543) +++ trunk/core/units/general/cat_dbitem_export.php (.../cat_dbitem_export.php) (revision 3616) @@ -509,7 +509,7 @@ // create/update categories $backup_category_id = $this->Application->GetVar('m_cat_id'); - + foreach ($this->curItem->CategoryPath as $category_name) { if (!$category_name) continue; $category_id = $this->getFromCache('category_names', $category_name); @@ -545,6 +545,9 @@ $this->Application->SetVar('m_cat_id', $category_id); } } + if (!$this->curItem->CategoryPath) { + $category_id = $backup_category_id; + } // create main record $save_method = 'Create'; @@ -751,7 +754,7 @@ $category_path = $this->Conn->GetOne($sql); $category_path = explode('>', $category_path); - if ($this->exportOptions['IsBaseCategory'] ) { + if ($this->exportOptions['IsBaseCategory']) { $i = $this->exportOptions['BaseLevel']; while ($i > 0) { array_shift($category_path); Index: trunk/kernel/units/general/cat_event_handler.php =================================================================== diff -u -r3591 -r3616 --- trunk/kernel/units/general/cat_event_handler.php (.../cat_event_handler.php) (revision 3591) +++ trunk/kernel/units/general/cat_event_handler.php (.../cat_event_handler.php) (revision 3616) @@ -1260,7 +1260,7 @@ if ($folder_handle = opendir(EXPORT_PATH)) { while (false !== ($file = readdir($folder_handle))) { - if ( substr($file, 0, 1) == '.' || strtolower($file) == 'cvs' || strtolower($file) == 'dummy' || filesize(EXPORT_PATH.'/'.$file) == 0) continue; + if (is_dir(EXPORT_PATH.'/'.$file) || substr($file, 0, 1) == '.' || strtolower($file) == 'cvs' || strtolower($file) == 'dummy' || filesize(EXPORT_PATH.'/'.$file) == 0) continue; $file_size = formatSize( filesize(EXPORT_PATH.'/'.$file) ); $import_filenames[$file] = $file.' ('.$file_size.')'; Index: trunk/core/units/general/cat_event_handler.php =================================================================== diff -u -r3591 -r3616 --- trunk/core/units/general/cat_event_handler.php (.../cat_event_handler.php) (revision 3591) +++ trunk/core/units/general/cat_event_handler.php (.../cat_event_handler.php) (revision 3616) @@ -1260,7 +1260,7 @@ if ($folder_handle = opendir(EXPORT_PATH)) { while (false !== ($file = readdir($folder_handle))) { - if ( substr($file, 0, 1) == '.' || strtolower($file) == 'cvs' || strtolower($file) == 'dummy' || filesize(EXPORT_PATH.'/'.$file) == 0) continue; + if (is_dir(EXPORT_PATH.'/'.$file) || substr($file, 0, 1) == '.' || strtolower($file) == 'cvs' || strtolower($file) == 'dummy' || filesize(EXPORT_PATH.'/'.$file) == 0) continue; $file_size = formatSize( filesize(EXPORT_PATH.'/'.$file) ); $import_filenames[$file] = $file.' ('.$file_size.')'; Index: trunk/core/units/general/cat_dbitem.php =================================================================== diff -u -r3568 -r3616 --- trunk/core/units/general/cat_dbitem.php (.../cat_dbitem.php) (revision 3568) +++ trunk/core/units/general/cat_dbitem.php (.../cat_dbitem.php) (revision 3616) @@ -305,14 +305,14 @@ $error_field = isset($params['error_field']) ? $params['error_field'] : $field; if ( getArrayValue($params,'required') ) { - if (getArrayValue($params, 'formatter') == 'kUploadFormatter') + /*if (getArrayValue($params, 'formatter') == 'kUploadFormatter') { $value = $this->GetDBField($field); $res = is_array($value) && $value['size'] ? true : false; } - else { + else {*/ $res = ( (string) $this->FieldValues[$field] != ''); - } +// } } if (!$res) $this->FieldErrors[$error_field]['pseudo'] = 'required'; return $res; Index: trunk/kernel/units/general/cat_dbitem.php =================================================================== diff -u -r3568 -r3616 --- trunk/kernel/units/general/cat_dbitem.php (.../cat_dbitem.php) (revision 3568) +++ trunk/kernel/units/general/cat_dbitem.php (.../cat_dbitem.php) (revision 3616) @@ -305,14 +305,14 @@ $error_field = isset($params['error_field']) ? $params['error_field'] : $field; if ( getArrayValue($params,'required') ) { - if (getArrayValue($params, 'formatter') == 'kUploadFormatter') + /*if (getArrayValue($params, 'formatter') == 'kUploadFormatter') { $value = $this->GetDBField($field); $res = is_array($value) && $value['size'] ? true : false; } - else { + else {*/ $res = ( (string) $this->FieldValues[$field] != ''); - } +// } } if (!$res) $this->FieldErrors[$error_field]['pseudo'] = 'required'; return $res; Index: trunk/kernel/units/general/cat_dbitem_export.php =================================================================== diff -u -r3543 -r3616 --- trunk/kernel/units/general/cat_dbitem_export.php (.../cat_dbitem_export.php) (revision 3543) +++ trunk/kernel/units/general/cat_dbitem_export.php (.../cat_dbitem_export.php) (revision 3616) @@ -509,7 +509,7 @@ // create/update categories $backup_category_id = $this->Application->GetVar('m_cat_id'); - + foreach ($this->curItem->CategoryPath as $category_name) { if (!$category_name) continue; $category_id = $this->getFromCache('category_names', $category_name); @@ -545,6 +545,9 @@ $this->Application->SetVar('m_cat_id', $category_id); } } + if (!$this->curItem->CategoryPath) { + $category_id = $backup_category_id; + } // create main record $save_method = 'Create'; @@ -751,7 +754,7 @@ $category_path = $this->Conn->GetOne($sql); $category_path = explode('>', $category_path); - if ($this->exportOptions['IsBaseCategory'] ) { + if ($this->exportOptions['IsBaseCategory']) { $i = $this->exportOptions['BaseLevel']; while ($i > 0) { array_shift($category_path);