In-Portal Issue Tracker

Index: core/units/helpers/csv_helper.php
===================================================================
--- core/units/helpers/csv_helper.php	(revision 13152)
+++ core/units/helpers/csv_helper.php	(working copy)
@@ -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();
 		}
Index: core/units/helpers/cat_dbitem_export_helper.php
===================================================================
--- core/units/helpers/cat_dbitem_export_helper.php	(revision 13152)
+++ core/units/helpers/cat_dbitem_export_helper.php	(working copy)
@@ -350,7 +350,10 @@
 		 */
 		function getExportFilename()
 		{
-			return EXPORT_PATH.'/'.$this->exportOptions['ExportFilename'].'.'.$this->getFileExtension();
+			$extension = $this->getFileExtension();
+			$filename = preg_replace('/(.*)\.' . $extension . '$/', '\1', $this->exportOptions['ExportFilename']) . '.' . $extension;
+			
+			return EXPORT_PATH . DIRECTORY_SEPARATOR . $filename;
 		}
 
 		/**
Index: core/kernel/db/db_tag_processor.php
===================================================================
--- core/kernel/db/db_tag_processor.php	(revision 13152)
+++ core/kernel/db/db_tag_processor.php	(working copy)
@@ -2114,16 +2114,16 @@
 	 */
 	function ExportPath($params)
 	{
-		$ret = EXPORT_PATH.'/';
+		$export_options = unserialize($this->Application->RecallVar($this->getPrefixSpecial().'_options'));
+		$extension = $export_options['ExportFormat'] == 1 ? 'csv' : 'xml';
+		$filename = preg_replace('/(.*)\.' . $extension . '$/', '\1', $export_options['ExportFilename']) . '.' . $extension;
 
+		$path = EXPORT_PATH . '/';
 		if (array_key_exists('as_url', $params) && $params['as_url']) {
-			$ret = str_replace( FULL_PATH.'/', $this->Application->BaseURL(), $ret);
+			$path = str_replace( FULL_PATH . '/', $this->Application->BaseURL(), $path);
 		}
-
-		$export_options = unserialize($this->Application->RecallVar($this->getPrefixSpecial().'_options'));
-		$ret .= $export_options['ExportFilename'].'.'.($export_options['ExportFormat'] == 1 ? 'csv' : 'xml');
-
-		return $ret;
+			
+		return $path . $filename;
 	}
 
 	function FieldTotal($params)