Ticket #12792: 12792.3.diff

Index: wp-admin/includes/post.php
===================================================================
--- wp-admin/includes/post.php  (revision 14041)
+++ wp-admin/includes/post.php  (working copy)
@@ -1144,7 +1144,7 @@
 function _wp_post_thumbnail_html( $thumbnail_id = NULL ) {
        global $content_width, $_wp_additional_image_sizes;
 
-       $set_thumbnail_link = '<p class="hide-if-no-js"><a href="' . get_upload_iframe_src('image') . '" id="set-post-thumbnail" class="thickbox">%s</a></p>';
+       $set_thumbnail_link = '<p class="hide-if-no-js"><a title="' . esc_attr__( 'Set featured image' ) . '" href="' . get_upload_iframe_src('image') . '" id="set-post-thumbnail" class="thickbox">%s</a></p>';
        $content = sprintf($set_thumbnail_link, esc_html__( 'Set featured image' ));
 
        if ( $thumbnail_id && get_post( $thumbnail_id ) ) {
Index: wp-admin/includes/media.php
===================================================================
--- wp-admin/includes/media.php (revision 14041)
+++ wp-admin/includes/media.php (working copy)
@@ -1160,7 +1160,7 @@
        else
                $thumb_url = false;
 
-       $default_args = array( 'errors' => null, 'send' => true, 'delete' => true, 'toggle' => true, 'show_title' => true );
+       $default_args = array( 'errors' => null, 'send' => post_type_supports(get_post_type($_GET['post_id']), 'editor'), 'delete' => true, 'toggle' => true, 'show_title' => true );
        $args = wp_parse_args( $args, $default_args );
        extract( $args, EXTR_SKIP );
 
@@ -1991,7 +1991,6 @@
  * @return unknown
  */
 function type_url_form_image() {
-
        if ( !apply_filters( 'disable_captions', '' ) ) {
                $caption = '
                <tr>
@@ -2060,13 +2059,7 @@
                        <button type="button" class="button" value="" onclick="document.forms[0].url.value=document.forms[0].src.value">' . __('Link to image') . '</button>
                        <p class="help">' . __('Enter a link URL or click above for presets.') . '</p></td>
                </tr>
-
-               <tr>
-                       <td></td>
-                       <td>
-                               <input type="button" class="button" id="go_button" style="color:#bbb;" onclick="addExtImage.insert()" value="' . esc_attr__('Insert into Post') . '" />
-                       </td>
-               </tr>
+       ' . _insert_into_post_button('image') . '
        </tbody></table>
 ';
 
@@ -2097,12 +2090,7 @@
                        <td class="field"><input id="insertonly[title]" name="insertonly[title]" value="" type="text" aria-required="true"></td>
                </tr>
                <tr><td></td><td class="help">' . __('Link text, e.g. &#8220;Still Alive by Jonathan Coulton&#8221;') . '</td></tr>
-               <tr>
-                       <td></td>
-                       <td>
-                               <input type="submit" class="button" name="insertonlybutton" value="' . esc_attr__('Insert into Post') . '" />
-                       </td>
-               </tr>
+       ' . _insert_into_post_button('audio') . '
        </tbody></table>
 ';
 }
@@ -2132,12 +2120,7 @@
                        <td class="field"><input id="insertonly[title]" name="insertonly[title]" value="" type="text" aria-required="true"></td>
                </tr>
                <tr><td></td><td class="help">' . __('Link text, e.g. &#8220;Lucy on YouTube&#8220;') . '</td></tr>
-               <tr>
-                       <td></td>
-                       <td>
-                               <input type="submit" class="button" name="insertonlybutton" value="' . esc_attr__('Insert into Post') . '" />
-                       </td>
-               </tr>
+       ' . _insert_into_post_button('video') . '
        </tbody></table>
 ';
 }
@@ -2167,14 +2150,34 @@
                        <td class="field"><input id="insertonly[title]" name="insertonly[title]" value="" type="text" aria-required="true"></td>
                </tr>
                <tr><td></td><td class="help">' . __('Link text, e.g. &#8220;Ransom Demands (PDF)&#8221;') . '</td></tr>
+       ' . _insert_into_post_button('file') . '
+       </tbody></table>
+';
+}
+
+
+function _insert_into_post_button($type) {
+       if ( !post_type_supports(get_post_type($_GET['post_id']), 'editor') )
+               return '';
+       
+       if ( 'image' == $type )
+       return '
                <tr>
                        <td></td>
                        <td>
+                               <input type="button" class="button" id="go_button" style="color:#bbb;" onclick="addExtImage.insert()" value="' . esc_attr__('Insert into Post') . '" />
+                       </td>
+               </tr>           
+       ';
+
+       return '
+               <tr>
+                       <td></td>
+                       <td>
                                <input type="submit" class="button" name="insertonlybutton" value="' . esc_attr__('Insert into Post') . '" />
                        </td>
                </tr>
-       </tbody></table>
-';
+       ';
 }
 
 /**