.../lib/Drupal/edit_test/Plugin/InPlaceEditor/WysiwygEditor.php | 6 ++---- .../editor/lib/Drupal/editor/Plugin/InPlaceEditor/Editor.php | 5 ++--- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/core/modules/edit/tests/modules/lib/Drupal/edit_test/Plugin/InPlaceEditor/WysiwygEditor.php b/core/modules/edit/tests/modules/lib/Drupal/edit_test/Plugin/InPlaceEditor/WysiwygEditor.php index 3e85409..d8dc40e 100644 --- a/core/modules/edit/tests/modules/lib/Drupal/edit_test/Plugin/InPlaceEditor/WysiwygEditor.php +++ b/core/modules/edit/tests/modules/lib/Drupal/edit_test/Plugin/InPlaceEditor/WysiwygEditor.php @@ -34,8 +34,7 @@ public function isCompatible(FieldItemListInterface $items) { // if there is a currently active text format and that text format is the // 'full_html' text format. elseif ($field_definition->getSetting('text_processing')) { - $format_id = $items[0]->get('format')->getValue(); - if (isset($format_id) && $format_id === 'full_html') { + if ($items[0]->format === 'full_html') { return TRUE; } return FALSE; @@ -46,8 +45,7 @@ public function isCompatible(FieldItemListInterface $items) { * {@inheritdoc} */ function getMetadata(FieldItemListInterface $items) { - $format_id = $items[0]->get('format')->getValue(); - $metadata['format'] = $format_id; + $metadata['format'] = $items[0]->format; return $metadata; } diff --git a/core/modules/editor/lib/Drupal/editor/Plugin/InPlaceEditor/Editor.php b/core/modules/editor/lib/Drupal/editor/Plugin/InPlaceEditor/Editor.php index 3a42532..b3ba306 100644 --- a/core/modules/editor/lib/Drupal/editor/Plugin/InPlaceEditor/Editor.php +++ b/core/modules/editor/lib/Drupal/editor/Plugin/InPlaceEditor/Editor.php @@ -35,8 +35,7 @@ public function isCompatible(FieldItemListInterface $items) { // if there is a currently active text format, that text format has an // associated editor and that editor supports inline editing. elseif ($field_definition->getSetting('text_processing')) { - $format_id = $items[0]->get('format')->getValue(); - if (isset($format_id) && $editor = editor_load($format_id)) { + if ($editor = editor_load($items[0]->format)) { $definition = \Drupal::service('plugin.manager.editor')->getDefinition($editor->editor); if ($definition['supports_inline_editing'] === TRUE) { return TRUE; @@ -51,7 +50,7 @@ public function isCompatible(FieldItemListInterface $items) { * {@inheritdoc} */ function getMetadata(FieldItemListInterface $items) { - $format_id = $items[0]->get('format')->getValue(); + $format_id = $items[0]->format; $metadata['format'] = $format_id; $metadata['formatHasTransformations'] = $this->textFormatHasTransformationFilters($format_id); return $metadata;