Fixed issue #15794: Question is LS Expression (replacementfields) sho…

…w question from next group (#1379) Dev: usage of compare Yii function
LimeSurvey · Jan 31, 2020 · 6129c13 · 6129c13
1 parent eba81f2
commit 6129c13
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/application/controllers/admin/limereplacementfields.php b/application/controllers/admin/limereplacementfields.php
@@ -446,16 +446,16 @@ private function collectQuestionReplacements($surveyid, $gid = null, $qid = null
         if ($gid != null && $qid == null) {
             $oGroup = QuestionGroup::model()->findByPk($gid);
             $oCriteria->with = ['group'];
-            $oCriteria->compare('group_order', $oGroup->group_order, false, '<=');
+            $oCriteria->compare('group_order', '<='.$oGroup->group_order,);
         }
 
         if ($qid != null) {
             $oCriteria->with = ['group'];
-            $oCriteria->compare('group_order', $oCurrentQuestion->group->group_order, false, '<=');
+            $oCriteria->compare('group_order', '<='.$oCurrentQuestion->group->group_order);
             if ($oCurrentQuestion->parent_qid != 0) {
-                $oCriteria->compare('question_order', $oCurrentQuestion->parent->question_order, false, '<');
+                $oCriteria->compare('question_order', '<'.$oCurrentQuestion->parent->question_order);
             } else {
-                $oCriteria->compare('question_order', $oCurrentQuestion->question_order, false, '<');
+                $oCriteria->compare('question_order', '<'.$oCurrentQuestion->question_order );
             }
         }