From f16f273cd2ebe45e3a4018ca589ea548861da9e0 Mon Sep 17 00:00:00 2001
From: Scott Taylor <wonderboymusic@git.wordpress.org>
Date: Wed, 18 Nov 2015 19:39:19 +0000
Subject: [PATCH] Media: in `media_send_to_editor()`, use `wp_json_encode()`
 instead of `addslashes()`.

Props TobiasBg.
Fixes #22135.


git-svn-id: https://develop.svn.wordpress.org/trunk@35677 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-admin/includes/media.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/wp-admin/includes/media.php b/src/wp-admin/includes/media.php
index b90835fdd1..9990b9fd1b 100644
--- a/src/wp-admin/includes/media.php
+++ b/src/wp-admin/includes/media.php
@@ -248,7 +248,7 @@ function media_send_to_editor($html) {
 ?>
 <script type="text/javascript">
 var win = window.dialogArguments || opener || parent || top;
-win.send_to_editor('<?php echo addslashes($html); ?>');
+win.send_to_editor( <?php echo wp_json_encode( $html ); ?> );
 </script>
 <?php
 	exit;