From 57daea7230aa1f68fcc1a024435315253e6ea021 Mon Sep 17 00:00:00 2001
From: Andrew Ozz <azaozz@git.wordpress.org>
Date: Sat, 20 Jun 2015 21:07:03 +0000
Subject: [PATCH] Fix error when dropping files for uploading on the editor
 before the media modal is initialized. Props rommelxcastro, sebastiantiede.
 Fixes #32527.

git-svn-id: https://develop.svn.wordpress.org/trunk@32894 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-includes/js/media-views.js                 | 6 ++++--
 src/wp-includes/js/media/views/uploader/editor.js | 6 ++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/wp-includes/js/media-views.js b/src/wp-includes/js/media-views.js
index 304373c140..3414540f70 100644
--- a/src/wp-includes/js/media-views.js
+++ b/src/wp-includes/js/media-views.js
@@ -7874,7 +7874,7 @@ EditorUploader = View.extend({
 	 * @param  {jQuery.Event} event The 'drop' event.
 	 */
 	drop: function( event ) {
-		var $wrap = null, uploadView;
+		var $wrap, uploadView;
 
 		this.containerDragleave( event );
 		this.dropzoneDragleave( event );
@@ -7891,13 +7891,15 @@ EditorUploader = View.extend({
 		}
 
 		if ( ! this.workflow ) {
-			this.workflow = wp.media.editor.open( 'content', {
+			this.workflow = wp.media.editor.open( window.wpActiveEditor, {
 				frame:    'post',
 				state:    'insert',
 				title:    l10n.addMedia,
 				multiple: true
 			});
+
 			uploadView = this.workflow.uploader;
+
 			if ( uploadView.uploader && uploadView.uploader.ready ) {
 				this.addFiles.apply( this );
 			} else {
diff --git a/src/wp-includes/js/media/views/uploader/editor.js b/src/wp-includes/js/media/views/uploader/editor.js
index 6fc2e388c2..898906b827 100644
--- a/src/wp-includes/js/media/views/uploader/editor.js
+++ b/src/wp-includes/js/media/views/uploader/editor.js
@@ -128,7 +128,7 @@ EditorUploader = View.extend({
 	 * @param  {jQuery.Event} event The 'drop' event.
 	 */
 	drop: function( event ) {
-		var $wrap = null, uploadView;
+		var $wrap, uploadView;
 
 		this.containerDragleave( event );
 		this.dropzoneDragleave( event );
@@ -145,13 +145,15 @@ EditorUploader = View.extend({
 		}
 
 		if ( ! this.workflow ) {
-			this.workflow = wp.media.editor.open( 'content', {
+			this.workflow = wp.media.editor.open( window.wpActiveEditor, {
 				frame:    'post',
 				state:    'insert',
 				title:    l10n.addMedia,
 				multiple: true
 			});
+
 			uploadView = this.workflow.uploader;
+
 			if ( uploadView.uploader && uploadView.uploader.ready ) {
 				this.addFiles.apply( this );
 			} else {