<!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" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { 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 #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#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>
<title>[14249] trunk/wp-includes/class-oembed.php:
Simply search for newlines to strip instead of checking the oEmbed provider
.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/14249">14249</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2010-04-27 05:21:39 +0000 (Tue, 27 Apr 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Simply search for newlines to strip instead of checking the oEmbed provider. fixes <a href="http://trac.wordpress.org/ticket/12115">#12115</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesclassoembedphp">trunk/wp-includes/class-oembed.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludesclassoembedphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/class-oembed.php (14248 => 14249)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/class-oembed.php 2010-04-27 01:05:58 UTC (rev 14248)
+++ trunk/wp-includes/class-oembed.php 2010-04-27 05:21:39 UTC (rev 14249)
</span><span class="lines">@@ -56,7 +56,7 @@
</span><span class="cx"> '#http://(www\.)?funnyordie\.com/videos/.*#i' => array( 'http://www.funnyordie.com/oembed', true ),
</span><span class="cx"> ) );
</span><span class="cx">
</span><del>- // Fix Scribd and Viddler embeds. They contain new lines in the middle of the HTML which breaks wpautop().
</del><ins>+ // Fix any embeds that contain new lines in the middle of the HTML which breaks wpautop().
</ins><span class="cx"> add_filter( 'oembed_dataparse', array(&$this, '_strip_newlines'), 10, 3 );
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -263,7 +263,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Strip new lines from the HTML if it's a Scribd or Viddler embed.
</del><ins>+ * Strip any new lines from the HTML.
</ins><span class="cx"> *
</span><span class="cx"> * @access private
</span><span class="cx"> * @param string $html Existing HTML.
</span><span class="lines">@@ -272,7 +272,7 @@
</span><span class="cx"> * @return string Possibly modified $html
</span><span class="cx"> */
</span><span class="cx"> function _strip_newlines( $html, $data, $url ) {
</span><del>- if ( preg_match( '#http://(www\.)?scribd.com/.*#i', $url ) || preg_match( '#http://(www\.)?viddler\.com/.*#i', $url ) )
</del><ins>+ if ( false !== strpos( "\n", $html ) )
</ins><span class="cx"> $html = str_replace( array( "\r\n", "\n" ), '', $html );
</span><span class="cx">
</span><span class="cx"> return $html;
</span></span></pre>
</div>
</div>
</body>
</html>