Index: branches/5.0.x/core/units/helpers/csv_helper.php
===================================================================
diff -u -N -r12734 -r13233
--- branches/5.0.x/core/units/helpers/csv_helper.php	(.../csv_helper.php)	(revision 12734)
+++ branches/5.0.x/core/units/helpers/csv_helper.php	(.../csv_helper.php)	(revision 13233)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: csv_helper.php 12734 2009-10-20 19:28:11Z alex $
+* @version	$Id: csv_helper.php 13233 2010-03-15 22:00:38Z dmitrya $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -163,10 +163,11 @@
 		{
 			safeDefine('DBG_SKIP_REPORTING', 1);
 
-			$export_data = unserialize($this->Application->RecallVar('export_data'));
+			$export_data = unserialize($this->Application->RecallVar('export_data'));			
+			$filename = preg_replace('/(.*)\.csv$/', '\1', basename($export_data['file_name'])) . '.csv';
+			
 			header('Content-type: text/csv');
-			$filename = rtrim(basename($export_data['file_name']), '.csv').'.csv';
-			header('Content-Disposition: attachment; filename="'.$filename.'"');
+			header('Content-Disposition: attachment; filename="' . $filename . '"');
 			readfile($export_data['file_name']);
 			die();
 		}