Ticket #28090: 28090.diff

src/wp-admin/edit-form-advanced.php

@@ -488 +488 @@
 <?php wp_editor( $post->post_content, 'content', array(
         'dfw' => true,
         'drag_drop_upload' => true,
-        'tabfocus_elements' => 'insert-media-button,save-post',
+        'tabfocus_elements' => 'insert-media-button-1,save-post',
         'editor_height' => 360,
         'tinymce' => array(
                 'resize' => false,

src/wp-admin/includes/media.php

@@ -514 +514 @@
  * @param string $editor_id
  */
 function media_buttons($editor_id = 'content') {
+        static $instance; $instance = $instance ? $instance : 0; $instance++;
+
         $post = get_post();
         if ( ! $post && ! empty( $GLOBALS['post_ID'] ) )
                 $post = $GLOBALS['post_ID'];
@@ -524 +526 @@
 
         $img = '<span class="wp-media-buttons-icon"></span> ';
 
-        echo '<a href="#" id="insert-media-button" class="button insert-media add_media" data-editor="' . esc_attr( $editor_id ) . '" title="' . esc_attr__( 'Add Media' ) . '">' . $img . __( 'Add Media' ) . '</a>';
-
+        printf( '<a href="#" id="insert-media-button-%d" class="button insert-media add_media" data-editor="%s" title="%s">%s</a>',
+                $instance,
+                esc_attr( $editor_id ),
+                esc_attr__( 'Add Media' ),
+                $img . __( 'Add Media' ) );
         /**
          * Filter the legacy (pre-3.5.0) media buttons.
          *