Fixed issue #06207: [Microsoft][ODBC SQL Server Driver][SQL Server]Am…

…biguous column name 'qid'

Dev reverted commit d399fb7, since although it may fix MSSQL, it breaks MySql

classes/expressions/LimeExpressionManager.php

@@ -7030,7 +7030,7 @@ private static function getConditionsForEM($surveyid=NULL, $qid=NULL)
             .", ".db_table_name('questions')." as q"
             ." where ". $where
             ." c.cqid = 0 and c.qid = q.qid"
-            ." order by sid, c.qid, scenario, cqid, cfieldname, value";
+            ." order by sid, qid, scenario, cqid, cfieldname, value";
 
             $data = db_execute_assoc($query);