diff --git a/core/modules/filter/filter.module b/core/modules/filter/filter.module index e3d5858..b4ef7b0 100644 --- a/core/modules/filter/filter.module +++ b/core/modules/filter/filter.module @@ -477,7 +477,7 @@ function filter_get_filter_types_by_format($format_id) { }); foreach ($filters as $filter) { - $filter_types[] = $filter->type; + $filter_types[] = $filter->getType(); } return array_unique($filter_types); @@ -674,7 +674,7 @@ function check_markup($text, $format_id = NULL, $langcode = '', $cache = FALSE, // Give filters the chance to escape HTML-like data such as code or formulas. foreach ($filters as $filter) { // If necessary, skip filters of a certain type. - if (in_array($filter->type, $filter_types_to_skip)) { + if (in_array($filter->getType(), $filter_types_to_skip)) { continue; } if ($filter->status) { @@ -685,7 +685,7 @@ function check_markup($text, $format_id = NULL, $langcode = '', $cache = FALSE, // Perform filtering. foreach ($filters as $filter) { // If necessary, skip filters of a certain type. - if (in_array($filter->type, $filter_types_to_skip)) { + if (in_array($filter->getType(), $filter_types_to_skip)) { continue; } if ($filter->status) { diff --git a/core/modules/filter/lib/Drupal/filter/FilterBag.php b/core/modules/filter/lib/Drupal/filter/FilterBag.php index cdb7c71..c762624 100644 --- a/core/modules/filter/lib/Drupal/filter/FilterBag.php +++ b/core/modules/filter/lib/Drupal/filter/FilterBag.php @@ -45,6 +45,7 @@ class FilterBag extends PluginBag { public function __construct(PluginManagerInterface $manager, array $configurations = array()) { $this->manager = $manager; $this->configurations = $configurations; + $this->instanceIDs = $configurations; } /**