core/modules/editor/editor.admin.inc                             |    2 +-
 core/modules/editor/editor.module                                |    6 ++++--
 core/modules/editor/lib/Drupal/editor/Form/EditorImageDialog.php |    4 +---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/core/modules/editor/editor.admin.inc b/core/modules/editor/editor.admin.inc
index 9089ac3..9dc6a30 100644
--- a/core/modules/editor/editor.admin.inc
+++ b/core/modules/editor/editor.admin.inc
@@ -76,7 +76,7 @@ function editor_image_upload_settings_form(Editor $editor) {
     '#type' => 'textfield',
     '#default_value' => $editor->image_upload['directory'],
     '#title' => t('Upload directory'),
-    '#description' => t('A directory relative to Drupal\'s files directory where uploaded images will be stored.'),
+    '#description' => t("A directory relative to Drupal's files directory where uploaded images will be stored."),
     '#states' => $show_if_image_uploads_enabled,
   );
 
diff --git a/core/modules/editor/editor.module b/core/modules/editor/editor.module
index f66225c..f17acf9 100644
--- a/core/modules/editor/editor.module
+++ b/core/modules/editor/editor.module
@@ -9,6 +9,7 @@
 use Drupal\editor\Entity\Editor;
 use Drupal\Component\Utility\NestedArray;
 use Drupal\Core\Entity\EntityInterface;
+use Drupal\field\Field;
 
 /**
  * Implements hook_help().
@@ -538,8 +539,9 @@ function _editor_get_processed_text_fields(EntityInterface $entity) {
 
   // Only return fields that have text processing enabled.
   return array_filter($configurable_fields, function ($field) use ($entity) {
-    $instance = field_info_instance($entity->entityType(), $field, $entity->bundle());
-    $settings = $instance->getFieldSettings();
+    $settings = Field::fieldInfo()
+      ->getInstance($entity->entityType(), $entity->bundle(), $field)
+      ->getFieldSettings();
     return isset($settings['text_processing']) && $settings['text_processing'] === '1';
   });
 }
diff --git a/core/modules/editor/lib/Drupal/editor/Form/EditorImageDialog.php b/core/modules/editor/lib/Drupal/editor/Form/EditorImageDialog.php
index e81c0f1..0807210 100644
--- a/core/modules/editor/lib/Drupal/editor/Form/EditorImageDialog.php
+++ b/core/modules/editor/lib/Drupal/editor/Form/EditorImageDialog.php
@@ -160,9 +160,7 @@ public function submitForm(array &$form, array &$form_state) {
     // attributes.
     if (!empty($form_state['values']['fid'][0])) {
       $file = file_load($form_state['values']['fid'][0]);
-      $uri = $file->getFileUri();
-      $stream = file_stream_wrapper_get_instance_by_uri($uri);
-      $form_state['values']['attributes']['src'] = str_replace($_SERVER['DOCUMENT_ROOT'], '', $stream->realpath());
+      $form_state['values']['attributes']['src'] = file_create_url($file->getFileUri());
       $form_state['values']['attributes']['data-editor-file-uuid'] = $file->uuid();
     }