Fix duplicate BOM and use constant for BOM

mantisbt · Mar 7, 2016 · 851786e · 851786e
1 parent 120d451
commit 851786e
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 15 deletions.
diff --git a/billing_export_to_csv.php b/billing_export_to_csv.php
@@ -53,7 +53,9 @@
 $t_show_realname = config_get( 'show_realname' ) == ON;
 
 csv_emit_headers( $t_filename );
-echo csv_get_byteordermarker();
+if( config_get( 'csv_add_bom' ) == ON ) {
+	echo UTF8_BOM;
+}
 
 echo csv_escape_string( lang_get( 'issue_id' ) ) . $t_separator;
 echo csv_escape_string( lang_get( 'project_name' ) ) . $t_separator;

diff --git a/core/constant_inc.php b/core/constant_inc.php
@@ -602,3 +602,6 @@
 define ( 'JQUERY_VERSION', '1.11.3' );
 define ( 'JQUERY_UI_VERSION', '1.11.4' );
 
+# Byte Order Markers
+define( 'UTF8_BOM', "\xEF\xBB\xBF" );
+
diff --git a/core/csv_api.php b/core/csv_api.php
@@ -58,14 +58,6 @@ function csv_emit_headers( $p_filename ) {
 	header( 'Content-Disposition: attachment; filename="' . urlencode( file_clean_name( $p_filename ) ) . '"' );
 }
 
-/**
- * Generates the byte order marker (BOM) to be generated at the top of the csv file.
- * @return string The byte order marker.
- */
-function csv_get_byteordermarker() {
-	return "\xEF\xBB\xBF";
-}
-
 /**
  * get the csv file new line, can be moved to config in the future
  * @return string containing new line character

diff --git a/csv_export.php b/csv_export.php
@@ -69,16 +69,13 @@
 $t_filename = csv_get_default_filename();
 
 csv_emit_headers( $t_filename );
-echo csv_get_byteordermarker();
+if( config_get( 'csv_add_bom' ) == ON ) {
+	echo UTF8_BOM;
+}
 
 # Get columns to be exported
 $t_columns = csv_get_columns();
 
-# export BOM
-if( config_get( 'csv_add_bom' ) == ON ) {
-	echo "\xEF\xBB\xBF";
-}
-
 # export the titles
 $t_first_column = true;
 ob_start();