From 47fabd06d817e9278ab9f9fd6ebdde200c92e686 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Markus=20Fl=C3=BCr?= <fluer.markus@googlemail.com>
Date: Mon, 30 Jul 2018 13:19:03 +0200
Subject: [PATCH] Dev: fixed some small http issues

---
 application/helpers/expressions/em_core_helper.php    |  2 +-
 application/helpers/expressions/em_manager_helper.php | 11 ++++++++---
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/application/helpers/expressions/em_core_helper.php b/application/helpers/expressions/em_core_helper.php
index 4a17f321d61..eca0722adae 100644
--- a/application/helpers/expressions/em_core_helper.php
+++ b/application/helpers/expressions/em_core_helper.php
@@ -1341,7 +1341,7 @@ public function GetPrettyPrintString()
                             $messages[] = $funcInfo[2];
                             $messages[] = $funcInfo[3];
                         }
-                        $stringParts[] = "<span title='".implode('; ', $messages)."' class='em-function' >";
+                        $stringParts[] = "<span title='".preg_replace('/\'/', '"', implode('; ', $messages))."' class='em-function' >";
                         $stringParts[] = $token[0];
                         $stringParts[] = "</span>";
                     } else {
diff --git a/application/helpers/expressions/em_manager_helper.php b/application/helpers/expressions/em_manager_helper.php
index 9f2fc152bb6..3f1c7557171 100644
--- a/application/helpers/expressions/em_manager_helper.php
+++ b/application/helpers/expressions/em_manager_helper.php
@@ -7283,7 +7283,12 @@ public static function GetRelevanceAndTailoringJavaScript($bReturnArray=false)
 
             App()->getClientScript()->registerScriptFile(Yii::app()->getConfig('generalscripts')."expressions/em_javascript.js" );
             /* Call the function when trigerring event */
-            App()->getClientScript()->registerScript("triggerEmClassChange","triggerEmClassChange();\n",CClientScript::POS_END);
+            App()->getClientScript()->registerScript("triggerEmClassChange","
+            try{ 
+                triggerEmClassChange(); 
+            } catch(e) {
+                console.ls.warn('triggerEmClassChange could not be run. Is survey.js correctly loaded?');
+            }\n",LSYii_ClientScript::POS_END);
 
             if (!$bReturnArray) {
                 $jsParts[] = "\n<script type='text/javascript'>\n<!--\n";
@@ -7588,8 +7593,8 @@ public static function GetRelevanceAndTailoringJavaScript($bReturnArray=false)
                             if ($validationEqn == '') {
                                 continue;
                             }
-
-                            $LEM->em->ProcessBooleanExpression($validationEqn,$arg['gseq'],$LEM->questionId2questionSeq[$arg['qid']]);
+                            $relQuestionSeq = isset($LEM->questionId2questionSeq[$arg['qid']]) ? $LEM->questionId2questionSeq[$arg['qid']] : null;
+                            $LEM->em->ProcessBooleanExpression($validationEqn,$arg['gseq'],$relQuestionSeq);
                             $_vars = $LEM->em->GetJSVarsUsed();
                             $allJsVarsUsed = array_merge($allJsVarsUsed,$_vars);
                             $valJsVarsUsed = array_merge($valJsVarsUsed,$_vars);