Merge branch '2.7.0/fixes' into develop

pluginsGLPI · Dec 18, 2018 · 43cf75c · 43cf75c
2 parents 6270c5b + 8355480
commit 43cf75c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/inc/form.class.php b/inc/form.class.php
@@ -1082,7 +1082,7 @@ public function prepareInputForUpdate($input) {
             || isset($input['usage_count'])) {
 
          if (isset($input['access_rights'])
-            && $input['access_right'] == self::ACCESS_PUBLIC
+            && $input['access_rights'] == self::ACCESS_PUBLIC
          ) {
             // check that accessibility to eh form is compatible with its questions
             $question = new PluginFormcreatorQuestion();

diff --git a/inc/targetticket.class.php b/inc/targetticket.class.php
@@ -1147,6 +1147,7 @@ public function save(PluginFormcreatorFormAnswer $formanswer) {
          $richText
       );
 
+      $data['content'] = Toolbox::addslashes_deep($data['content']);
       $data['content'] = $this->parseTags($data['content'], $formanswer, $richText);
 
       $data['_users_id_recipient'] = $_SESSION['glpiID'];