Changeset 12153 for trunk/wp-includes/class-oembed.php

Timestamp:

11/06/2009 02:22:23 PM (15 years ago)

Author:

ryan

Message:

Add a bunch of new filters. Use one of them to remove new lines from Scribd embeds. Invalid oEmbed post meta cache without using JS. Props Viper007Bond. see #10337

File:

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

trunk/wp-includes/class-oembed.php

@@ -48 +48 @@
             'http://i*.photobucket.com/albums/*'    => array( 'http://photobucket.com/oembed',            false ),
             'http://gi*.photobucket.com/groups/*'   => array( 'http://photobucket.com/oembed',            false ),
-            '#http://(www\.)?scribd.com/.*#i'       => array( 'http://www.scribd.com/services/oembed',    true)
+            '#http://(www\.)?scribd.com/.*#i'       => array( 'http://www.scribd.com/services/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 );
     }
 
@@ -88 +91 @@
             return false;
 
-        return apply_filters( 'oembed_output', $this->data2html( $data, $url ), $url, $args );
+        return apply_filters( 'oembed_result', $this->data2html( $data, $url ), $url, $args );
     }
 
@@ -207 +210 @@
 
                 $title = ( !empty($data->title) ) ? $data->title : '';
-                return '<img src="' . esc_attr( clean_url( $data->url ) ) . '" alt="' . esc_attr($title) . '" width="' . esc_attr($data->width) . '" height="' . esc_attr($data->height) . '" />';
+                $return = '<img src="' . esc_attr( clean_url( $data->url ) ) . '" alt="' . esc_attr($title) . '" width="' . esc_attr($data->width) . '" height="' . esc_attr($data->height) . '" />';
+                break;
 
             case 'video':
             case 'rich':
-                return ( !empty($data->html) ) ? $data->html : false;
+                $return = ( !empty($data->html) ) ? $data->html : false;
+                break;
 
             case 'link':
-                return ( !empty($data->title) ) ? '<a href="' . clean_url($url) . '">' . esc_html($data->title) . '</a>' : false;
-        }
-
-        return false;
+                $return = ( !empty($data->title) ) ? '<a href="' . clean_url($url) . '">' . esc_html($data->title) . '</a>' : false;
+                break;
+
+            default;
+                $return = false;
+        }
+
+        // You can use this filter to add support for custom data types or to filter the result
+        return apply_filters( 'oembed_dataparse', $return, $data, $url );
+    }
+
+    /**
+     * Strip new lines from the HTML if it's a Scribd embed.
+     *
+     * @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 ) )
+            $html = str_replace( array( "\r\n", "\n" ), '', $html );
+
+        return $html;
     }
 }