<!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>[14015] trunk:
Make thumbnail work for custom post types even if the editor is not being displayed
.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/14015">14015</a></dd>
<dt>Author</dt> <dd>markjaquith</dd>
<dt>Date</dt> <dd>2010-04-06 11:20:47 +0000 (Tue, 06 Apr 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Make thumbnail work for custom post types even if the editor is not being displayed. props scribu. fixes <a href="http://trac.wordpress.org/ticket/12792">#12792</a></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>
<li><a href="#trunkwpincludesjsthickboxthickboxjs">trunk/wp-includes/js/thickbox/thickbox.js</a></li>
<li><a href="#trunkwpincludesscriptloaderphp">trunk/wp-includes/script-loader.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 (14014 => 14015)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/media.php 2010-04-06 04:32:08 UTC (rev 14014)
+++ trunk/wp-admin/includes/media.php 2010-04-06 11:20:47 UTC (rev 14015)
</span><span class="lines">@@ -351,18 +351,6 @@
</span><span class="cx"> * @since unknown
</span><span class="cx"> */
</span><span class="cx"> function media_buttons() {
</span><del>- global $post_ID, $temp_ID;
- $uploading_iframe_ID = (int) (0 == $post_ID ? $temp_ID : $post_ID);
- $context = apply_filters('media_buttons_context', __('Upload/Insert %s'));
- $media_upload_iframe_src = "media-upload.php?post_id=$uploading_iframe_ID";
- $media_title = __('Add Media');
- $image_upload_iframe_src = apply_filters('image_upload_iframe_src', "$media_upload_iframe_src&amp;type=image");
- $image_title = __('Add an Image');
- $video_upload_iframe_src = apply_filters('video_upload_iframe_src', "$media_upload_iframe_src&amp;type=video");
- $video_title = __('Add Video');
- $audio_upload_iframe_src = apply_filters('audio_upload_iframe_src', "$media_upload_iframe_src&amp;type=audio");
- $audio_title = __('Add Audio');
-
</del><span class="cx"> $do_image = $do_audio = $do_video = true;
</span><span class="cx"> if ( is_multisite() ) {
</span><span class="cx"> $media_buttons = get_site_option( 'mu_media_buttons' );
</span><span class="lines">@@ -376,17 +364,36 @@
</span><span class="cx"> $out = '';
</span><span class="cx">
</span><span class="cx"> if ( $do_image )
</span><del>- $out .= "<a href='{$image_upload_iframe_src}&amp;TB_iframe=true' id='add_image' class='thickbox' title='$image_title' onclick='return false;'><img src='" . esc_url( admin_url( 'images/media-button-image.gif' ) ) . "' alt='$image_title' /></a>";
</del><ins>+ $out .= _media_button(__('Add an Image'), 'images/media-button-image.gif', 'image');
</ins><span class="cx"> if ( $do_video )
</span><del>- $out .= "<a href='{$video_upload_iframe_src}&amp;TB_iframe=true' id='add_video' class='thickbox' title='$video_title' onclick='return false;'><img src='" . esc_url( admin_url( 'images/media-button-video.gif' ) ) . "' alt='$video_title' /></a>";
</del><ins>+ $out .= _media_button(__('Add Video'), 'images/media-button-video.gif', 'video');
</ins><span class="cx"> if ( $do_audio )
</span><del>- $out .= "<a href='{$audio_upload_iframe_src}&amp;TB_iframe=true' id='add_audio' class='thickbox' title='$audio_title' onclick='return false;'><img src='" . esc_url( admin_url( 'images/media-button-music.gif' ) ) . "' alt='$audio_title' /></a>";
- $out .= "<a href='{$media_upload_iframe_src}&amp;TB_iframe=true' id='add_media' class='thickbox' title='$media_title' onclick='return false;'><img src='" . esc_url( admin_url( 'images/media-button-other.gif' ) ) . "' alt='$media_title' /></a>";
</del><ins>+ $out .= _media_button(__('Add Audio'), 'images/media-button-music.gif', 'audio');
</ins><span class="cx">
</span><ins>+ $out .= _media_button(__('Add Media'), 'images/media-button-other.gif', 'media');
+
+ $context = apply_filters('media_buttons_context', __('Upload/Insert %s'));
+
</ins><span class="cx"> printf($context, $out);
</span><span class="cx"> }
</span><span class="cx"> add_action( 'media_buttons', 'media_buttons' );
</span><span class="cx">
</span><ins>+function _media_button($title, $icon, $type) {
+ return "<a href='" . get_upload_iframe_src($type) . "' id='add_$type' class='thickbox' title='$title'><img src='" . esc_url( admin_url( $icon ) ) . "' alt='$title' /></a>";
+}
+
+function get_upload_iframe_src($type) {
+ global $post_ID, $temp_ID;
+ $uploading_iframe_ID = (int) (0 == $post_ID ? $temp_ID : $post_ID);
+ $upload_iframe_src = add_query_arg('post_id', $uploading_iframe_ID, 'media-upload.php');
+
+ if ( 'media' != $type )
+ $upload_iframe_src = add_query_arg('type', $type, $upload_iframe_src);
+ $upload_iframe_src = apply_filters($type . '_upload_iframe_src', $upload_iframe_src);
+
+ return add_query_arg('TB_iframe', true, $upload_iframe_src);
+}
+
</ins><span class="cx"> /**
</span><span class="cx"> * {@internal Missing Short Description}}
</span><span class="cx"> *
</span></span></pre></div>
<a id="trunkwpadminincludespostphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/post.php (14014 => 14015)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/post.php 2010-04-06 04:32:08 UTC (rev 14014)
+++ trunk/wp-admin/includes/post.php 2010-04-06 11:20:47 UTC (rev 14015)
</span><span class="lines">@@ -1143,8 +1143,10 @@
</span><span class="cx"> */
</span><span class="cx"> function _wp_post_thumbnail_html( $thumbnail_id = NULL ) {
</span><span class="cx"> global $content_width, $_wp_additional_image_sizes;
</span><del>- $content = '<p class="hide-if-no-js"><a href="#" id="set-post-thumbnail" onclick="jQuery(\'#add_image\').click();return false;">' . esc_html__( 'Set featured image' ) . '</a></p>';
</del><span class="cx">
</span><ins>+ $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>';
+ $content = sprintf($set_thumbnail_link, esc_html__( 'Set featured image' ));
+
</ins><span class="cx"> if ( $thumbnail_id && get_post( $thumbnail_id ) ) {
</span><span class="cx"> $old_content_width = $content_width;
</span><span class="cx"> $content_width = 266;
</span><span class="lines">@@ -1153,7 +1155,7 @@
</span><span class="cx"> else
</span><span class="cx"> $thumbnail_html = wp_get_attachment_image( $thumbnail_id, 'post-thumbnail' );
</span><span class="cx"> if ( !empty( $thumbnail_html ) ) {
</span><del>- $content = '<a href="#" id="set-post-thumbnail" onclick="jQuery(\'#add_image\').click();return false;">' . $thumbnail_html . '</a>';
</del><ins>+ $content = sprintf($set_thumbnail_link, $thumbnail_html);
</ins><span class="cx"> $content .= '<p class="hide-if-no-js"><a href="#" id="remove-post-thumbnail" onclick="WPRemoveThumbnail();return false;">' . esc_html__( 'Remove featured image' ) . '</a></p>';
</span><span class="cx"> }
</span><span class="cx"> $content_width = $old_content_width;
</span></span></pre></div>
<a id="trunkwpincludesjsthickboxthickboxjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/js/thickbox/thickbox.js (14014 => 14015)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/js/thickbox/thickbox.js 2010-04-06 04:32:08 UTC (rev 14014)
+++ trunk/wp-includes/js/thickbox/thickbox.js 2010-04-06 11:20:47 UTC (rev 14015)
</span><span class="lines">@@ -23,7 +23,7 @@
</span><span class="cx">
</span><span class="cx"> //add thickbox to href & area elements that have a class of .thickbox
</span><span class="cx"> function tb_init(domChunk){
</span><del>- jQuery(domChunk).click(function(){
</del><ins>+ jQuery(domChunk).live('click', function(){
</ins><span class="cx"> var t = this.title || this.name || null;
</span><span class="cx"> var a = this.href || this.alt;
</span><span class="cx"> var g = this.rel || false;
</span></span></pre></div>
<a id="trunkwpincludesscriptloaderphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/script-loader.php (14014 => 14015)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/script-loader.php 2010-04-06 04:32:08 UTC (rev 14014)
+++ trunk/wp-includes/script-loader.php 2010-04-06 11:20:47 UTC (rev 14015)
</span><span class="lines">@@ -167,7 +167,7 @@
</span><span class="cx"> $scripts->add( 'jquery-autocomplete', "/wp-includes/js/jquery/autocomplete$suffix.js", array('jquery'), '1.1' );
</span><span class="cx"> $scripts->add_data( 'jquery-autocomplete', 'group', 1 );
</span><span class="cx">
</span><del>- $scripts->add( 'thickbox', "/wp-includes/js/thickbox/thickbox.js", array('jquery'), '3.1-20100108');
</del><ins>+ $scripts->add( 'thickbox', "/wp-includes/js/thickbox/thickbox.js", array('jquery'), '3.1-20104104');
</ins><span class="cx"> $scripts->add_data( 'thickbox', 'group', 1 );
</span><span class="cx"> $scripts->localize( 'thickbox', 'thickboxL10n', array(
</span><span class="cx"> 'next' => __('Next &gt;'),
</span></span></pre>
</div>
</div>
</body>
</html>