FIX Multi HTML entities in shortcodes

silverstripe · Aug 7, 2023 · 6f25498 · 6f25498
1 parent 2a56cc3
commit 6f25498
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/src/Forms/TextareaField.php b/src/Forms/TextareaField.php
@@ -174,6 +174,6 @@ public function Type()
      */
     public function ValueEntities()
     {
-        return htmlentities($this->Value() ?? '', ENT_COMPAT, 'UTF-8');
+        return htmlentities($this->Value() ?? '', ENT_COMPAT, 'UTF-8', false);
     }
 }
diff --git a/tests/php/Forms/TextareaFieldTest.php b/tests/php/Forms/TextareaFieldTest.php
@@ -67,5 +67,14 @@ public function testValueEntities()
             false,
             $field->obj('ValueEntities')->getProcessShortcodes()
         );
+
+        $inputText = "The company &amp; partners";
+        $field = new TextareaField("Test", "Test");
+        $field->setValue($inputText);
+
+        $this->assertEquals(
+            "The company &amp; partners",
+            $field->obj('ValueEntities')->forTemplate()
+        );
     }
 }