From 6ede0316bfc062df204d950097588c86a300280c Mon Sep 17 00:00:00 2001 From: Guy Sartorelli <36352093+GuySartorelli@users.noreply.github.com> Date: Wed, 20 Mar 2024 12:02:54 +1300 Subject: [PATCH] Revert "Use field editorconfig when sanitising content" (#11180) This reverts commit e5eb98cc3491785cbae17bb53be0be05fd5a6f42. --- src/Forms/HTMLEditor/HTMLEditorField.php | 3 +- .../Forms/HTMLEditor/HTMLEditorFieldTest.php | 38 ------------------- 2 files changed, 1 insertion(+), 40 deletions(-) diff --git a/src/Forms/HTMLEditor/HTMLEditorField.php b/src/Forms/HTMLEditor/HTMLEditorField.php index 5e64ed038..63ef950c2 100644 --- a/src/Forms/HTMLEditor/HTMLEditorField.php +++ b/src/Forms/HTMLEditor/HTMLEditorField.php @@ -145,8 +145,7 @@ class HTMLEditorField extends TextareaField // Sanitise if requested $htmlValue = HTMLValue::create($this->Value()); if (HTMLEditorField::config()->sanitise_server_side) { - $config = $this->getEditorConfig(); - $santiser = HTMLEditorSanitiser::create($config); + $santiser = HTMLEditorSanitiser::create(HTMLEditorConfig::get_active()); $santiser->sanitise($htmlValue); } diff --git a/tests/php/Forms/HTMLEditor/HTMLEditorFieldTest.php b/tests/php/Forms/HTMLEditor/HTMLEditorFieldTest.php index e09d5d7d4..68ff44b51 100644 --- a/tests/php/Forms/HTMLEditor/HTMLEditorFieldTest.php +++ b/tests/php/Forms/HTMLEditor/HTMLEditorFieldTest.php @@ -11,7 +11,6 @@ use SilverStripe\Assets\Image; use SilverStripe\Core\Config\Config; use SilverStripe\Dev\CSSContentParser; use SilverStripe\Dev\FunctionalTest; -use SilverStripe\Forms\HTMLEditor\HTMLEditorConfig; use SilverStripe\Forms\HTMLEditor\HTMLEditorField; use SilverStripe\Forms\HTMLEditor\TinyMCEConfig; use SilverStripe\Forms\HTMLReadonlyField; @@ -230,41 +229,4 @@ EOS $field->obj('ValueEntities')->forTemplate() ); } - - public function testFieldConfigSanitization() - { - $obj = TestObject::create(); - $editor = HTMLEditorField::create('Content'); - $defaultValidElements = [ - '@[id|class|style|title|data*]', - 'a[id|rel|dir|tabindex|accesskey|type|name|href|target|title|class]', - '-strong/-b[class]', - '-em/-i[class]', - '-ol[class]', - '#p[id|dir|class|align|style]', - '-li[class]', - 'br', - '-span[class|align|style]', - '-ul[class]', - '-h3[id|dir|class|align|style]', - '-h2[id|dir|class|align|style]', - 'hr[class]', - ]; - $restrictedConfig = HTMLEditorConfig::get('restricted'); - $restrictedConfig->setOption('valid_elements', implode(',', $defaultValidElements)); - $editor->setEditorConfig($restrictedConfig); - - $expectedHtmlString = '

standard text

Header'; - $htmlValue = '

standard text

Header
'; - $editor->setValue($htmlValue); - $editor->saveInto($obj); - $this->assertEquals($expectedHtmlString, $obj->Content, 'Table is not removed'); - - $defaultConfig = HTMLEditorConfig::get('default'); - $editor->setEditorConfig($defaultConfig); - - $editor->setValue($htmlValue); - $editor->saveInto($obj); - $this->assertEquals($htmlValue, $obj->Content, 'Table is removed'); - } }