Index: branches/5.2.x/core/units/helpers/cat_dbitem_export_helper.php
===================================================================
diff -u -N -r14685 -r14699
--- branches/5.2.x/core/units/helpers/cat_dbitem_export_helper.php	(.../cat_dbitem_export_helper.php)	(revision 14685)
+++ branches/5.2.x/core/units/helpers/cat_dbitem_export_helper.php	(.../cat_dbitem_export_helper.php)	(revision 14699)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: cat_dbitem_export_helper.php 14685 2011-10-19 10:57:03Z alex $
+* @version	$Id: cat_dbitem_export_helper.php 14699 2011-10-26 11:39:38Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -98,12 +98,17 @@
 		 * @param string $type
 		 * @param int $key
 		 * @param mixed $value
+		 * @param bool $is_new
 		 */
 		function addToCache($type, $key, $value, $is_new = true)
 		{
-//			if (!isset($this->cache[$type])) $this->cache[$type] = Array();
+			/*if ( !isset($this->cache[$type]) ) {
+				$this->cache[$type] = Array ();
+			}*/
+
 			$this->cache[$type][$key] = $value;
-			if ($is_new) {
+
+			if ( $is_new ) {
 				$this->cacheStatus[$type][$key] = true;
 			}
 		}
@@ -146,7 +151,7 @@
 		/**
 		 * Fill required fields with dummy values
 		 *
-		 * @param kEvent $event
+		 * @param kEvent|bool $event
 		 * @param kCatDBItem|bool $object
 		 * @param bool $set_status
 		 */
@@ -856,6 +861,8 @@
 		 * Enter description here...
 		 *
 		 * @param kEvent $event
+		 * @param Array $record_data
+		 * @return bool
 		 */
 		function processCurrentItem(&$event, $record_data)
 		{
@@ -1222,7 +1229,7 @@
 		 * Loads import/export options
 		 *
 		 * @param kEvent $event
-		 * @return void
+		 * @return Array
 		 */
 		function loadOptions(&$event)
 		{
@@ -1376,30 +1383,29 @@
 				return ;
 			}
 
-			$object =& $event->getObject();
-
-			$import_filenames = Array ();
-
 			$file_helper =& $this->Application->recallObject('FileHelper');
 			/* @var $file_helper FileHelper */
 
+			$import_filenames = Array ();
 			$file_helper->CheckFolder(EXPORT_PATH);
 
-			if ( $folder_handle = opendir(EXPORT_PATH) ) {
-				while ( false !== ($file = readdir($folder_handle)) ) {
-					if ( is_dir(EXPORT_PATH . '/' . $file) || substr($file, 0, 1) == '.' || strtolower($file) == 'cvs' || strtolower($file) == 'dummy' || filesize(EXPORT_PATH . '/' . $file) == 0 ) {
-						continue;
-					}
+			$iterator = new DirectoryIterator(EXPORT_PATH);
+			/* @var $file_info DirectoryIterator */
 
-					$file_size = kUtil::formatSize(filesize(EXPORT_PATH . '/' . $file));
-					$import_filenames[$file] = $file . ' (' . $file_size . ')';
+			foreach ($iterator as $file_info) {
+				$file = $file_info->getFilename();
+
+				if ( $file_info->isDir() || $file == 'dummy' || $file_info->getSize() == 0 ) {
+					continue;
 				}
-				closedir($folder_handle);
+
+				$import_filenames[$file] = $file . ' (' . kUtil::formatSize( $file_info->getSize() ) . ')';
 			}
 
-			$options = $object->GetFieldOptions('ImportLocalFilename');
-			$options['options'] = $import_filenames;
-			$object->SetFieldOptions('ImportLocalFilename', $options);
+			$object =& $event->getObject();
+			/* @var $object kDBItem */
+
+			$object->SetFieldOption('ImportLocalFilename', 'options', $import_filenames);
 		}
 
 		/**