Replace apostrophe with html entity. See noumo#103

boehsermoe · Dec 22, 2015 · 8e2bda5 · 8e2bda5
1 parent 64a71a4
commit 8e2bda5
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/modules/catalog/controllers/AController.php b/modules/catalog/controllers/AController.php
@@ -27,7 +27,7 @@ public function actionFields($id)
             foreach($fields as $field){
                 $temp = json_decode($field);
 
-                if( $temp === null && json_last_error() !== JSON_ERROR_NONE ||
+                if($temp === null && json_last_error() !== JSON_ERROR_NONE ||
                     empty($temp->name) ||
                     empty($temp->title) ||
                     empty($temp->type) ||

diff --git a/modules/catalog/media/js/fields.js b/modules/catalog/media/js/fields.js
@@ -53,7 +53,8 @@ $(function(){
                 options : $this.find('.field-options').val()
             };
             if(data.name != '') {
-                form += '<input type="hidden" name="Field[' + i + ']" value=\'' + JSON.stringify(data) + '\'>';
+                var json = JSON.stringify(data).replace("'", "&apos;"); // See issue #103
+                form += '<input type="hidden" name="Field[' + i + ']" value=\'' + json + '\'>';
             }
         });
         $('<form method="post">' + form + '</form>').appendTo('body').submit();