<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[14118] trunk/wp-admin/includes:
More tweaks for thumbnail support when no editor support for custom post types
.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/14118">14118</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2010-04-16 21:45:16 +0000 (Fri, 16 Apr 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>More tweaks for thumbnail support when no editor support for custom post types. see <a href="http://trac.wordpress.org/ticket/12792">#12792</a>, props scribu.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminincludesmediaphp">trunk/wp-admin/includes/media.php</a></li>
<li><a href="#trunkwpadminincludespostphp">trunk/wp-admin/includes/post.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminincludesmediaphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/media.php (14117 => 14118)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/media.php 2010-04-16 21:39:10 UTC (rev 14117)
+++ trunk/wp-admin/includes/media.php 2010-04-16 21:45:16 UTC (rev 14118)
</span><span class="lines">@@ -1161,7 +1161,7 @@
</span><span class="cx"> else
</span><span class="cx"> $thumb_url = false;
</span><span class="cx">
</span><del>- $default_args = array( 'errors' => null, 'send' => true, 'delete' => true, 'toggle' => true, 'show_title' => true );
</del><ins>+ $default_args = array( 'errors' => null, 'send' => post_type_supports(get_post_type($_GET['post_id']), 'editor'), 'delete' => true, 'toggle' => true, 'show_title' => true );
</ins><span class="cx"> $args = wp_parse_args( $args, $default_args );
</span><span class="cx"> extract( $args, EXTR_SKIP );
</span><span class="cx">
</span><span class="lines">@@ -1992,7 +1992,6 @@
</span><span class="cx"> * @return unknown
</span><span class="cx"> */
</span><span class="cx"> function type_url_form_image() {
</span><del>-
</del><span class="cx"> if ( !apply_filters( 'disable_captions', '' ) ) {
</span><span class="cx"> $caption = '
</span><span class="cx"> <tr>
</span><span class="lines">@@ -2061,13 +2060,7 @@
</span><span class="cx"> <button type="button" class="button" value="" onclick="document.forms[0].url.value=document.forms[0].src.value">' . __('Link to image') . '</button>
</span><span class="cx"> <p class="help">' . __('Enter a link URL or click above for presets.') . '</p></td>
</span><span class="cx"> </tr>
</span><del>-
- <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>
</del><ins>+ ' . _insert_into_post_button('image') . '
</ins><span class="cx"> </tbody></table>
</span><span class="cx"> ';
</span><span class="cx">
</span><span class="lines">@@ -2098,12 +2091,7 @@
</span><span class="cx"> <td class="field"><input id="insertonly[title]" name="insertonly[title]" value="" type="text" aria-required="true"></td>
</span><span class="cx"> </tr>
</span><span class="cx"> <tr><td></td><td class="help">' . __('Link text, e.g. &#8220;Still Alive by Jonathan Coulton&#8221;') . '</td></tr>
</span><del>- <tr>
- <td></td>
- <td>
- <input type="submit" class="button" name="insertonlybutton" value="' . esc_attr__('Insert into Post') . '" />
- </td>
- </tr>
</del><ins>+ ' . _insert_into_post_button('audio') . '
</ins><span class="cx"> </tbody></table>
</span><span class="cx"> ';
</span><span class="cx"> }
</span><span class="lines">@@ -2133,12 +2121,7 @@
</span><span class="cx"> <td class="field"><input id="insertonly[title]" name="insertonly[title]" value="" type="text" aria-required="true"></td>
</span><span class="cx"> </tr>
</span><span class="cx"> <tr><td></td><td class="help">' . __('Link text, e.g. &#8220;Lucy on YouTube&#8220;') . '</td></tr>
</span><del>- <tr>
- <td></td>
- <td>
- <input type="submit" class="button" name="insertonlybutton" value="' . esc_attr__('Insert into Post') . '" />
- </td>
- </tr>
</del><ins>+ ' . _insert_into_post_button('video') . '
</ins><span class="cx"> </tbody></table>
</span><span class="cx"> ';
</span><span class="cx"> }
</span><span class="lines">@@ -2168,14 +2151,34 @@
</span><span class="cx"> <td class="field"><input id="insertonly[title]" name="insertonly[title]" value="" type="text" aria-required="true"></td>
</span><span class="cx"> </tr>
</span><span class="cx"> <tr><td></td><td class="help">' . __('Link text, e.g. &#8220;Ransom Demands (PDF)&#8221;') . '</td></tr>
</span><ins>+ ' . _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 '
</ins><span class="cx"> <tr>
</span><span class="cx"> <td></td>
</span><span class="cx"> <td>
</span><ins>+ <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>
</ins><span class="cx"> <input type="submit" class="button" name="insertonlybutton" value="' . esc_attr__('Insert into Post') . '" />
</span><span class="cx"> </td>
</span><span class="cx"> </tr>
</span><del>- </tbody></table>
-';
</del><ins>+ ';
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span></span></pre></div>
<a id="trunkwpadminincludespostphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/post.php (14117 => 14118)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/post.php 2010-04-16 21:39:10 UTC (rev 14117)
+++ trunk/wp-admin/includes/post.php 2010-04-16 21:45:16 UTC (rev 14118)
</span><span class="lines">@@ -1144,7 +1144,7 @@
</span><span class="cx"> function _wp_post_thumbnail_html( $thumbnail_id = NULL ) {
</span><span class="cx"> global $content_width, $_wp_additional_image_sizes;
</span><span class="cx">
</span><del>- $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>';
</del><ins>+ $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>';
</ins><span class="cx"> $content = sprintf($set_thumbnail_link, esc_html__( 'Set featured image' ));
</span><span class="cx">
</span><span class="cx"> if ( $thumbnail_id && get_post( $thumbnail_id ) ) {
</span></span></pre>
</div>
</div>
</body>
</html>