Fixed issue #4381: Variety of crashes with MS SQL DB

git-svn-id: file:///Users/Shitiz/Downloads/lssvn/source/limesurvey@8778 b72ed6b6-b9f8-46b5-92b4-906544132732
LimeSurvey · Jun 2, 2010 · ef58135 · ef58135
1 parent 3c9d27c
commit ef58135
Showing 1 changed file with 4 additions and 8 deletions.
diff --git a/admin/conditionshandling.php b/admin/conditionshandling.php
@@ -578,8 +578,7 @@
             ."FROM {$dbprefix}questions "
             ."WHERE parent_qid={$rows['qid']} "
             ."AND language='".GetBaseLanguageFromSurveyID($surveyid)."' "
-            ."ORDER BY question_order, "
-            ."question";
+            ."ORDER BY question_order";
 
             $aresult=db_execute_assoc($aquery) or safe_die ("Couldn't get answers to Array questions<br />$aquery<br />".$connect->ErrorMsg());
 
@@ -717,8 +716,7 @@
             ."FROM {$dbprefix}questions "
             ."WHERE parent_qid={$rows['qid']} "
             ."AND language='".GetBaseLanguageFromSurveyID($surveyid)."' "
-            ."ORDER BY question_order, "
-            ."question";
+            ."ORDER BY question_order";
             $aresult=db_execute_assoc($aquery) or safe_die ("Couldn't get answers to Array questions<br />$aquery<br />".$connect->ErrorMsg());
 
             while ($arows = $aresult->FetchRow())
@@ -774,8 +772,7 @@
             ."FROM {$dbprefix}questions "
             ."WHERE parent_qid={$rows['qid']} "
             ."AND language='".GetBaseLanguageFromSurveyID($surveyid)."' "
-            ."ORDER BY question_order, "
-            ."question";
+            ."ORDER BY question_order";
             $aresult=db_execute_assoc($aquery) or safe_die ("Couldn't get answers to Array questions<br />$aquery<br />".$connect->ErrorMsg());
 
             while ($arows = $aresult->FetchRow())
@@ -831,8 +828,7 @@
             ."FROM {$dbprefix}questions "
             ."WHERE parent_qid={$rows['qid']} "
             ."AND language='".GetBaseLanguageFromSurveyID($surveyid)."' "
-            ."ORDER BY question_order, "
-            ."question";
+            ."ORDER BY question_order";
             $aresult=db_execute_assoc($aquery) or safe_die ("Couldn't get answers to this question<br />$aquery<br />".$connect->ErrorMsg());
 
             while ($arows=$aresult->FetchRow())