--- mantisbt-1.1.7.orig/csv_export.php	2009-04-20 15:14:00.000000000 +0200
+++ mantisbt-1.1.7/csv_export.php	2009-04-27 14:06:47.845381000 +0200
@@ -116,11 +116,7 @@
 				helper_call_custom_function( $t_column_value_function, array( $t_column, $t_row, COLUMNS_TARGET_CSV_PAGE ) );
 				$t_value = ob_get_clean();
 
-				if ( strstr( $t_value, $t_sep ) !== false ) {
-					$t_value = '"' . $t_value . '"';
-				}
-
-				echo $t_value;
+				echo csv_escape_string($t_value);
 			} else {
 				$t_function = 'csv_format_' . $t_column;
 				echo $t_function( $t_row[ $t_column ] );
--- mantisbt-1.1.7.orig/core/csv_api.php	2009-04-20 15:14:00.000000000 +0200
+++ mantisbt-1.1.7/core/csv_api.php	2009-04-27 11:23:37.844829000 +0200
@@ -57,6 +57,9 @@
 			$p_str = '"' . str_replace( '"', '""', $p_str ) . '"';
 		}
 
+        $p_str =  str_replace("\n", '', $p_str);
+        $p_str =  str_replace("\r", '', $p_str);
+
 		return $p_str;
 	}