Ticket #24381: 24381.patch

wp-includes/class-oembed.php

@@ -65 +65 @@
         /**
          * The do-it-all function that takes a URL and attempts to return the HTML.
          *
-         * @see WP_oEmbed::discover()
          * @see WP_oEmbed::fetch()
          * @see WP_oEmbed::data2html()
          *
@@ -74 +73 @@
          * @return bool|string False on failure, otherwise the UNSANITIZED (and potentially unsafe) HTML that should be used to embed.
          */
         function get_html( $url, $args = '' ) {
+                $provider = $this->get_provider( $url, $args );
+
+                if ( !$provider || false === $data = $this->fetch( $provider, $url, $args ) )
+                        return false;
+
+                return apply_filters( 'oembed_result', $this->data2html( $data, $url ), $url, $args );
+        }
+
+        /**
+         * Takes a URL and return the corresponding oEmbed provider URL, if there is one.
+         *
+         * @see WP_oEmbed::discover()
+         *
+         * @param string $url The URL to the content.
+         * @param array $args Optional arguments.
+         * @return bool|string False on failure, otherwise the oEmbed provider URL.
+         * @since 3.6
+         */
+        function get_provider( $url, $args = array() ) {
+
                 $provider = false;
 
                 if ( !isset($args['discover']) )
@@ -97 +116 @@
                 if ( !$provider && $args['discover'] )
                         $provider = $this->discover( $url );
 
-                if ( !$provider || false === $data = $this->fetch( $provider, $url, $args ) )
-                        return false;
+                return $provider;
 
-                return apply_filters( 'oembed_result', $this->data2html( $data, $url ), $url, $args );
         }
 
         /**