Ticket #28090: 28090.2.diff

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

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

src/wp-admin/includes/media.php

@@ -516 +516 @@
  */
 function media_buttons($editor_id = 'content') {
         static $instance = 0;
-        $instance++;
 
         $post = get_post();
         if ( ! $post && ! empty( $GLOBALS['post_ID'] ) )
@@ -528 +527 @@
 
         $img = '<span class="wp-media-buttons-icon"></span> ';
 
-        printf( '<a href="#" id="insert-media-button-%d" class="button insert-media add_media" data-editor="%s" title="%s">%s</a>',
-                $instance,
+        if ( $instance > 0 ) {
+                $id = "insert-media-button-$instance";
+        } else {
+                $id = "insert-media-button";
+        }
+        $instance++;
+
+        printf( '<a href="#" id="%s" class="button insert-media add_media" data-editor="%s" title="%s">%s</a>',
+                $id,
                 esc_attr( $editor_id ),
                 esc_attr__( 'Add Media' ),
                 $img . __( 'Add Media' )