Ticket #17857: 17857.001.patch

wp-includes/media.php

@@ -1130 +1130 @@
          * The {@link do_shortcode()} callback function.
          *
          * Attempts to convert a URL into embed HTML. Starts by checking the URL against the regex of the registered embed handlers.
-         * If none of the regex matches and it's enabled, then the URL will be given to the {@link WP_oEmbed} class.
+         * Next, checks the URL against the regex of registered {@link WP_oEmbed} providers if oEmbed discovery is false.
+         * If none of the regex matches and it's enabled, then the URL will be passed to {@link WP_Embed::parse_oembed()} for oEmbed parsing.
          *
-         * @uses wp_oembed_get()
          * @uses wp_parse_args()
          * @uses wp_embed_defaults()
+         * @uses author_can()
+         * @uses _wp_oembed_get_object()
          * @uses WP_Embed::maybe_make_link()
-         * @uses get_option()
-         * @uses current_user_can()
-         * @uses wp_cache_get()
-         * @uses wp_cache_set()
-         * @uses get_post_meta()
-         * @uses update_post_meta()
          *
          * @param array $attr Shortcode attributes.
          * @param string $url The URL attempting to be embeded.
@@ -1171 +1167 @@
                         }
                 }
 
+                // Get post ID
                 $post_ID = ( !empty($post->ID) ) ? $post->ID : null;
-                if ( !empty($this->post_ID) ) // Potentially set by WP_Embed::cache_oembed()
+                if ( !empty( $this->post_ID ) ) // Potentially set by WP_Embed::cache_oembed()
                         $post_ID = $this->post_ID;
 
-                // Unknown URL format. Let oEmbed have a go.
+                // Let 3rd-party plugins override post ID so they can easily extend the WP_Embed class
+                $post_ID = apply_filters( 'embed_post_id', $post_ID );
+
+                // Is oEmbed discovery on?
+                $attr['discover'] = ( apply_filters( 'embed_oembed_discover', false ) && apply_filters( 'embed_oembed_author_can', author_can( $post_ID, 'unfiltered_html' ), $post_ID ) );
+
+                // Set up a new WP oEmbed object to check URL with registered oEmbed providers
+                require_once( ABSPATH . WPINC . '/class-oembed.php' );
+                $oembed_obj = _wp_oembed_get_object();
+
+                // If oEmbed discovery is true, skip oEmbed provider check
+                $is_oembed_link = false;
+                if ( !$attr['discover'] ) {
+                        foreach ( (array)$oembed_obj->providers as $provider_matchmask => $provider ) {
+                                $regex = ( $is_regex = $provider[1] ) ? $provider_matchmask : '#' . str_replace( '___wildcard___', '(.+)', preg_quote( str_replace( '*', '___wildcard___', $provider_matchmask ), '#' ) ) . '#i';
+
+                                if ( preg_match( $regex, $url ) )
+                                        $is_oembed_link = true;
+                        }
+
+                        // If url doesn't match a WP oEmbed provider, stop parsing
+                        if ( !$is_oembed_link )
+                                return $this->maybe_make_link( $url );
+                }
+
+                return $this->parse_oembed( $post_ID, $url, $attr, $rawattr );
+        }
+
+        /**
+         * Attempts to convert a URL into embed HTML. Checks cache first. If no cache, ping oEmbed provider and cache the result.
+         * URL is passed to the {@link WP_oEmbed} class via {@link wp_oembed_get()}.
+         * 3rd party plugins not using post types could extend this class and function to grab their own cache.
+         *
+         * @uses wp_oembed_get()
+         * @uses WP_Embed::maybe_make_link()
+         * @uses get_post_meta()
+         * @uses update_post_meta()
+         * @param int $post_id Post ID to do the caching for.
+         * @param string $url The URL attempting to be embedded.
+         * @param array $attr Shortcode attributes.
+         * @param array $rawattr Untouched shortcode attributes.
+         * @return string The embed HTML on success, otherwise the original URL.
+         */
+        function parse_oembed( $post_ID, $url, $attr, $rawattr ) {
                 if ( $post_ID ) {
 
                         // Check for a cached result (stored in the post meta)
@@ -1187 +1227 @@
                                 if ( '{{unknown}}' === $cache )
                                         return $this->maybe_make_link( $url );
 
-                                if ( !empty($cache) )
+                                if ( !empty( $cache ) )
                                         return apply_filters( 'embed_oembed_html', $cache, $url, $attr, $post_ID );
                         }
 
                         // Use oEmbed to get the HTML
-                        $attr['discover'] = ( apply_filters('embed_oembed_discover', false) && author_can( $post_ID, 'unfiltered_html' ) );
                         $html = wp_oembed_get( $url, $attr );
 
                         // Cache the result