From dfd334cc31cff9d1fc5d0dba418239ab786c498e Mon Sep 17 00:00:00 2001
From: Carsten Schmitz <carsten.schmitz@limesurvey.org>
Date: Wed, 12 Feb 2020 17:08:30 +0100
Subject: [PATCH] Fixed issue: Incomplete headers when exporting 'Multiple
 choice with comment' questions

---
 application/helpers/common_helper.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/application/helpers/common_helper.php b/application/helpers/common_helper.php
index 3ad69224a49..20aa471af12 100644
--- a/application/helpers/common_helper.php
+++ b/application/helpers/common_helper.php
@@ -1879,7 +1879,8 @@ function createFieldMap($survey, $style = 'short', $force_refresh = false, $ques
                     if ($style == "full") {
                         $fieldmap[$fieldname]['title'] = $arow['title'];
                         $fieldmap[$fieldname]['question'] = $arow['question'];
-                        $fieldmap[$fieldname]['subquestion'] = gT('Comment');
+                        $fieldmap[$fieldname]['subquestion1'] = gT('Comment');
+                        $fieldmap[$fieldname]['subquestion'] =$abrow['question'];
                         $fieldmap[$fieldname]['group_name'] = $arow['group_name'];
                         $fieldmap[$fieldname]['mandatory'] = $arow['mandatory'];
                         $fieldmap[$fieldname]['hasconditions'] = $conditions;