FIX Multi HTML entities in shortcodes

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

Hide file tree

Showing 3 changed files with 49 additions and 0 deletions.
diff --git a/src/Forms/HTMLEditor/HTMLEditorField.php b/src/Forms/HTMLEditor/HTMLEditorField.php
@@ -190,4 +190,14 @@ public function getSchemaStateDefaults()
         $stateDefaults['data'] = $config->getConfigSchemaData();
         return $stateDefaults;
     }
+
+    /**
+     * Return value with all values encoded in html entities
+     *
+     * @return string Raw HTML
+     */
+    public function ValueEntities()
+    {
+        return htmlentities($this->Value() ?? '', ENT_COMPAT, 'UTF-8', false);
+    }
 }
diff --git a/tests/php/Forms/HTMLEditor/HTMLEditorFieldTest.php b/tests/php/Forms/HTMLEditor/HTMLEditorFieldTest.php
@@ -208,4 +208,25 @@ public function testReadonlyField()
             $readonlyContent->getValue()
         );
     }
+
+    public function testValueEntities()
+    {
+        $inputText = "The company &amp; partners";
+        $field = new HTMLEditorField("Content");
+        $field->setValue($inputText);
+
+        $this->assertEquals(
+            "The company &amp; partners",
+            $field->obj('ValueEntities')->forTemplate()
+        );
+
+        $inputText = "The company &amp;&amp; partners";
+        $field = new HTMLEditorField("Content");
+        $field->setValue($inputText);
+
+        $this->assertEquals(
+            "The company &amp;&amp; partners",
+            $field->obj('ValueEntities')->forTemplate()
+        );
+    }
 }
diff --git a/tests/php/Forms/TextareaFieldTest.php b/tests/php/Forms/TextareaFieldTest.php
@@ -67,5 +67,23 @@ public function testValueEntities()
             false,
             $field->obj('ValueEntities')->getProcessShortcodes()
         );
+
+        $inputText = "To escape an ampersand in HTML, use '&amp;'";
+        $field = new TextareaField("Test", "Test");
+        $field->setValue($inputText);
+
+        $this->assertEquals(
+            "To escape an ampersand in HTML, use '&amp;'",
+            $field->obj('ValueEntities')->forTemplate()
+        );
+
+        $inputText = "The symbol of ampersand is &";
+        $field = new TextareaField("Test", "Test");
+        $field->setValue($inputText);
+
+        $this->assertEquals(
+            "The symbol of ampersand is &",
+            $field->obj('ValueEntities')->forTemplate()
+        );
     }
 }