From f2e9e98fa6b0b7a5f568401d757685139bfea3a1 Mon Sep 17 00:00:00 2001
From: Scott Taylor <scott.c.taylor@mac.com>
Date: Wed, 18 Nov 2015 19:40:27 +0000
Subject: [PATCH] Media: in `media_send_to_editor()`, use `wp_json_encode()`
 instead of `addslashes()`.

Props TobiasBg.
Fixes #22135.

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


git-svn-id: http://core.svn.wordpress.org/trunk@35641 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 b90835fdd1..9990b9fd1b 100644
--- a/wp-admin/includes/media.php
+++ b/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;
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 1a5c6d156b..66031506dc 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.4-beta4-35676';
+$wp_version = '4.4-beta4-35677';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.