<!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>[24078] trunk/wp-includes: Fix mangled image output in compat function.</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/24078">24078</a></dd>
<dt>Author</dt> <dd>markjaquith</dd>
<dt>Date</dt> <dd>2013-04-25 02:18:49 +0000 (Thu, 25 Apr 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix mangled image output in compat function.
props wonderboymusic. see <a href="http://core.trac.wordpress.org/ticket/24175">#24175</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesmediaphp">trunk/wp-includes/media.php</a></li>
<li><a href="#trunkwpincludespostformatsphp">trunk/wp-includes/post-formats.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 (24077 => 24078)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/media.php 2013-04-25 02:07:05 UTC (rev 24077)
+++ trunk/wp-includes/media.php 2013-04-25 02:18:49 UTC (rev 24078)
</span><span class="lines">@@ -2428,7 +2428,7 @@
</span><span class="cx"> // wrap image in <a>
</span><span class="cx"> if ( ! empty( $meta['url'] ) )
</span><span class="cx"> $image = sprint( $link_fmt, $image );
</span><del>- } elseif ( has_shortcode( $meta['image'], 'gallery' ) ) {
</del><ins>+ } elseif ( has_shortcode( $meta['image'], 'caption' ) ) {
</ins><span class="cx"> // wrap <img> in <a>
</span><span class="cx"> if ( ! empty( $meta['url'] ) && false === strpos( $meta['image'], '<a ' ) ) {
</span><span class="cx"> $meta['image'] = preg_replace(
</span></span></pre></div>
<a id="trunkwpincludespostformatsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/post-formats.php (24077 => 24078)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/post-formats.php 2013-04-25 02:07:05 UTC (rev 24077)
+++ trunk/wp-includes/post-formats.php 2013-04-25 02:18:49 UTC (rev 24078)
</span><span class="lines">@@ -374,27 +374,41 @@
</span><span class="cx">
</span><span class="cx"> case 'image':
</span><span class="cx"> if ( ! empty( $meta['image'] ) ) {
</span><del>- $image = is_numeric( $meta['image'] ) ? wp_get_attachment_url( $meta['image'] ) : $meta['image'];
</del><span class="cx">
</span><del>- if ( ! empty( $image ) && ! stristr( $content, $image ) ) {
- if ( false === strpos( $image, '<a ' ) ) {
- $image_html = sprintf(
</del><ins>+ if ( has_shortcode( $meta['image'], 'caption' ) ) {
+ // wrap <img> in <a>
+ if ( ! empty( $meta['url'] ) && false === strpos( $meta['image'], '<a ' ) ) {
+ $meta['image'] = preg_replace(
+ '#(<img[^>]+>)#',
+ sprintf( '<a href="%s">$1</a>', esc_url( $meta['url'] ) ),
+ $meta['image']
+ );
+ }
+ $format_output .= do_shortcode( $meta['image'] );
+ } else {
+
+ if ( is_numeric( $meta['image'] ) ) {
+ $image = wp_get_attachment_image( absint( $meta['image'] ), 'full' );
+ } elseif ( ! preg_match( '#<[^>]+>#', $meta['image'] ) ) {
+ // not HTML, assume URL
+ $image = sprintf(
</ins><span class="cx"> '<img %ssrc="%s" alt="" />',
</span><span class="cx"> empty( $compat['image_class'] ) ? '' : sprintf( 'class="%s" ', esc_attr( $compat['image_class'] ) ),
</span><del>- $image
</del><ins>+ esc_url( $meta['image'] )
</ins><span class="cx"> );
</span><span class="cx"> } else {
</span><del>- $image_html = $image;
</del><ins>+ // assume HTML
+ $image = $meta['image'];
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- if ( empty( $meta['url'] ) || false !== strpos( $image, '<a ' ) ) {
- $format_output .= $image_html;
- } else {
</del><ins>+ if ( ! empty( $meta['url'] ) && false === strpos( $image, '<a ' ) ) {
</ins><span class="cx"> $format_output .= sprintf(
</span><span class="cx"> '<a href="%s">%s</a>',
</span><span class="cx"> esc_url( $meta['url'] ),
</span><del>- $image_html
</del><ins>+ $image
</ins><span class="cx"> );
</span><ins>+ } else {
+ $format_output .= $image;
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>