diff --git a/src/Forms/HTMLEditor/HTMLEditorField.php b/src/Forms/HTMLEditor/HTMLEditorField.php index 3edd623f7..db8d08a05 100644 --- a/src/Forms/HTMLEditor/HTMLEditorField.php +++ b/src/Forms/HTMLEditor/HTMLEditorField.php @@ -138,8 +138,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 9393b0a4f..2abe550aa 100644 --- a/tests/php/Forms/HTMLEditor/HTMLEditorFieldTest.php +++ b/tests/php/Forms/HTMLEditor/HTMLEditorFieldTest.php @@ -12,7 +12,6 @@ use SilverStripe\Control\Director; 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; @@ -232,43 +231,6 @@ EOS ); } - 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'); - } - public function testGetAttributes() { // If silverstripe/admin isn't installed, we can't get TinyMCEConfig attributes