Index: branches/5.2.x/core/kernel/db/db_event_handler.php
===================================================================
diff -u -N -r14657 -r14681
--- branches/5.2.x/core/kernel/db/db_event_handler.php	(.../db_event_handler.php)	(revision 14657)
+++ branches/5.2.x/core/kernel/db/db_event_handler.php	(.../db_event_handler.php)	(revision 14681)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: db_event_handler.php 14657 2011-10-12 08:52:40Z alex $
+* @version	$Id: db_event_handler.php 14681 2011-10-19 09:31:20Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -92,7 +92,7 @@
 		}
 
 		/**
-		 * Allows to override standart permission mapping
+		 * Allows to override standard permission mapping
 		 *
 		 */
 		function mapPermissions()
@@ -2839,10 +2839,10 @@
 				return ;
 			}
 
-			$upload_formatter =& $this->Application->recallObject('kUploadFormatter');
-			/* @var $upload_formatter kUploadFormatter */
+			$file_helper =& $this->Application->recallObject('FileHelper');
+			/* @var $file_helper FileHelper */
 
-			$fname = $upload_formatter->_ensureUniqueFilename($tmp_path, $fname);
+			$fname = $file_helper->ensureUniqueFilename($tmp_path, $fname);
 
 			if ($storage_format) {
 				$image_helper =& $this->Application->recallObject('ImageHelper');