From 77314454a5641bf096331c201461921711f0110c Mon Sep 17 00:00:00 2001 From: Drew Jaynes Date: Thu, 8 Oct 2015 22:31:24 +0000 Subject: [PATCH] Embeds: If we're adding a boatload of new items to default-filters.php, might as well make them readable. See #32522. Built from https://develop.svn.wordpress.org/trunk@34966 git-svn-id: http://core.svn.wordpress.org/trunk@34931 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/default-filters.php | 41 ++++++++++++++++----------------- wp-includes/version.php | 2 +- 2 files changed, 21 insertions(+), 22 deletions(-) diff --git a/wp-includes/default-filters.php b/wp-includes/default-filters.php index cfdd7099cf..8bdebe5b8d 100644 --- a/wp-includes/default-filters.php +++ b/wp-includes/default-filters.php @@ -439,32 +439,31 @@ add_filter( 'image_send_to_editor', 'image_add_caption', 20, 8 ); add_filter( 'media_send_to_editor', 'image_media_send_to_editor', 10, 3 ); // Embeds +add_action( 'parse_query', 'wp_oembed_parse_query' ); -add_action( 'parse_query', 'wp_oembed_parse_query' ); +add_action( 'wp_head', 'wp_oembed_add_discovery_links' ); +add_action( 'wp_head', 'wp_oembed_add_host_js' ); -add_action( 'wp_head', 'wp_oembed_add_discovery_links' ); -add_action( 'wp_head', 'wp_oembed_add_host_js' ); +add_action( 'oembed_head', 'print_emoji_detection_script' ); +add_action( 'oembed_head', 'print_emoji_styles' ); +add_action( 'oembed_head', 'print_oembed_embed_styles' ); +add_action( 'oembed_head', 'print_oembed_embed_scripts' ); +add_action( 'oembed_head', 'wp_print_head_scripts', 20 ); +add_action( 'oembed_head', 'wp_print_styles', 20 ); +add_action( 'oembed_head', 'wp_no_robots' ); +add_action( 'oembed_head', 'rel_canonical' ); +add_action( 'oembed_head', 'locale_stylesheet' ); -add_action( 'oembed_head', 'print_emoji_detection_script' ); -add_action( 'oembed_head', 'print_emoji_styles' ); -add_action( 'oembed_head', 'print_oembed_embed_styles' ); -add_action( 'oembed_head', 'print_oembed_embed_scripts' ); -add_action( 'oembed_head', 'wp_print_head_scripts', 20 ); -add_action( 'oembed_head', 'wp_print_styles', 20 ); -add_action( 'oembed_head', 'wp_no_robots' ); -add_action( 'oembed_head', 'rel_canonical' ); -add_action( 'oembed_head', 'locale_stylesheet' ); +add_action( 'oembed_footer', 'wp_print_footer_scripts', 20 ); -add_action( 'oembed_footer', 'wp_print_footer_scripts', 20 ); +add_filter( 'excerpt_more', 'wp_oembed_excerpt_more', 20 ); +add_filter( 'the_excerpt_embed', 'wptexturize' ); +add_filter( 'the_excerpt_embed', 'convert_chars' ); +add_filter( 'the_excerpt_embed', 'wpautop' ); +add_filter( 'the_excerpt_embed', 'shortcode_unautop' ); +add_filter( 'the_excerpt_embed', 'wp_oembed_excerpt_attachment' ); -add_filter( 'excerpt_more', 'wp_oembed_excerpt_more', 20 ); -add_filter( 'the_excerpt_embed', 'wptexturize' ); -add_filter( 'the_excerpt_embed', 'convert_chars' ); -add_filter( 'the_excerpt_embed', 'wpautop' ); -add_filter( 'the_excerpt_embed', 'shortcode_unautop' ); -add_filter( 'the_excerpt_embed', 'wp_oembed_excerpt_attachment' ); - -add_filter( 'oembed_dataparse', 'wp_filter_oembed_result', 10, 3 ); +add_filter( 'oembed_dataparse', 'wp_filter_oembed_result', 10, 3 ); add_filter( 'oembed_response_data', 'get_oembed_response_data_rich', 10, 4 ); unset( $filter, $action ); diff --git a/wp-includes/version.php b/wp-includes/version.php index f64a34c9d2..17d7fb9b9b 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '4.4-alpha-34965'; +$wp_version = '4.4-alpha-34966'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.