Dev: Fix travis issue (#1193)

Dev: revert 9106dfe partially Dev: todo find why it broke
LimeSurvey · Dec 12, 2018 · 21118b3 · 21118b3
1 parent 69926ed
commit 21118b3
Showing 1 changed file with 4 additions and 9 deletions.
diff --git a/application/helpers/expressions/em_manager_helper.php b/application/helpers/expressions/em_manager_helper.php
@@ -8826,15 +8826,10 @@ public static function ProcessCurrentResponses()
             foreach ($LEM->currentQset as $qinfo) {
                 $qid = $qinfo['info']['qid'];
                 $gseq = $qinfo['info']['gseq'];
-                /* Set current relevance using ProcessStepString, test if relevance and grelevance is set, but really think if happen : all EM are broken*/
-                $relevant = true;
-                if(isset($qinfo['info']['relevance']) && ($qinfo['info']['relevance'] !== "" and $qinfo['info']['relevance'] != 1) ) { 
-                    $relevant = boolval(self::ProcessStepString($qinfo['info']['relevance']));
-                }
-                $grelevant = true;
-                if(isset($qinfo['info']['grelevance']) && ($qinfo['info']['grelevance'] !== "" and $qinfo['info']['grelevance'] != 1) ) {
-                    $grelevant = boolval(self::ProcessStepString($qinfo['info']['grelevance']));
-                }
+                /* Never use posted value : must be fixed and find real actual relevance */
+                /* Set current relevance using ProcessStepString tested in https://github.com/LimeSurvey/LimeSurvey/commit/9106dfe8afb07b99f14814d3fbcf7550e2b44bb9 */
+                $relevant = (isset($_POST['relevance' . $qid]) ? ($_POST['relevance' . $qid] == 1) : false);
+                $grelevant = (isset($_POST['relevanceG' . $gseq]) ? ($_POST['relevanceG' . $gseq] == 1) : false);
                 $_SESSION[$LEM->sessid]['relevanceStatus'][$qid] = $relevant;
                 $_SESSION[$LEM->sessid]['relevanceStatus']['G' . $gseq] = $grelevant;
                 foreach (explode('|',$qinfo['sgqa']) as $sq)