Merge pull request #2604 from Shnoulle/bug/17870_defaultvalue

Fixed issue #17870: Default value with line feed broke Expression Script
LimeSurvey · Sep 16, 2022 · 9510ce9 · 9510ce9
2 parents b66b921 + 83f3e89
commit 9510ce9
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/application/helpers/expressions/em_manager_helper.php b/application/helpers/expressions/em_manager_helper.php
@@ -3910,7 +3910,7 @@ public function setVariableAndTokenMappingsForExpressionManager($surveyid, $forc
                 //                . "','relevance':'" . (($relevance != '') ? htmlspecialchars(preg_replace('/[[:space:]]/',' ',$relevance),ENT_QUOTES) : 1)
                 //                . "','readWrite':'" . $readWrite
                 //                . "','grelevance':'" . (($grelevance != '') ? htmlspecialchars(preg_replace('/[[:space:]]/',' ',$grelevance),ENT_QUOTES) : 1)
-                . "','default':'" . (is_null($defaultValue) ? '' : str_replace("'", "\'", $defaultValue))
+                . "','default':'" . (is_null($defaultValue) ? '' : json_encode($defaultValue)) // Don't found usage in em_javascript, used in expression ?
                 . "','rowdivid':'" . (is_null($rowdivid) ? '' : $rowdivid)
                 . "','onlynum':'" . ($onlynum ? '1' : '')
                 . "','gseq':" . $groupSeq