<!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" />
<title>[38263] trunk: Post Thumbnails: Restore thumbnail support for media files.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { 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 #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#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>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/38263">38263</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/38263","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>ocean90</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2016-08-15 19:15:48 +0000 (Mon, 15 Aug 2016)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Post Thumbnails: Restore thumbnail support for media files.
* Allow to add/remove a featured image to `attachment:audio` and `attachment:video` post types, see <a href="https://core.trac.wordpress.org/changeset/27657">[27657]</a>.
* Change conditionals to check for theme OR post type support.
* Add tests for <a href="https://core.trac.wordpress.org/ticket/12922">#12922</a>.
Broken in <a href="https://core.trac.wordpress.org/changeset/37658">[37658]</a>.
Props flixos90, joemcgill, DrewAPicture, wonderboymusic.
See <a href="https://core.trac.wordpress.org/ticket/12922">#12922</a>.
Fixes <a href="https://core.trac.wordpress.org/ticket/37658">#37658</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludespostphp">trunk/src/wp-includes/post.php</a></li>
<li><a href="#trunktestsphpunittestspostthumbnailsphp">trunk/tests/phpunit/tests/post/thumbnails.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludespostphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/post.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/post.php 2016-08-15 18:21:13 UTC (rev 38262)
+++ trunk/src/wp-includes/post.php 2016-08-15 19:15:48 UTC (rev 38263)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3259,16 +3259,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Set or remove featured image.
- if ( isset( $postarr['_thumbnail_id'] ) && ( post_type_supports( $post_type, 'thumbnail' ) || 'revision' === $post_type ) ) {
- $thumbnail_id = intval( $postarr['_thumbnail_id'] );
- if ( -1 === $thumbnail_id ) {
- delete_post_thumbnail( $post_ID );
- } else {
- set_post_thumbnail( $post_ID, $thumbnail_id );
- }
- }
-
</del><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $postarr['meta_input'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $postarr['meta_input'] as $field => $value ) {
</span><span class="cx" style="display: block; padding: 0 10px"> update_post_meta( $post_ID, $field, $value );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3292,6 +3282,27 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Set or remove featured image.
+ if ( isset( $postarr['_thumbnail_id'] ) ) {
+ $thumbnail_support = current_theme_supports( 'post-thumbnails', $post_type ) && post_type_supports( $post_type, 'thumbnail' ) || 'revision' === $post_type;
+ if ( ! $thumbnail_support && 'attachment' === $post_type && $post_mime_type ) {
+ if ( wp_attachment_is( 'audio', $post_ID ) ) {
+ $thumbnail_support = post_type_supports( 'attachment:audio', 'thumbnail' ) || current_theme_supports( 'post-thumbnails', 'attachment:audio' );
+ } elseif ( wp_attachment_is( 'video', $post_ID ) ) {
+ $thumbnail_support = post_type_supports( 'attachment:video', 'thumbnail' ) || current_theme_supports( 'post-thumbnails', 'attachment:video' );
+ }
+ }
+
+ if ( $thumbnail_support ) {
+ $thumbnail_id = intval( $postarr['_thumbnail_id'] );
+ if ( -1 === $thumbnail_id ) {
+ delete_post_thumbnail( $post_ID );
+ } else {
+ set_post_thumbnail( $post_ID, $thumbnail_id );
+ }
+ }
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> clean_post_cache( $post_ID );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $post = get_post( $post_ID );
</span></span></pre></div>
<a id="trunktestsphpunittestspostthumbnailsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/post/thumbnails.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/post/thumbnails.php 2016-08-15 18:21:13 UTC (rev 38262)
+++ trunk/tests/phpunit/tests/post/thumbnails.php 2016-08-15 19:15:48 UTC (rev 38263)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -233,4 +233,86 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( wp_get_attachment_url( self::$attachment_id ), $actual );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ /**
+ * @ticket 12922
+ */
+ function test__wp_preview_post_thumbnail_filter() {
+ $old_post = isset( $GLOBALS['post'] ) ? $GLOBALS['post'] : null;
+
+ $GLOBALS['post'] = self::$post;
+ $_REQUEST['_thumbnail_id'] = self::$attachment_id;
+
+ $result = _wp_preview_post_thumbnail_filter( '', self::$post->ID, '_thumbnail_id' );
+ $this->assertEquals( self::$attachment_id, $result );
+
+ unset( $_REQUEST['_thumbnail_id'] );
+ if ( null === $old_post ) {
+ unset( $GLOBALS['post'] );
+ } else {
+ $GLOBALS['post'] = $old_post;
+ }
+ }
+
+ /**
+ * @ticket 12922
+ */
+ function test_insert_post_with_post_thumbnail() {
+ $post_id = wp_insert_post( array(
+ 'ID' => self::$post->ID,
+ 'post_status' => 'publish',
+ 'post_content' => rand_str(),
+ 'post_title' => rand_str(),
+ '_thumbnail_id' => self::$attachment_id,
+ ) );
+
+ $thumbnail_id = get_post_thumbnail_id( $post_id );
+ $this->assertEquals( self::$attachment_id, $thumbnail_id );
+
+ $post_id = wp_insert_post( array(
+ 'ID' => $post_id,
+ 'post_status' => 'publish',
+ 'post_content' => rand_str(),
+ 'post_title' => rand_str(),
+ '_thumbnail_id' => - 1, // -1 removes post thumbnail.
+ ) );
+
+ $thumbnail_id = get_post_thumbnail_id( $post_id );
+ $this->assertEmpty( $thumbnail_id );
+ }
+
+ /**
+ * @ticket 37658
+ */
+ function test_insert_attachment_with_post_thumbnail() {
+ // Audio files support featured images.
+ $post_id = wp_insert_post( array(
+ 'post_type' => 'attachment',
+ 'post_status' => 'inherit',
+ 'post_content' => rand_str(),
+ 'post_title' => rand_str(),
+ 'post_mime_type' => 'audio/mpeg',
+ 'post_parent' => 0,
+ 'file' => DIR_TESTDATA . '/audio/test-noise.mp3', // File does not exist, but does not matter here.
+ '_thumbnail_id' => self::$attachment_id,
+ ) );
+
+ $thumbnail_id = get_post_thumbnail_id( $post_id );
+ $this->assertEquals( self::$attachment_id, $thumbnail_id );
+
+ // Images do not support featured images.
+ $post_id = wp_insert_post( array(
+ 'post_type' => 'attachment',
+ 'post_status' => 'inherit',
+ 'post_content' => rand_str(),
+ 'post_title' => rand_str(),
+ 'post_mime_type' => 'image/jpeg',
+ 'post_parent' => 0,
+ 'file' => DIR_TESTDATA . '/images/canola.jpg',
+ '_thumbnail_id' => self::$attachment_id,
+ ) );
+
+ $thumbnail_id = get_post_thumbnail_id( $post_id );
+ $this->assertEmpty( $thumbnail_id );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre>
</div>
</div>
</body>
</html>