From afa7e188750f1ab698e84aa8ae6210e453fd8ecf Mon Sep 17 00:00:00 2001
From: Carsten Schmitz <c_schmitz@users.sourceforge.net>
Date: Fri, 27 Sep 2013 18:10:12 +0200
Subject: [PATCH] Fixed issue #7998: Underscore character in subqestion code
 breaks export of Array (numerical) questions - patch by lucass

---
 .../helpers/admin/exportresults_helper.php    | 24 ++-----------------
 1 file changed, 2 insertions(+), 22 deletions(-)

diff --git a/application/helpers/admin/exportresults_helper.php b/application/helpers/admin/exportresults_helper.php
index 75e0bb65f89..32617c43c0d 100644
--- a/application/helpers/admin/exportresults_helper.php
+++ b/application/helpers/admin/exportresults_helper.php
@@ -994,7 +994,7 @@ public function getCodeFieldSubHeading(SurveyObj $survey, FormattingOptions $oOp
                 }
                 break;
 
-            case ':':
+            case ':':           
             case ';':
                 list($scaleZeroTitle, $scaleOneTitle) = explode('_', $answerCode);
                 $subHeading .= ' ['.$scaleZeroTitle.']['.$scaleOneTitle.']';
@@ -1095,28 +1095,8 @@ public function getFullFieldSubHeading(SurveyObj $survey, FormattingOptions $oOp
 
             case ':':
             case ';':
-                //The headers created by this section of code are significantly different from
-                //the old code.  I believe that they are more accurate. - elameno
-                list($scaleZeroTitle, $scaleOneTitle) = explode('_', $answerCode);
-                $sqs = $survey->getSubQuestionArrays($questionId);
-
-                $scaleZeroText = '';
-                $scaleOneText = '';
-                foreach ($sqs as $sq)
-                {
-                    if ($sq['title'] == $scaleZeroTitle && $sq['scale_id'] == 0)
-                    {
-                        $scaleZeroText = $sq['question'];
-                    }
-                    elseif ($sq['title'] == $scaleOneTitle && $sq['scale_id'] == 1)
-                    {
-                        $scaleOneText = $sq['question'];
-                    }
-                }
-
-                $subHeading .= ' ['.$this->stripTagsFull($scaleZeroText).']['.$this->stripTagsFull($scaleOneText).']';
+                $subHeading .= ' ['.$this->stripTagsFull($field['subquestion1']).']['.$this->stripTagsFull($field['subquestion2']).']';
                 break;
-
             case '1':
                 $answerScale = substr($fieldName, -1) + 1;
                 $subQuestions = $survey->getSubQuestionArrays($questionId);