<!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>[23984] trunk: Only remove ONE piece of media from the content in setup_postdata().</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, #logmsg > ol { margin-left: 0; 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/23984">23984</a></dd>
<dt>Author</dt> <dd>markjaquith</dd>
<dt>Date</dt> <dd>2013-04-14 01:11:44 +0000 (Sun, 14 Apr 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Only remove ONE piece of media from the content in setup_postdata().
props wonderboymusic. fixes <a href="http://core.trac.wordpress.org/ticket/24052">#24052</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadmincsswpadmincss">trunk/wp-admin/css/wp-admin.css</a></li>
<li><a href="#trunkwpincludesmediaphp">trunk/wp-includes/media.php</a></li>
<li><a href="#trunkwpincludesqueryphp">trunk/wp-includes/query.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadmincsswpadmincss"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/css/wp-admin.css (23983 => 23984)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/css/wp-admin.css 2013-04-13 00:58:37 UTC (rev 23983)
+++ trunk/wp-admin/css/wp-admin.css 2013-04-14 01:11:44 UTC (rev 23984)
</span><span class="lines">@@ -3983,7 +3983,9 @@
</span><span class="cx"> background: #f5f5f5 url(../images/media-button-2x.png) no-repeat 50% 25%;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.wp-format-media-holder.empty {
</del><ins>+.wp-format-media-holder.empty,
+.wp-format-audio .wp-format-media-holder,
+.wp-format-video .wp-format-media-holder {
</ins><span class="cx"> height: auto;
</span><span class="cx"> padding: 55px 0 20px;
</span><span class="cx"> }
</span><span class="lines">@@ -4012,7 +4014,9 @@
</span><span class="cx"> max-height: 100%;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.empty .wp-format-media-select {
</del><ins>+.empty .wp-format-media-select,
+.wp-format-audio .wp-format-media-select,
+.wp-format-video .wp-format-media-select {
</ins><span class="cx"> height: 20px;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpincludesmediaphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/media.php (23983 => 23984)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/media.php 2013-04-13 00:58:37 UTC (rev 23983)
+++ trunk/wp-includes/media.php 2013-04-14 01:11:44 UTC (rev 23984)
</span><span class="lines">@@ -1845,9 +1845,10 @@
</span><span class="cx"> * @param string $content A string which might contain media data.
</span><span class="cx"> * @param boolean $html Whether to return HTML or URLs
</span><span class="cx"> * @param boolean $remove Whether to remove the found URL from the passed content.
</span><ins>+ * @param int $limit Optional. The number of medias to return
</ins><span class="cx"> * @return array A list of parsed shortcodes or extracted srcs
</span><span class="cx"> */
</span><del>-function get_content_media( $type, &$content, $html = true, $remove = false ) {
</del><ins>+function get_content_media( $type, &$content, $html = true, $remove = false, $limit = 0 ) {
</ins><span class="cx"> $items = array();
</span><span class="cx"> $matches = array();
</span><span class="cx">
</span><span class="lines">@@ -1859,6 +1860,8 @@
</span><span class="cx"> $content =& str_replace( $shortcode[0], '', $content, $count );
</span><span class="cx">
</span><span class="cx"> $items[] = do_shortcode_tag( $shortcode );
</span><ins>+ if ( $limit > 0 && count( $items ) >= $limit )
+ break;
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -2043,9 +2046,10 @@
</span><span class="cx"> *
</span><span class="cx"> * @param string $type Required. 'audio' or 'video'
</span><span class="cx"> * @param WP_Post $post Optional. Used instead of global $post when passed.
</span><ins>+ * @param int $limit Optional. The number of medias to remove if content is scanned.
</ins><span class="cx"> * @return string
</span><span class="cx"> */
</span><del>-function get_the_post_format_media( $type, &$post = null ) {
</del><ins>+function get_the_post_format_media( $type, &$post = null, $limit = 0 ) {
</ins><span class="cx"> global $wp_embed;
</span><span class="cx">
</span><span class="cx"> if ( empty( $post ) )
</span><span class="lines">@@ -2090,7 +2094,7 @@
</span><span class="cx"> // these functions expect a reference, so we should make a copy of post content to avoid changing it
</span><span class="cx"> $content = $post->post_content;
</span><span class="cx">
</span><del>- $htmls = get_content_media( $type, $content, true, true );
</del><ins>+ $htmls = get_content_media( $type, $content, true, true, $limit );
</ins><span class="cx"> if ( ! empty( $htmls ) ) {
</span><span class="cx"> $html = reset( $htmls );
</span><span class="cx"> $post->split_content = $content;
</span><span class="lines">@@ -2133,7 +2137,8 @@
</span><span class="cx"> *
</span><span class="cx"> */
</span><span class="cx"> function the_post_format_video() {
</span><del>- echo get_the_post_format_media( 'video' );
</del><ins>+ $null = null;
+ echo get_the_post_format_media( 'video', $null, 1 );
</ins><span class="cx"> }
</span><span class="cx"> /**
</span><span class="cx"> * Output the first audio in the current (@global) post's content
</span><span class="lines">@@ -2142,7 +2147,8 @@
</span><span class="cx"> *
</span><span class="cx"> */
</span><span class="cx"> function the_post_format_audio() {
</span><del>- echo get_the_post_format_media( 'audio' );
</del><ins>+ $null = null;
+ echo get_the_post_format_media( 'audio', $null, 1 );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span></span></pre></div>
<a id="trunkwpincludesqueryphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/query.php (23983 => 23984)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/query.php 2013-04-13 00:58:37 UTC (rev 23983)
+++ trunk/wp-includes/query.php 2013-04-14 01:11:44 UTC (rev 23984)
</span><span class="lines">@@ -3702,12 +3702,12 @@
</span><span class="cx"> $split_content = $post->split_content;
</span><span class="cx"> break;
</span><span class="cx"> case 'audio':
</span><del>- get_the_post_format_media( 'audio', $post );
</del><ins>+ get_the_post_format_media( 'audio', $post, 1 );
</ins><span class="cx"> if ( isset( $post->split_content ) )
</span><span class="cx"> $split_content = $post->split_content;
</span><span class="cx"> break;
</span><span class="cx"> case 'video':
</span><del>- get_the_post_format_media( 'video', $post );
</del><ins>+ get_the_post_format_media( 'video', $post, 1 );
</ins><span class="cx"> if ( isset( $post->split_content ) )
</span><span class="cx"> $split_content = $post->split_content;
</span><span class="cx"> break;
</span></span></pre>
</div>
</div>
</body>
</html>