Changeset 12153

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

Location:

trunk/wp-includes

Files:

• class-oembed.php (modified) (3 diffs)
• media.php (modified) (6 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;
     }
 }

trunk/wp-includes/media.php

@@ -928 +928 @@
             add_filter( 'the_content', array(&$this, 'autoembed'), 8 );
 
+        // After a post is saved, invalidate the oEmbed cache
+        add_action( 'save_post', array(&$this, 'delete_oembed_caches') );
+
         // After a post is saved, cache oEmbed items via AJAX
         add_action( 'edit_form_advanced', array(&$this, 'maybe_run_ajax_cache') );
@@ -1049 +1052 @@
                 if ( preg_match( $handler['regex'], $url, $matches ) && is_callable( $handler['callback'] ) ) {
                     if ( false !== $return = call_user_func( $handler['callback'], $matches, $attr, $url, $rawattr ) )
-                        return $return;
+                        return apply_filters( 'embed_handler_html', $return, $url, $attr );
                 }
             }
@@ -1071 +1074 @@
 
                 if ( !empty($cache) )
-                    return $cache;
+                    return apply_filters( 'embed_oembed_html', $cache, $url, $attr );
             }
 
@@ -1087 +1090 @@
             // If there was a result, return it
             if ( $html )
-                return $html;
+                return apply_filters( 'embed_oembed_html', $html, $url, $attr );
         }
 
         // Still unknown
         return $this->maybe_make_link( $url );
+    }
+
+    /**
+     * Delete all oEmbed caches.
+     *
+     * @param int $post_ID Post ID to delete the caches for.
+     */
+    function delete_oembed_caches( $post_ID ) {
+        $post_metas = get_post_custom_keys( $post_ID );
+        if ( empty($post_metas) )
+            return;
+        foreach( (array) $post_metas as $post_meta_key ) {
+            if ( '_oembed_' == substr( $post_meta_key, 0, 8 ) )
+                delete_post_meta( $post_ID, $post_meta_key );
+        }
     }
 
@@ -1102 +1120 @@
         $post = get_post( $post_ID );
 
-        // post_type check is incase of "save_post" usage
         if ( empty($post->ID) || !in_array( $post->post_type, apply_filters( 'embed_cache_oembed_types', array( 'post', 'page' ) ) ) )
             return;
-
-        // Dump existing caches
-        $post_metas = get_post_custom_keys( $post->ID );
-        foreach( $post_metas as $post_meta_key ) {
-            if ( '_oembed_' == substr( $post_meta_key, 0, 8 ) )
-                delete_post_meta( $post->ID, $post_meta_key );
-        }
 
         // Trigger a caching
@@ -1162 +1172 @@
      */
     function maybe_make_link( $url ) {
-        return ( $this->linkifunknown ) ? '<a href="' . esc_attr($url) . '">' . esc_html($url) . '</a>' : $url;
+        $output = ( $this->linkifunknown ) ? '<a href="' . esc_attr($url) . '">' . esc_html($url) . '</a>' : $url;
+        return apply_filters( 'embed_maybe_make_link', $output, $url );
     }
 }