Changeset 14109

Timestamp:

04/16/2010 02:15:16 PM (16 years ago)

Author:

nacin

Message:

Strip new lines from Viddler embeds, as we do for Scribd embeds. Avoids conflicts with wpautop. props Viper007Bond. see #12115.

File:

• trunk/wp-includes/class-oembed.php (modified) (3 diffs)

trunk/wp-includes/class-oembed.php

@@ -57 +57 @@
                 ) );
 
-                // 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 );
         }
 
@@ -264 +264 @@
 
         /**
-         * 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()
@@ -271 +272 @@
          * @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 );