diff --git a/core/modules/filter/lib/Drupal/filter/Tests/FilterAdminTest.php b/core/modules/filter/lib/Drupal/filter/Tests/FilterAdminTest.php index 60453ff..f2b6ec7 100644 --- a/core/modules/filter/lib/Drupal/filter/Tests/FilterAdminTest.php +++ b/core/modules/filter/lib/Drupal/filter/Tests/FilterAdminTest.php @@ -172,7 +172,8 @@ function testFilterAdmin() { $filters[] = $filter_name; } } - $this->assertTrue($filter_format->filters['filter_autop']['weight'] + 1 == $filter_format->filters['filter_url']['weight'], t('Order confirmed in configuration.')); + // Ensure that the second filter is now before the first filter. + $this->assertEqual($filter_format->filters($second_filter)->weight + 1, $filter_format->filters($first_filter)->weight, 'Order confirmed in configuration.'); // Add format. $edit = array(); diff --git a/core/profiles/standard/config/filter.format.full_html.yml b/core/profiles/standard/config/filter.format.full_html.yml index cb1700c..89b232b 100644 --- a/core/profiles/standard/config/filter.format.full_html.yml +++ b/core/profiles/standard/config/filter.format.full_html.yml @@ -6,12 +6,6 @@ roles: - administrator cache: '1' filters: - filter_autop: - module: filter - status: '1' - filter_url: - module: filter - status: '1' filter_htmlcorrector: module: filter status: '1' diff --git a/core/profiles/standard/config/filter.format.restricted_html.yml b/core/profiles/standard/config/filter.format.restricted_html.yml index 1d09033..2e14ce2 100644 --- a/core/profiles/standard/config/filter.format.restricted_html.yml +++ b/core/profiles/standard/config/filter.format.restricted_html.yml @@ -6,6 +6,9 @@ roles: - anonymous cache: '1' filters: + filter_url: + module: filter + status: '1' filter_html: module: filter status: '1' @@ -14,9 +17,6 @@ filters: filter_autop: module: filter status: '1' - filter_url: - module: filter - status: '1' filter_htmlcorrector: module: filter status: '1' diff --git a/sites/default/default.settings.php b/sites/default/default.settings.php old mode 100644 new mode 100755