<!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>[24554] trunk/wp-includes: Lose content removal and splitting from get_content_url().</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/24554">24554</a></dd>
<dt>Author</dt> <dd>ocean90</dd>
<dt>Date</dt> <dd>2013-07-03 22:36:13 +0000 (Wed, 03 Jul 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Lose content removal and splitting from get_content_url(). And remove unneeded lines from <a href="http://core.trac.wordpress.org/changeset/24400">[24400]</a>.
fixes <a href="http://core.trac.wordpress.org/ticket/24484">#24484</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 (24553 => 24554)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/media.php 2013-07-03 21:29:53 UTC (rev 24553)
+++ trunk/wp-includes/media.php 2013-07-03 22:36:13 UTC (rev 24554)
</span><span class="lines">@@ -2424,7 +2424,6 @@
</span><span class="cx"> if ( strstr( $shortcode[0], $url ) ) {
</span><span class="cx"> if ( ! $matched )
</span><span class="cx"> $matched = do_shortcode_tag( $shortcode );
</span><del>- // $content = str_replace( $shortcode[0], '', $content, $count );
</del><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -2438,7 +2437,6 @@
</span><span class="cx"> if ( strstr( $match[0], $url ) ) {
</span><span class="cx"> if ( ! $matched )
</span><span class="cx"> $matched = $match[0];
</span><del>- // $content = str_replace( $match[0], '', $content, $count );
</del><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -2505,9 +2503,9 @@
</span><span class="cx"> if ( ! preg_match( '#class=([\'"])(.+?)\1#is', $matched_html, $matches ) || empty( $matches ) )
</span><span class="cx"> return $attachment_id;
</span><span class="cx">
</span><del>- $classes = $matches[2];
- if ( ! empty( $classes ) && false !== strpos( $classes, 'wp-image-' ) )
- if ( preg_match( '#wp-image-([0-9]+)#i', $classes, $matches ) )
</del><ins>+ $classes = $matches[2];
+ if ( ! empty( $classes ) && false !== strpos( $classes, 'wp-image-' ) )
+ if ( preg_match( '#wp-image-([0-9]+)#i', $classes, $matches ) )
</ins><span class="cx"> $attachment_id = absint( $matches[1] );
</span><span class="cx">
</span><span class="cx"> return $attachment_id;
</span></span></pre></div>
<a id="trunkwpincludespostformatsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/post-formats.php (24553 => 24554)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/post-formats.php 2013-07-03 21:29:53 UTC (rev 24553)
+++ trunk/wp-includes/post-formats.php 2013-07-03 22:36:13 UTC (rev 24554)
</span><span class="lines">@@ -240,21 +240,18 @@
</span><span class="cx"> *
</span><span class="cx"> * @since 3.6.0
</span><span class="cx"> *
</span><del>- * @param string $content A string which might contain a URL, passed by reference.
- * @param boolean $remove Whether to remove the found URL from the passed content.
</del><ins>+ * @param string $content A string which might contain a URL.
</ins><span class="cx"> * @return string The found URL.
</span><span class="cx"> */
</span><del>-function get_content_url( &$content, $remove = false ) {
</del><ins>+function get_content_url( $content ) {
</ins><span class="cx"> if ( empty( $content ) )
</span><span class="cx"> return '';
</span><span class="cx">
</span><span class="cx"> // the content is a URL
</span><span class="cx"> $trimmed = trim( $content );
</span><span class="cx"> if ( 0 === stripos( $trimmed, 'http' ) && ! preg_match( '#\s#', $trimmed ) ) {
</span><del>- if ( $remove )
- $content = '';
</del><ins>+ return $trimmed;
</ins><span class="cx">
</span><del>- return $trimmed;
</del><span class="cx"> // the content is HTML so we grab the first href
</span><span class="cx"> } elseif ( preg_match( '/<a\s[^>]*?href=([\'"])(.+?)\1/is', $content, $matches ) ) {
</span><span class="cx"> return esc_url_raw( $matches[2] );
</span><span class="lines">@@ -264,12 +261,8 @@
</span><span class="cx"> $line = trim( array_shift( $lines ) );
</span><span class="cx">
</span><span class="cx"> // the content is a URL followed by content
</span><del>- if ( 0 === stripos( $line, 'http' ) ) {
- if ( $remove )
- $content = trim( join( "\n", $lines ) );
-
</del><ins>+ if ( 0 === stripos( $line, 'http' ) )
</ins><span class="cx"> return esc_url_raw( $line );
</span><del>- }
</del><span class="cx">
</span><span class="cx"> return '';
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>