Changeset 14118

Timestamp:

04/16/2010 09:45:16 PM (15 years ago)

Author:

nacin

Message:

More tweaks for thumbnail support when no editor support for custom post types. see #12792, props scribu.

Location:

trunk/wp-admin/includes

Files:

• media.php (modified) (7 diffs)
• post.php (modified) (1 diff)

trunk/wp-admin/includes/media.php

@@ -1162 +1162 @@
         $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 );
@@ -1993 +1993 @@
  */
 function type_url_form_image() {
-
     if ( !apply_filters( 'disable_captions', '' ) ) {
         $caption = '
@@ -2062 +2061 @@
             <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>
 ';
@@ -2099 +2092 @@
         </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>
 ';
@@ -2134 +2122 @@
         </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>
 ';
@@ -2169 +2152 @@
         </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>
@@ -2175 +2179 @@
             </td>
         </tr>
-    </tbody></table>
-';
+    ';
 }
 

trunk/wp-admin/includes/post.php

@@ -1145 +1145 @@
     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' ));