<!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>[37988] trunk/src/wp-includes/theme-compat/embed-content.php: Embeds: Don't print the HTML for a featured image if a post has no featured image.</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/37988">37988</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/37988","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-07-06 17:07:19 +0000 (Wed, 06 Jul 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'>Embeds: Don't print the HTML for a featured image if a post has no featured image.
See <a href="https://core.trac.wordpress.org/changeset/36693">[36693]</a>.
Fixes <a href="https://core.trac.wordpress.org/ticket/37288">#37288</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesthemecompatembedcontentphp">trunk/src/wp-includes/theme-compat/embed-content.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesthemecompatembedcontentphp"></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/theme-compat/embed-content.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/theme-compat/embed-content.php 2016-07-06 14:45:55 UTC (rev 37987)
+++ trunk/src/wp-includes/theme-compat/embed-content.php 2016-07-06 17:07:19 UTC (rev 37988)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -22,49 +22,51 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $thumbnail_id = get_the_ID();
</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">- $aspect_ratio = 1;
- $measurements = array( 1, 1 );
- $image_size = 'full'; // Fallback.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $thumbnail_id ) {
+ $aspect_ratio = 1;
+ $measurements = array( 1, 1 );
+ $image_size = 'full'; // Fallback.
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $meta = wp_get_attachment_metadata( $thumbnail_id );
- if ( ! empty( $meta['sizes'] ) ) {
- foreach ( $meta['sizes'] as $size => $data ) {
- if ( $data['width'] / $data['height'] > $aspect_ratio ) {
- $aspect_ratio = $data['width'] / $data['height'];
- $measurements = array( $data['width'], $data['height'] );
- $image_size = $size;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $meta = wp_get_attachment_metadata( $thumbnail_id );
+ if ( ! empty( $meta['sizes'] ) ) {
+ foreach ( $meta['sizes'] as $size => $data ) {
+ if ( $data['width'] / $data['height'] > $aspect_ratio ) {
+ $aspect_ratio = $data['width'] / $data['height'];
+ $measurements = array( $data['width'], $data['height'] );
+ $image_size = $size;
+ }
</ins><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">- }
</del><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /**
- * Filters the thumbnail image size for use in the embed template.
- *
- * @since 4.4.0
- * @since 4.5.0 Added `$thumbnail_id` parameter.
- *
- * @param string $image_size Thumbnail image size.
- * @param int $thumbnail_id Attachment ID.
- */
- $image_size = apply_filters( 'embed_thumbnail_image_size', $image_size, $thumbnail_id );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**
+ * Filters the thumbnail image size for use in the embed template.
+ *
+ * @since 4.4.0
+ * @since 4.5.0 Added `$thumbnail_id` parameter.
+ *
+ * @param string $image_size Thumbnail image size.
+ * @param int $thumbnail_id Attachment ID.
+ */
+ $image_size = apply_filters( 'embed_thumbnail_image_size', $image_size, $thumbnail_id );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $shape = $measurements[0] / $measurements[1] >= 1.75 ? 'rectangular' : 'square';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $shape = $measurements[0] / $measurements[1] >= 1.75 ? 'rectangular' : 'square';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /**
- * Filters the thumbnail shape for use in the embed template.
- *
- * Rectangular images are shown above the title while square images
- * are shown next to the content.
- *
- * @since 4.4.0
- * @since 4.5.0 Added `$thumbnail_id` parameter.
- *
- * @param string $shape Thumbnail image shape. Either 'rectangular' or 'square'.
- * @param int $thumbnail_id Attachment ID.
- */
- $shape = apply_filters( 'embed_thumbnail_image_shape', $shape, $thumbnail_id );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**
+ * Filters the thumbnail shape for use in the embed template.
+ *
+ * Rectangular images are shown above the title while square images
+ * are shown next to the content.
+ *
+ * @since 4.4.0
+ * @since 4.5.0 Added `$thumbnail_id` parameter.
+ *
+ * @param string $shape Thumbnail image shape. Either 'rectangular' or 'square'.
+ * @param int $thumbnail_id Attachment ID.
+ */
+ $shape = apply_filters( 'embed_thumbnail_image_shape', $shape, $thumbnail_id );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'rectangular' === $shape ) : ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $thumbnail_id && 'rectangular' === $shape ) : ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <div class="wp-embed-featured-image rectangular">
</span><span class="cx" style="display: block; padding: 0 10px"> <a href="<?php the_permalink(); ?>" target="_top">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php echo wp_get_attachment_image( $thumbnail_id, $image_size ); ?>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -78,7 +80,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> </a>
</span><span class="cx" style="display: block; padding: 0 10px"> </p>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php if ( 'square' === $shape ) : ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php if ( $thumbnail_id && 'square' === $shape ) : ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <div class="wp-embed-featured-image square">
</span><span class="cx" style="display: block; padding: 0 10px"> <a href="<?php the_permalink(); ?>" target="_top">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php echo wp_get_attachment_image( $thumbnail_id, $image_size ); ?>
</span></span></pre>
</div>
</div>
</body>
</html>