From ff32df7c0706c86645a3afd661453c8b24805e86 Mon Sep 17 00:00:00 2001 From: Andrew Ozz Date: Wed, 29 Jul 2015 00:02:24 +0000 Subject: [PATCH] Use the `embed_maybe_make_link` filter to test WP_Embed::autoembed(). See #33106. Built from https://develop.svn.wordpress.org/trunk@33470 git-svn-id: http://core.svn.wordpress.org/trunk@33437 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/class-wp-embed.php | 6 ------ wp-includes/version.php | 2 +- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/wp-includes/class-wp-embed.php b/wp-includes/class-wp-embed.php index 16e5acd79f..7405197094 100644 --- a/wp-includes/class-wp-embed.php +++ b/wp-includes/class-wp-embed.php @@ -129,12 +129,6 @@ class WP_Embed { * `->maybe_make_link()` can return false on failure. */ public function shortcode( $attr, $url = '' ) { - // This filter can be used to output custom HTML instead of allowing oEmbed to run. - $custom = apply_filters( 'wp_embed_shortcode_custom', false, $attr, $url ); - if ( false !== $custom ) { - return $custom; - } - $post = get_post(); if ( empty( $url ) && ! empty( $attr['src'] ) ) { diff --git a/wp-includes/version.php b/wp-includes/version.php index 023a83ad59..514249e557 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '4.3-beta4-33469'; +$wp_version = '4.3-beta4-33470'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.