fix(textarea): rendering without rich text mode

Signed-off-by: btry <tbugier@teclib.com>
pluginsGLPI · Nov 2, 2018 · 90fcf8c · 90fcf8c
1 parent a86f6da
commit 90fcf8c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/inc/form_answer.class.php b/inc/form_answer.class.php
@@ -1066,7 +1066,7 @@ public function getFullForm($disableRichText = false) {
 
       $question_no = 0;
       $output      = '';
-      $eol = '\r\n';
+      $eol = "\r\n";
 
       if ($disableRichText === false
          && (version_compare(PluginFormcreatorCommon::getGlpiVersion(), 9.4) >= 0 || $CFG_GLPI['use_rich_text']))

diff --git a/inc/targetchange.class.php b/inc/targetchange.class.php
@@ -983,7 +983,7 @@ public function save(PluginFormcreatorForm_Answer $formanswer) {
          $data[$changeField] = $this->fields[$changeField];
          $data[$changeField] = str_replace("\r\n", '\r\n', $data[$changeField]);
          if (strpos($data[$changeField], '##FULLFORM##') !== false) {
-            $data[$changeField] = str_replace('##FULLFORM##', $formanswer->getFullForm(), $data[$changeField]);
+            $data[$changeField] = str_replace('##FULLFORM##', $formanswer->getFullForm(true), $data[$changeField]);
          }
          if (version_compare(PluginFormcreatorCommon::getGlpiVersion(), 9.4) >= 0 || $CFG_GLPI['use_rich_text']) {
             // replace HTML P tags with DIV tags