Changeset 28728

Timestamp:

06/10/2014 06:13:43 PM (10 years ago)

Author:

johnbillion

Message:

A little more abstraction in the WP_oEmbed class. Fixes #24381.

File:

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

trunk/src/wp-includes/class-oembed.php

@@ -96 +96 @@
 
     /**
-     * The do-it-all function that takes a URL and attempts to return the HTML.
+     * Takes a URL and returns the corresponding oEmbed provider's URL, if there is one.
      *
      * @see WP_oEmbed::discover()
-     * @see WP_oEmbed::fetch()
-     * @see WP_oEmbed::data2html()
-     *
-     * @param string $url The URL to the content that should be attempted to be embedded.
-     * @param array $args Optional arguments. Usually passed from a shortcode.
-     * @return bool|string False on failure, otherwise the UNSANITIZED (and potentially unsafe) HTML that should be used to embed.
-     */
-    public function get_html( $url, $args = '' ) {
+     *
+     * @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 4.0.0
+     */
+    public function get_provider( $url, $args = '' ) {
+
         $provider = false;
 
@@ -129 +129 @@
         if ( !$provider && $args['discover'] )
             $provider = $this->discover( $url );
+
+        return $provider;
+    }
+
+    /**
+     * The do-it-all function that takes a URL and attempts to return the HTML.
+     *
+     * @see WP_oEmbed::fetch()
+     * @see WP_oEmbed::data2html()
+     *
+     * @param string $url The URL to the content that should be attempted to be embedded.
+     * @param array $args Optional arguments. Usually passed from a shortcode.
+     * @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 ) )