diff --git a/wp-includes/class-oembed.php b/wp-includes/class-oembed.php index bdd159a0e2..00bc64b97e 100644 --- a/wp-includes/class-oembed.php +++ b/wp-includes/class-oembed.php @@ -1,7 +1,8 @@ ` tags. * @return false|string False on failure, otherwise the oEmbed provider URL. */ @@ -389,6 +415,9 @@ class WP_oEmbed { /** * Connects to a oEmbed provider and returns the result. * + * @since 2.9.0 + * @access public + * * @param string $provider The URL to the oEmbed provider. * @param string $url The URL to the content that is desired to be embedded. * @param array $args Optional arguments. Usually passed from a shortcode. @@ -426,6 +455,7 @@ class WP_oEmbed { * * @since 3.0.0 * @access private + * * @param string $provider_url_with_args URL to the provider with full arguments list (url, maxheight, etc.) * @param string $format Format to use * @return false|object|WP_Error False on failure, otherwise the result in the form of an object. @@ -524,6 +554,9 @@ class WP_oEmbed { /** * Converts a data object from {@link WP_oEmbed::fetch()} and returns the HTML. * + * @since 2.9.0 + * @access public + * * @param object $data A data object result from an oEmbed provider. * @param string $url The URL to the content that is desired to be embedded. * @return false|string False on error, otherwise the HTML needed to embed. @@ -577,7 +610,10 @@ class WP_oEmbed { /** * Strip any new lines from the HTML. * + * @since 2.9.0 as strip_scribd_newlines() + * @since 3.0.0 * @access public + * * @param string $html Existing HTML. * @param object $data Data object from WP_oEmbed::data2html() * @param string $url The original URL passed to oEmbed. diff --git a/wp-includes/version.php b/wp-includes/version.php index 8ea4888d09..49b58b6fa6 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '4.5-beta4-37066'; +$wp_version = '4.5-beta4-37067'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.