sergiotarxz/Wordpress
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
git-svn-id: https://develop.svn.wordpress.org/trunk@28728 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
John Blackbourn 2014-06-10 18:13:43 +00:00
parent 821c052473
commit f54bb586c8
1 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/wp-includes/class-oembed.php
View File

@ -95,17 +95,17 @@ class WP_oEmbed {
} }
/** /**
* 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::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 string $url The URL to the content.
* @param array $args Optional arguments. Usually passed from a shortcode. * @param array $args Optional arguments.
* @return bool|string False on failure, otherwise the UNSANITIZED (and potentially unsafe) HTML that should be used to embed. * @return bool|string False on failure, otherwise the oEmbed provider URL.
* @since 4.0.0
*/ */
public function get_html( $url, $args = '' ) { public function get_provider( $url, $args = '' ) {
$provider = false; $provider = false;
if ( !isset($args['discover']) ) if ( !isset($args['discover']) )
@ -129,6 +129,22 @@ class WP_oEmbed {
if ( !$provider && $args['discover'] ) if ( !$provider && $args['discover'] )
$provider = $this->discover( $url ); $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 ) ) if ( !$provider || false === $data = $this->fetch( $provider, $url, $args ) )
return false; return false;