Fixed issue #6818: Yes / No is not exported to 1 / 2 if selected

LimeSurvey · Nov 2, 2012 · beda8de · beda8de
1 parent fcd11db
commit beda8de
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/application/controllers/admin/export.php b/application/controllers/admin/export.php
@@ -135,6 +135,8 @@ public function exportresults()
         if ( ! isset($type) ) { $type = returnGlobal('type'); }
         if ( ! isset($convertyto1) ) { $convertyto1 = returnGlobal('convertyto1'); }
         if ( ! isset($convertnto2) ) { $convertnto2 = returnGlobal('convertnto2'); }
+        if ( ! isset($convertyto) ) { $convertyto = returnGlobal('convertyto'); }
+        if ( ! isset($convertnto) ) { $convertnto = returnGlobal('convertnto'); }
         if ( ! isset($convertspacetous) ) { $convertspacetous = returnGlobal('convertspacetous'); }
         $clang = Yii::app()->lang;
 
@@ -215,14 +217,14 @@ public function exportresults()
 
         if ( $options->convertN )
         {
-            $options->nValue = $convertnto2;
+            $options->nValue = $convertnto;
         }
 
         $options->convertY = $convertyto1;
 
         if ( $options->convertY )
         {
-            $options->yValue = $convertyto1;
+            $options->yValue = $convertyto;
         }
 
         $options->headerSpacesToUnderscores = $convertspacetous;