<!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>[24240] trunk/wp-includes/media.php: Return the requested image size in get_the_post_format_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">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/24240">24240</a></dd>
<dt>Author</dt> <dd>markjaquith</dd>
<dt>Date</dt> <dd>2013-05-10 22:49:24 +0000 (Fri, 10 May 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Return the requested image size in get_the_post_format_image()
props kovshenin. fixes <a href="http://core.trac.wordpress.org/ticket/24188">#24188</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesmediaphp">trunk/wp-includes/media.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludesmediaphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/media.php (24239 => 24240)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/media.php 2013-05-10 21:38:48 UTC (rev 24239)
+++ trunk/wp-includes/media.php 2013-05-10 22:49:24 UTC (rev 24240)
</span><span class="lines">@@ -2453,13 +2453,33 @@
</span><span class="cx"> $meta['image']
</span><span class="cx"> );
</span><span class="cx"> }
</span><ins>+
+ $attachment_id = img_html_to_post_id( $meta['image'], $matched_html );
+ if ( $attachment_id && $matched_html ) {
+ $meta['image'] = str_replace( $matched_html, wp_get_attachment_image( $attachment_id, $attached_size ), $meta['image'] );
+ $attachment = wp_get_attachment_image_src( $attachment_id, $attached_size );
+ $attachment_width = ( ! empty( $attachment[1] ) ) ? $attachment[1] : 0;
+
+ if ( $attachment_width && preg_match_all( '#width=([\'"])(.+?)\1#is', $meta['image'], $matches ) && ! empty( $matches ) )
+ foreach ( $matches[2] as $width )
+ if ( $width != $attachment_width )
+ $meta['image'] = str_replace( $matches[0], sprintf( 'width="%d"', $attachment_width ), $meta['image'] );
+ }
+
</ins><span class="cx"> $image = do_shortcode( $meta['image'] );
</span><span class="cx"> } elseif ( ! preg_match( '#<[^>]+>#', $meta['image'] ) ) {
</span><span class="cx"> // not HTML, assume URL
</span><del>- $image = sprintf( '<img src="%s" alt="" />', esc_url( $meta['image'] ) );
</del><ins>+ $attachment_id = attachment_url_to_postid( $meta['image'] );
+ if ( $attachment_id )
+ $image = wp_get_attachment_image( $attachment_id, $attached_size );
+ else
+ $image = sprintf( '<img src="%s" alt="" />', esc_url( $meta['image'] ) );
</ins><span class="cx"> } else {
</span><span class="cx"> // assume HTML
</span><span class="cx"> $image = $meta['image'];
</span><ins>+ $attachment_id = img_html_to_post_id( $image, $matched_html );
+ if ( $attachment_id && $matched_html )
+ $image = str_replace( $matched_html, wp_get_attachment_image( $attachment_id, $attached_size ), $image );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( false === strpos( $image, '<a ' ) )
</span><span class="lines">@@ -2532,6 +2552,11 @@
</span><span class="cx"> $htmls = get_content_images( $content, true, true, 1 );
</span><span class="cx"> if ( ! empty( $htmls ) ) {
</span><span class="cx"> $html = reset( $htmls );
</span><ins>+
+ $attachment_id = img_html_to_post_id( $html, $matched_html );
+ if ( $attachment_id && $matched_html )
+ $html = str_replace( $matched_html, wp_get_attachment_image( $attachment_id, $attached_size ), $html );
+
</ins><span class="cx"> $post->split_content = $content;
</span><span class="cx"> $post->format_content[ $cache_key ] = sprintf( $link_fmt, $html );
</span><span class="cx"> return $post->format_content[ $cache_key ];
</span><span class="lines">@@ -2569,3 +2594,39 @@
</span><span class="cx">
</span><span class="cx"> return 0;
</span><span class="cx"> }
</span><ins>+
+/**
+ * Retrieve the attachment post id from HTML containing an image.
+ *
+ * @since 3.6.0
+ *
+ * @param string $html The html, possibly with an image
+ * @param string $matched_html Passed by reference, will be set to to the matched img string
+ * @return int The attachment id if found, or 0.
+ */
+function img_html_to_post_id( $html, &$matched_html = null ) {
+ $attachment_id = 0;
+
+ // Look for an <img /> tag
+ if ( ! preg_match( '#' . get_tag_regex( 'img' ) . '#i', $html, $matches ) || empty( $matches ) )
+ return $attachment_id;
+
+ $matched_html = $matches[0];
+
+ // Look for attributes.
+ if ( ! preg_match_all( '#(src|class)=([\'"])(.+?)\2#is', $matched_html, $matches ) || empty( $matches ) )
+ return $attachment_id;
+
+ $attr = array();
+ foreach ( $matches[1] as $key => $attribute_name )
+ $attr[ $attribute_name ] = $matches[3][ $key ];
+
+ if ( ! empty( $attr['class'] ) && false !== strpos( $attr['class'], 'wp-image-' ) )
+ if ( preg_match( '#wp-image-([0-9]+)#i', $attr['class'], $matches ) )
+ $attachment_id = absint( $matches[1] );
+
+ if ( ! $attachment_id && ! empty( $attr['src'] ) )
+ $attachment_id = attachment_url_to_postid( $attr['src'] );
+
+ return $attachment_id;
+}
</ins><span class="cx">\ No newline at end of file
</span></span></pre>
</div>
</div>
</body>
</html>