diff --git a/core/modules/filter/config/install/filter.format.plain_text.yml b/core/modules/filter/config/install/filter.format.plain_text.yml index 70abb88..5de8988 100644 --- a/core/modules/filter/config/install/filter.format.plain_text.yml +++ b/core/modules/filter/config/install/filter.format.plain_text.yml @@ -9,7 +9,6 @@ weight: 10 roles: - anonymous - authenticated -cache: true filters: # Escape all HTML. filter_html_escape: diff --git a/core/modules/filter/config/schema/filter.schema.yml b/core/modules/filter/config/schema/filter.schema.yml index f1df7df..bcc766c 100644 --- a/core/modules/filter/config/schema/filter.schema.yml +++ b/core/modules/filter/config/schema/filter.schema.yml @@ -36,9 +36,6 @@ filter.format.*: sequence: - type: string label: 'Role' - cache: - type: boolean - label: 'Cache' filters: type: sequence label: 'Enabled filters' diff --git a/core/modules/filter/lib/Drupal/filter/Entity/FilterFormat.php b/core/modules/filter/lib/Drupal/filter/Entity/FilterFormat.php index 961ff6c..99cfbb5 100644 --- a/core/modules/filter/lib/Drupal/filter/Entity/FilterFormat.php +++ b/core/modules/filter/lib/Drupal/filter/Entity/FilterFormat.php @@ -93,13 +93,6 @@ class FilterFormat extends ConfigEntityBase implements FilterFormatInterface, En protected $roles; /** - * Whether processed text of this format can be cached. - * - * @var bool - */ - public $cache = FALSE; - - /** * Configured filters for this text format. * * An associative array of filters assigned to the text format, keyed by the diff --git a/core/modules/filter/lib/Drupal/filter/Plugin/FilterInterface.php b/core/modules/filter/lib/Drupal/filter/Plugin/FilterInterface.php index f6f7dd2..4641c80 100644 --- a/core/modules/filter/lib/Drupal/filter/Plugin/FilterInterface.php +++ b/core/modules/filter/lib/Drupal/filter/Plugin/FilterInterface.php @@ -67,9 +67,6 @@ * - status: The default status for new instances of the filter. Defaults to * FALSE. * - weight: A default weight for new instances of the filter. Defaults to 0. - * - cache: Whether the filtered text can be cached. Defaults to TRUE. - * Note that setting this to FALSE disables caching for an entire text format, - * which can have a negative impact on the site's overall performance. * - settings: An associative array containing default settings for new * instances of the filter. * diff --git a/core/modules/filter/lib/Drupal/filter/Tests/FilterDefaultConfigTest.php b/core/modules/filter/lib/Drupal/filter/Tests/FilterDefaultConfigTest.php index 9d8f3ca..b166e41 100644 --- a/core/modules/filter/lib/Drupal/filter/Tests/FilterDefaultConfigTest.php +++ b/core/modules/filter/lib/Drupal/filter/Tests/FilterDefaultConfigTest.php @@ -49,7 +49,6 @@ function testInstallation() { // Verify that format default property values have been added/injected. $this->assertTrue($format->uuid()); - $this->assertEqual($format->get('cache'), 1); // Verify that the loaded format does not contain any roles. $this->assertEqual($format->get('roles'), NULL); diff --git a/core/modules/filter/tests/filter_test/config/install/filter.format.filter_test.yml b/core/modules/filter/tests/filter_test/config/install/filter.format.filter_test.yml index 9b48b54..d3d77fc 100644 --- a/core/modules/filter/tests/filter_test/config/install/filter.format.filter_test.yml +++ b/core/modules/filter/tests/filter_test/config/install/filter.format.filter_test.yml @@ -4,7 +4,6 @@ weight: 2 roles: - anonymous - authenticated -cache: true status: true langcode: en filters: diff --git a/core/profiles/standard/config/install/filter.format.basic_html.yml b/core/profiles/standard/config/install/filter.format.basic_html.yml index 0a9ad13..b775e81 100644 --- a/core/profiles/standard/config/install/filter.format.basic_html.yml +++ b/core/profiles/standard/config/install/filter.format.basic_html.yml @@ -4,7 +4,6 @@ status: true weight: 0 roles: - authenticated -cache: true filters: filter_html: id: filter_html diff --git a/core/profiles/standard/config/install/filter.format.full_html.yml b/core/profiles/standard/config/install/filter.format.full_html.yml index 31b6692..3e7b5d9 100644 --- a/core/profiles/standard/config/install/filter.format.full_html.yml +++ b/core/profiles/standard/config/install/filter.format.full_html.yml @@ -4,7 +4,6 @@ status: true weight: 1 roles: - administrator -cache: true filters: filter_caption: id: filter_caption diff --git a/core/profiles/standard/config/install/filter.format.restricted_html.yml b/core/profiles/standard/config/install/filter.format.restricted_html.yml index 12a94aa..95a20e5 100644 --- a/core/profiles/standard/config/install/filter.format.restricted_html.yml +++ b/core/profiles/standard/config/install/filter.format.restricted_html.yml @@ -4,7 +4,6 @@ status: true weight: 0 roles: - anonymous -cache: true filters: filter_html: id: filter_html