From 4426331f3d49c6ba114d8b2220927e5ede3a0b31 Mon Sep 17 00:00:00 2001
From: Carsten Schmitz <carsten.schmitz@limesurvey.org>
Date: Mon, 13 Aug 2012 10:30:03 +0200
Subject: [PATCH] Fixed issue #6476: Error in data entry when using multiple
 choice with comment questions and MSSQL

---
 admin/dataentry.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/admin/dataentry.php b/admin/dataentry.php
index 577849aae1d..3d314bd78eb 100644
--- a/admin/dataentry.php
+++ b/admin/dataentry.php
@@ -2314,7 +2314,7 @@ function saveshow(value)
                         break;
                     case "P": //Multiple choice with comments checkbox + text
                         $dataentryoutput .= "<table border='0'>\n";
-                        $meaquery = "SELECT * FROM ".db_table_name("questions")." WHERE parent_qid={$deqrow['qid']} AND language='{$sDataEntryLanguage}' ORDER BY question_order, question";
+                        $meaquery = "SELECT * FROM ".db_table_name("questions")." WHERE parent_qid={$deqrow['qid']} AND language='{$sDataEntryLanguage}' ORDER BY question_order";
                         $mearesult = db_execute_assoc($meaquery);
                         while ($mearow = $mearesult->FetchRow())
                         {