Fixed issue #17968: conditions designer does not show the right quest…

…ions to select (#2332)

Co-authored-by: encuestabizdevgit <devgit@encuesta.biz>

application/controllers/admin/ConditionsAction.php

@@ -1309,19 +1309,14 @@ protected function getSurveyIsAnonymized()
      */
     protected function getQuestionRows()
     {
-        $qresult = Question::model()->findAllByAttributes(array(
-            'parent_qid' => 0,
-            'sid' => $this->iSurveyID));
+        $qresult = Question::model()->primary()->getQuestionList($this->iSurveyID);
 
         //'language' => $this->language
         $qrows = array();
         foreach ($qresult as $k => $v) {
             $qrows[$k] = array_merge($v->attributes, $v->group->attributes);
         }
 
-        // Perform a case insensitive natural sort on group name then question title (known as "code" in the form) of a multidimensional array
-        usort($qrows, 'groupOrderThenQuestionOrder');
-
         return $qrows;
     }
 

application/helpers/common_helper.php

@@ -838,7 +838,6 @@ function templateDefaultTexts($sLanguage, $mode = 'html', $sNewlines = 'text')
 * and returns -1, 0 or 1 depending on the result of the comparison of
 * the sort order of the group_order and question_order field
 * Used by :
-* - conditionsaction->getQuestionRows with merging group and question attributes (all in same array)
 * - remotecontrol_handle->export_statistics with merging group and question attributes (all in same array)
 * - checkQuestions() in activate_helper function with ?
 * @param mixed $a