Merge pull request #29400 from colemanw/unicodeHtml

Afform - Fix incorrect html encoding when saving
civicrm · Feb 18, 2024 · c2cf1f4 · c2cf1f4
2 parents 861e974 + 9afe93f
commit c2cf1f4
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 1 deletion.
diff --git a/ext/afform/core/CRM/Afform/ArrayHtml.php b/ext/afform/core/CRM/Afform/ArrayHtml.php
@@ -376,7 +376,10 @@ protected function decodeAttrValue($type, $txtAttrValue) {
    * @return string
    */
   public function replaceUnicodeChars($markup) {
-    return htmlspecialchars_decode(htmlentities($markup, ENT_COMPAT, 'utf-8', FALSE));
+    $replace = [
+      ["\xc2\xa0", '&nbsp;'],
+    ];
+    return str_replace(array_column($replace, 0), array_column($replace, 1), $markup);
   }
 
   /**

diff --git a/ext/afform/core/tests/phpunit/Civi/Afform/AfformGetTest.php b/ext/afform/core/tests/phpunit/Civi/Afform/AfformGetTest.php
@@ -75,6 +75,39 @@ public function testGetLayoutWithEmptyNode() {
     $this->assertArrayNotHasKey('#children', $layout[0]['#children'][0]);
   }
 
+  public function testGetHtmlEncoding(): void {
+    Afform::create(FALSE)
+      ->setLayoutFormat('shallow')
+      ->addValue('name', $this->formName)
+      ->addValue('title', 'Test Form')
+      ->addValue('layout', [
+        [
+          '#tag' => 'af-form',
+          'ctrl' => 'afform',
+          '#children' => [
+            [
+              '#tag' => 'af-entity',
+              'data' => "{contact_type: 'Individual', source: 'This isn\\'t \"quotes\"'}",
+              'type' => 'Contact',
+              'name' => 'Individual1',
+            ],
+          ],
+        ],
+      ])
+      ->execute();
+
+    $html = Afform::get(FALSE)
+      ->addWhere('name', '=', $this->formName)
+      ->setLayoutFormat('html')
+      ->execute()->single()['layout'];
+
+    $expected = <<<HTML
+data="{contact_type: 'Individual', source: 'This isn\'t &quot;quotes&quot;'}"
+HTML;
+
+    $this->assertStringContainsString($expected, $html);
+  }
+
   public function testAfformAutocomplete(): void {
     // Use a numeric title to test that the "search by id" feature
     // doesn't kick in for Afforms (which don't have a numeric "id")