Fixed issue #05875: Flexible Labels do not register in french when ap…

…ostrophes are in label text.
LimeSurvey · Mar 8, 2012 · 69b720d · 69b720d
1 parent ffbd31c
commit 69b720d
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/application/helpers/admin/label_helper.php b/application/helpers/admin/label_helper.php
@@ -136,12 +136,17 @@ function modlabelsetanswers($lid)
     if (!isset($_POST['method'])) {
         $_POST['method'] = $clang->gT("Save");
     }
-
-    $data = json_decode(CHttpRequest::getPost('dataToSend'));
+
+    //unescape single quotes
+    $labeldata = CHttpRequest::getPost('dataToSend');
+    $labeldata = str_replace("\'","'",$labeldata);
+
+
+    $data = json_decode($labeldata);
 
     if ($ajax)
         $lid = insertlabelset();
-
+    
     if (count(array_unique($data->{'codelist'})) == count($data->{'codelist'}))
     {
 

diff --git a/scripts/admin/updateset.js b/scripts/admin/updateset.js
@@ -62,7 +62,8 @@ $(document).ready(function(){
                         });
                     });
                     $("input[name=dataToSend]").remove();
-                    $("#mainform").append("<input type='hidden' name='dataToSend' value='"+js2php(dataToSend)+"' />");
+					var encodedData = htmlspecialchars(js2php(dataToSend));
+                    $("#mainform").append("<input type='hidden' name='dataToSend' value='"+encodedData+"' />");
         });
 
         fix_highlighting();