diff --git a/wp-includes/class-oembed.php b/wp-includes/class-oembed.php index 405e8f1cf..beecf4ee3 100644 --- a/wp-includes/class-oembed.php +++ b/wp-includes/class-oembed.php @@ -56,8 +56,8 @@ class WP_oEmbed { '#http://(www\.)?funnyordie\.com/videos/.*#i' => array( 'http://www.funnyordie.com/oembed', true ), ) ); - // Fix Scribd embeds. They contain new lines in the middle of the HTML which breaks wpautop(). - add_filter( 'oembed_dataparse', array(&$this, 'strip_scribd_newlines'), 10, 3 ); + // Fix Scribd and Viddler embeds. They contain new lines in the middle of the HTML which breaks wpautop(). + add_filter( 'oembed_dataparse', array(&$this, '_strip_newlines'), 10, 3 ); } /** @@ -263,15 +263,16 @@ class WP_oEmbed { } /** - * Strip new lines from the HTML if it's a Scribd embed. + * Strip new lines from the HTML if it's a Scribd or Viddler embed. * + * @access private * @param string $html Existing HTML. * @param object $data Data object from WP_oEmbed::data2html() * @param string $url The original URL passed to oEmbed. * @return string Possibly modified $html */ - function strip_scribd_newlines( $html, $data, $url ) { - if ( preg_match( '#http://(www\.)?scribd.com/.*#i', $url ) ) + function _strip_newlines( $html, $data, $url ) { + if ( preg_match( '#http://(www\.)?scribd.com/.*#i', $url ) || preg_match( '#http://(www\.)?viddler\.com/.*#i', $url ) ) $html = str_replace( array( "\r\n", "\n" ), '', $html ); return $html;