Fixed issue #6809: Notice on data entry screen when using multiple ch…

…oice question
LimeSurvey · Nov 1, 2012 · 7b31682 · 7b31682
1 parent 5caed5f
commit 7b31682
Showing 1 changed file with 2 additions and 4 deletions.
diff --git a/application/controllers/admin/dataentry.php b/application/controllers/admin/dataentry.php
@@ -2324,7 +2324,6 @@ public function view($surveyid, $lang=NULL)
                             unset($answers);
                             break;
                         case "M": //Multiple choice checkbox (Quite tricky really!)
-                            //                            $qidattributes=getQuestionAttributeValues($deqrow['qid']);
                             if (trim($qidattributes['display_columns'])!='')
                             {
                                 $dcols=$qidattributes['display_columns'];
@@ -2336,11 +2335,10 @@ public function view($surveyid, $lang=NULL)
                             $meaquery = "SELECT title, question FROM {{questions}} WHERE parent_qid={$deqrow['qid']} AND language='{$sDataEntryLanguage}' ORDER BY question_order";
                             $mearesult = dbExecuteAssoc($meaquery);
 
-
-                            $cdata['dcols'] = $dcols;
-                            $cdata['meacount'] = $meacount;
                             $cdata['mearesult'] = $mearesult->readAll();
                             $meacount = count($cdata['mearesult']);
+                            $cdata['meacount'] = $meacount;
+                            $cdata['dcols'] = $dcols;
 
                             break;
                         case "I": //Language Switch