Fixed issue #7793: Question numbers appear on printout even when surv…

…ey settings are adjusted not to show them
LimeSurvey · May 10, 2013 · 72c37c0 · 72c37c0
1 parent 235143e
commit 72c37c0
Showing 1 changed file with 12 additions and 0 deletions.
diff --git a/application/controllers/admin/printablesurvey.php b/application/controllers/admin/printablesurvey.php
@@ -53,6 +53,8 @@ function index($surveyid, $lang = null)
             }
             $_POST['surveyprintlang']=$surveyprintlang;
 
+            $aSurveyInfo=getSurveyInfo($surveyid,$surveyprintlang);
+
             // Setting the selected language for printout
             $clang = new limesurvey_lang($surveyprintlang);
 
@@ -652,6 +654,16 @@ function index($surveyid, $lang = null)
                         ,'QUESTIONHELP' => ''            // content of the question help field.
                         ,'ANSWER' => ''                // contains formatted HTML answer
                         );
+
+                        $showqnumcode = Yii::app()->getConfig('showqnumcode');
+                        if(($showqnumcode=='choose' && ($aSurveyInfo['showqnumcode']=='N' || $aSurveyInfo['showqnumcode']=='X')) || $showqnumcode=='number' || $showqnumcode=='none')
+                        {
+                           $question['QUESTION_CODE']=''; 
+                        }                        
+                        if(($showqnumcode=='choose' && ($aSurveyInfo['showqnumcode']=='C' || $aSurveyInfo['showqnumcode']=='X')) || $showqnumcode=='code' || $showqnumcode=='none')
+                        {
+                           $question['QUESTION_NUMBER']=''; 
+                        }                        
 
                         if($question['QUESTION_TYPE_HELP'] != "") {
                             $question['QUESTION_TYPE_HELP'] .= "<br />\n";