Ticket #14311: insert_media_in_correct_editor.patch

wp-includes/general-template.php

@@ -1817 +1817 @@
 
         if ( $media_buttons ) { ?>
                 <div id="media-buttons" class="hide-if-no-js">
-<?php   do_action( 'media_buttons' ); ?>
+<?php   do_action( 'media_buttons', $id ); ?>
                 </div>
 <?php
         } ?>

wp-admin/includes/media.php

@@ -356 +356 @@
  *
  * @since 2.5.0
  */
-function media_buttons() {
+function media_buttons($editor_id='content') {
         $do_image = $do_audio = $do_video = true;
         if ( is_multisite() ) {
                 $media_buttons = get_site_option( 'mu_media_buttons' );
@@ -370 +370 @@
         $out = '';
 
         if ( $do_image )
-                $out .= _media_button(__('Add an Image'), 'images/media-button-image.gif?ver=20100531', 'image');
+                $out .= _media_button(__('Add an Image'), 'images/media-button-image.gif?ver=20100531', 'image', $editor_id);
         if ( $do_video )
-                $out .= _media_button(__('Add Video'), 'images/media-button-video.gif?ver=20100531', 'video');
+                $out .= _media_button(__('Add Video'), 'images/media-button-video.gif?ver=20100531', 'video', $editor_id);
         if ( $do_audio )
-                $out .= _media_button(__('Add Audio'), 'images/media-button-music.gif?ver=20100531', 'audio');
+                $out .= _media_button(__('Add Audio'), 'images/media-button-music.gif?ver=20100531', 'audio', $editor_id);
 
-        $out .= _media_button(__('Add Media'), 'images/media-button-other.gif?ver=20100531', 'media');
+        $out .= _media_button(__('Add Media'), 'images/media-button-other.gif?ver=20100531', 'media', $editor_id);
 
         $context = apply_filters('media_buttons_context', __('Upload/Insert %s'));
 
@@ -384 +384 @@
 }
 add_action( 'media_buttons', 'media_buttons' );
 
-function _media_button($title, $icon, $type) {
-        return "<a href='" . esc_url( get_upload_iframe_src($type) ) . "' id='add_$type' class='thickbox' title='$title'><img src='" . esc_url( admin_url( $icon ) ) . "' alt='$title' onclick='return false;' /></a>";
+function _media_button($title, $icon, $type, $editor_id='content') {
+        return "<a href='" . esc_url( get_upload_iframe_src($type) ) . "' id='add_$type' class='thickbox' title='$title' rel='$editor_id'><img src='" . esc_url( admin_url( $icon ) ) . "' alt='$title' onclick='return false;' /></a>";
 }
 
 function get_upload_iframe_src($type) {

wp-admin/js/media-upload.dev.js

@@ -60 +60 @@
 })(jQuery);
 
 jQuery(document).ready(function($){
-        $('a.thickbox').click(function(){
+        $('a.thickbox').click(function(ev){
+                var editor_id = ev.currentTarget.rel ? ev.currentTarget.rel : 'content';
                 if ( typeof tinyMCE != 'undefined' && tinyMCE.activeEditor ) {
-                        tinyMCE.get('content').focus();
+                        tinyMCE.get(editor_id).focus();
                         tinyMCE.activeEditor.windowManager.bookmark = tinyMCE.activeEditor.selection.getBookmark('simple');
                 }
         });