From 7e9267567f094fc9d210599f0dbdad93e26acabf Mon Sep 17 00:00:00 2001
From: whyisjake <whyisjake@git.wordpress.org>
Date: Wed, 10 Jun 2020 17:21:20 +0000
Subject: [PATCH] Editor: Prevent HTML decoding on by setting the proper editor
 context.

Props: sstoqnov.

Built from https://develop.svn.wordpress.org/trunk@47948


git-svn-id: http://core.svn.wordpress.org/trunk@47720 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/includes/media.php | 2 +-
 wp-includes/version.php     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/wp-admin/includes/media.php b/wp-admin/includes/media.php
index 8d0e4089dc..c02cdcdb73 100644
--- a/wp-admin/includes/media.php
+++ b/wp-admin/includes/media.php
@@ -3233,7 +3233,7 @@ function edit_form_image_editor( $post ) {
 
 	?>
 	</label>
-	<?php wp_editor( $post->post_content, 'attachment_content', $editor_args ); ?>
+	<?php wp_editor( format_to_edit( $post->post_content ), 'attachment_content', $editor_args ); ?>
 
 	</div>
 	<?php
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 2b3f09c630..2f514f1621 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -13,7 +13,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '5.5-alpha-47947';
+$wp_version = '5.5-alpha-47948';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.