Address Issue #1055

geoffhumphrey · Sep 23, 2019 · 8c5543a · 8c5543a
1 parent 21503db
commit 8c5543a
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/output/export.output.php b/output/export.output.php
@@ -243,21 +243,21 @@ function mysqli_field_name($result, $field_offset)	{
 			if (($go == "csv") && (($action == "default") || ($action == "email")) && ($filter != "winners")) {
 
 
-                if ($_SESSION['prefsProEdition'] == 1) $a[] = array($label_first_name,$label_last_name,$label_organization,$label_ttb,$label_email,$label_address,$label_city,$label_state_province,$label_zip,$label_country,$label_entry_number,$label_judging_number,$label_category,$label_subcategory,$label_name,$label_name, $label_required_info,$label_brewer_specifics,$label_sweetness,$label_carbonation,$label_strength,$label_table,$label_location,$label_flight,$label_round,$label_score,$label_place,$label_bos);
+                if ($_SESSION['prefsProEdition'] == 1) $a[] = array($label_first_name,$label_last_name,$label_organization,$label_ttb,$label_email,$label_address,$label_city,$label_state_province,$label_zip,$label_country,$label_entry_number,$label_judging_number,$label_category,$label_subcategory,$label_name,$label_entry_name,$label_required_info,$label_brewer_specifics,$label_sweetness,$label_carbonation,$label_strength,$label_table,$label_location,$label_flight,$label_round,$label_score,$label_place,$label_bos);
 
-                else $a[] = array($label_first_name,$label_last_name,$label_email,$label_address,$label_city,$label_state_province,$label_zip,$label_country,$label_entry_number,$label_judging_number,$label_category,$label_subcategory,$label_name,$label_name, $label_required_info,$label_brewer_specifics,$label_sweetness,$label_carbonation,$label_strength,$label_table,$label_location,$label_flight,$label_round,$label_score,$label_place,$label_bos);
+                else $a[] = array($label_first_name,$label_last_name,$label_email,$label_address,$label_city,$label_state_province,$label_zip,$label_country,$label_entry_number,$label_judging_number,$label_category,$label_subcategory,$label_style,$label_entry_name,$label_required_info,$label_brewer_specifics,$label_sweetness,$label_carbonation,$label_strength,$label_table,$label_location,$label_flight,$label_round,$label_score,$label_place,$label_bos);
             }
 
 			if (($go == "csv") && ($action == "default") && ($filter == "winners")) {
 
                 if ($_SESSION['prefsProEdition'] == 1) $a[] = array($label_table,$label_name,$label_category,$label_style,$label_name,$label_place,$label_last_name,$label_first_name,$label_organization,$label_ttb,$label_email,$label_address,$label_city,$label_state_province,$label_zip,$label_country,$label_phone,$label_entry_name,$label_club,$label_cobrewer);
 
-                else $a[] = array($label_table,$label_name,$label_category,$label_style,$label_name,$label_place,$label_last_name,$label_first_name,$label_email,$label_address,$label_city,$label_state_province,$label_zip,$label_country,$label_phone,$label_entry_name,$label_club,$label_cobrewer);
+                else $a[] = array($label_table,$label_name,$label_category,$label_subcategory,$label_style,$label_place,$label_last_name,$label_first_name,$label_email,$label_address,$label_city,$label_state_province,$label_zip,$label_country,$label_phone,$label_entry_name,$label_club,$label_cobrewer);
 			}
 
 			// Required and optional info only headers
 			if (($go == "csv") && ($action == "required") && ($filter == "required")) {
-				$a[] = array($label_entry_number,$label_judging_number,$label_category,$label_style,$label_name,$label_required_info,$label_optional_info,$label_brewer_specifics,$label_sweetness,$label_carbonation,$label_strength);
+				$a[] = array($label_entry_number,$label_judging_number,$label_category,$label_subcategory,$label_style,$label_required_info,$label_optional_info,$label_brewer_specifics,$label_sweetness,$label_carbonation,$label_strength);
 			}
 
             if ($totalRows_sql > 0) {