WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Embeds: Rename files, functions, and hooks added in [34903] to make it more clear what is oEmbed-specific and what isn't. 

See https://core.trac.wordpress.org/ticket/34272#comment:7 for full list of renamed functions and hooks.

Props swissspidy.
Fixes #34272.
Built from https://develop.svn.wordpress.org/trunk@35235


git-svn-id: http://core.svn.wordpress.org/trunk@35201 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Sergey Biryukov 2015-10-17 01:21:25 +00:00
parent 1157540283
commit a908d2d4b1
13 changed files with 38 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
wp-includes/css/wp-oembed-embed.css → wp-includes/css/wp-embed-template.css
View File

0
wp-includes/css/wp-oembed-embed.min.css → wp-includes/css/wp-embed-template.min.css vendored
View File

22
wp-includes/default-filters.php
View File

@ -446,24 +446,24 @@ add_action( 'parse_query', 'wp_oembed_parse_query' );
add_action( 'wp_head', 'wp_oembed_add_discovery_links' ); 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_host_js' );
add_action( 'oembed_head', 'print_emoji_detection_script' ); add_action( 'embed_head', 'print_emoji_detection_script' );
add_action( 'oembed_head', 'print_emoji_styles' ); add_action( 'embed_head', 'print_emoji_styles' );
add_action( 'oembed_head', 'print_oembed_embed_styles' ); add_action( 'embed_head', 'print_embed_styles' );
add_action( 'oembed_head', 'print_oembed_embed_scripts' ); add_action( 'embed_head', 'print_embed_scripts' );
add_action( 'oembed_head', 'wp_print_head_scripts', 20 ); add_action( 'embed_head', 'wp_print_head_scripts', 20 );
add_action( 'oembed_head', 'wp_print_styles', 20 ); add_action( 'embed_head', 'wp_print_styles', 20 );
add_action( 'oembed_head', 'wp_no_robots' ); add_action( 'embed_head', 'wp_no_robots' );
add_action( 'oembed_head', 'rel_canonical' ); add_action( 'embed_head', 'rel_canonical' );
add_action( 'oembed_head', 'locale_stylesheet' ); add_action( 'embed_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( 'excerpt_more', 'wp_embed_excerpt_more', 20 );
add_filter( 'the_excerpt_embed', 'wptexturize' ); add_filter( 'the_excerpt_embed', 'wptexturize' );
add_filter( 'the_excerpt_embed', 'convert_chars' ); add_filter( 'the_excerpt_embed', 'convert_chars' );
add_filter( 'the_excerpt_embed', 'wpautop' ); add_filter( 'the_excerpt_embed', 'wpautop' );
add_filter( 'the_excerpt_embed', 'shortcode_unautop' ); add_filter( 'the_excerpt_embed', 'shortcode_unautop' );
add_filter( 'the_excerpt_embed', 'wp_oembed_excerpt_attachment' ); add_filter( 'the_excerpt_embed', 'wp_embed_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 ); add_filter( 'oembed_response_data', 'get_oembed_response_data_rich', 10, 4 );

28
wp-includes/embed-functions.php
View File

File diff suppressed because one or more lines are too long

18
wp-includes/embed-template.php
View File

@ -11,7 +11,7 @@
*/ */
if ( ! headers_sent() ) { if ( ! headers_sent() ) {
header( 'X-WP-oembed: true' ); header( 'X-WP-embed: true' );
} }
wp_enqueue_style( 'open-sans' ); wp_enqueue_style( 'open-sans' );
@ -28,7 +28,7 @@ wp_enqueue_style( 'open-sans' );
* *
* @since 4.4.0 * @since 4.4.0
*/ */
do_action( 'oembed_head' ); do_action( 'embed_head' );
?> ?>
</head> </head>
<body <?php body_class(); ?>> <body <?php body_class(); ?>>
@ -69,7 +69,7 @@ if ( have_posts() ) :
* *
* @param string $image_size Thumbnail image size. * @param string $image_size Thumbnail image size.
*/ */
$image_size = apply_filters( 'oembed_thumbnail_image_size', $image_size ); $image_size = apply_filters( 'embed_thumbnail_image_size', $image_size );
$shape = $measurements[0] / $measurements[1] >= 1.75 ? 'rectangular' : 'square'; $shape = $measurements[0] / $measurements[1] >= 1.75 ? 'rectangular' : 'square';
@ -83,7 +83,7 @@ if ( have_posts() ) :
* *
* @param string $shape Thumbnail image shape. Either 'rectangular' or 'square'. * @param string $shape Thumbnail image shape. Either 'rectangular' or 'square'.
*/ */
$shape = apply_filters( 'oembed_thumbnail_image_shape', $shape ); $shape = apply_filters( 'embed_thumbnail_image_shape', $shape );
} }
?> ?>
<div <?php post_class( 'wp-embed' ); ?>> <div <?php post_class( 'wp-embed' ); ?>>
@ -117,7 +117,7 @@ if ( have_posts() ) :
* *
* @since 4.4.0 * @since 4.4.0
*/ */
do_action( 'oembed_content' ); do_action( 'embed_content' );
?> ?>
<div class="wp-embed-footer"> <div class="wp-embed-footer">
@ -132,7 +132,7 @@ if ( have_posts() ) :
* *
* @param string $site_icon_url The site icon URL. * @param string $site_icon_url The site icon URL.
*/ */
$site_icon_url = apply_filters( 'oembed_site_icon_url', $site_icon_url ); $site_icon_url = apply_filters( 'embed_site_icon_url', $site_icon_url );
printf( printf(
'<a href="%s" target="_top"><img src="%s" width="32" height="32" alt="" class="wp-embed-site-icon"/><span>%s</span></a>', '<a href="%s" target="_top"><img src="%s" width="32" height="32" alt="" class="wp-embed-site-icon"/><span>%s</span></a>',
@ -150,7 +150,7 @@ if ( have_posts() ) :
* *
* @since 4.4.0 * @since 4.4.0
*/ */
do_action( 'oembed_content_meta'); do_action( 'embed_content_meta');
?> ?>
<?php if ( get_comments_number() || comments_open() ) : ?> <?php if ( get_comments_number() || comments_open() ) : ?>
<div class="wp-embed-comments"> <div class="wp-embed-comments">
@ -233,7 +233,7 @@ else :
* *
* @param string $site_icon_url The site icon URL. * @param string $site_icon_url The site icon URL.
*/ */
$site_icon_url = apply_filters( 'oembed_site_icon_url', $site_icon_url ); $site_icon_url = apply_filters( 'embed_site_icon_url', $site_icon_url );
printf( printf(
'<a href="%s" target="_top"><img src="%s" width="32" height="32" alt="" class="wp-embed-site-icon"/><span>%s</span></a>', '<a href="%s" target="_top"><img src="%s" width="32" height="32" alt="" class="wp-embed-site-icon"/><span>%s</span></a>',
@ -253,7 +253,7 @@ endif;
* *
* @since 4.4.0 * @since 4.4.0
*/ */
do_action( 'oembed_footer' ); do_action( 'embed_footer' );
?> ?>
</body> </body>
</html> </html>

2
wp-includes/js/tinymce/plugins/wpoembed/plugin.js
View File

@ -8,7 +8,7 @@
var scriptElm = editor.dom.create( 'script', { var scriptElm = editor.dom.create( 'script', {
id: scriptId, id: scriptId,
type: 'text/javascript', type: 'text/javascript',
src: url + '/../../../wp-oembed.js' src: url + '/../../../wp-embed.js'
} ); } );
editor.getDoc().getElementsByTagName( 'head' )[ 0 ].appendChild( scriptElm ); editor.getDoc().getElementsByTagName( 'head' )[ 0 ].appendChild( scriptElm );

2
wp-includes/js/tinymce/plugins/wpoembed/plugin.min.js vendored
View File

@ -1 +1 @@
!function(a){"use strict";a.PluginManager.add("wpoembed",function(a,b){a.on("init",function(){var c=a.dom.uniqueId(),d=a.dom.create("script",{id:c,type:"text/javascript",src:b+"/../../../wp-oembed.js"});a.getDoc().getElementsByTagName("head")[0].appendChild(d)})})}(window.tinymce); !function(a){"use strict";a.PluginManager.add("wpoembed",function(a,b){a.on("init",function(){var c=a.dom.uniqueId(),d=a.dom.create("script",{id:c,type:"text/javascript",src:b+"/../../../wp-embed.js"});a.getDoc().getElementsByTagName("head")[0].appendChild(d)})})}(window.tinymce);

BIN
wp-includes/js/tinymce/wp-tinymce.js.gz
View File

Binary file not shown.

0
wp-includes/js/wp-oembed-embed.js → wp-includes/js/wp-embed-template.js
View File

0
wp-includes/js/wp-oembed-embed.min.js → wp-includes/js/wp-embed-template.min.js vendored
View File

0
wp-includes/js/wp-oembed.js → wp-includes/js/wp-embed.js
View File

0
wp-includes/js/wp-oembed.min.js → wp-includes/js/wp-embed.min.js vendored
View File

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '4.4-alpha-35234'; $wp_version = '4.4-alpha-35235';
/** /**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.