WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Simply search for newlines to strip instead of checking the oEmbed provider. fixes #12115. 

git-svn-id: http://svn.automattic.com/wordpress/trunk@14249 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
nacin 2010-04-27 05:21:39 +00:00
parent e879a9ab0e
commit f9115ee668
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
wp-includes/class-oembed.php
View File

@ -56,7 +56,7 @@ class WP_oEmbed {
'#http://(www\.)?funnyordie\.com/videos/.*#i' => array( 'http://www.funnyordie.com/oembed', true ),
) );
// Fix Scribd and Viddler embeds. They contain new lines in the middle of the HTML which breaks wpautop().
// Fix any embeds that contain new lines in the middle of the HTML which breaks wpautop().
add_filter( 'oembed_dataparse', array(&$this, '_strip_newlines'), 10, 3 );
}
@ -263,7 +263,7 @@ class WP_oEmbed {
}
/**
* Strip new lines from the HTML if it's a Scribd or Viddler embed.
* Strip any new lines from the HTML.
*
* @access private
* @param string $html Existing HTML.
@ -272,7 +272,7 @@ class WP_oEmbed {
* @return string Possibly modified $html
*/
function _strip_newlines( $html, $data, $url ) {
if ( preg_match( '#http://(www\.)?scribd.com/.*#i', $url ) || preg_match( '#http://(www\.)?viddler\.com/.*#i', $url ) )
if ( false !== strpos( "\n", $html ) )
$html = str_replace( array( "\r\n", "\n" ), '', $html );
return $html;