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

Embeds: Add support for embeds in the theme template hierarchy. 

This allows themes to directly override the default template. The order in which the template is retrieved is as follows: `embed-$post_type-$post_format.php` -> `embed-$post_type.php` -> `embed.php`.

The `embed_template` filter gets replaced by the dynamic `{$type}_template` filter in `get_query_template()`.

Props ChriCo, swissspidy.
See #34561. Fixes #34278.
Built from https://develop.svn.wordpress.org/trunk@36876


git-svn-id: http://core.svn.wordpress.org/trunk@36843 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Pascal Birchler 2016-03-07 19:33:26 +00:00
parent c13130918a
commit dc2f39b7f0
3 changed files with 34 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -39,26 +39,12 @@ elseif ( is_feed() ) :
elseif ( is_trackback() ) :
include( ABSPATH . 'wp-trackback.php' );
return;
elseif ( is_embed() ) :
$template = ABSPATH . WPINC . '/theme-compat/embed.php';
/**
* Filter the template used for embedded posts.
*
* @since 4.4.0
* @since 4.5.0 The default template path changed to wp-includes/theme-compat/embed.php
*
* @param string $template Path to the template file.
*/
$template = apply_filters( 'embed_template', $template );
include ( $template );
return;
endif;
if ( defined('WP_USE_THEMES') && WP_USE_THEMES ) :
$template = false;
if ( is_404() && $template = get_404_template() ) :
if ( is_embed() && $template = get_embed_template() ) :
elseif ( is_404() && $template = get_404_template() ) :
elseif ( is_search() && $template = get_search_template() ) :
elseif ( is_front_page() && $template = get_front_page_template() ) :
elseif ( is_home() && $template = get_home_template() ) :

31
wp-includes/template.php
View File

@ -404,6 +404,37 @@ function get_single_template() {
return get_query_template( 'single', $templates );
}
/**
* Retrieve path of embed template in current or parent template.
* By default the WordPress-template is returned.
*
* The template path is filterable via the dynamic {@see '$type_template'} hook,
* e.g. 'embed_template'.
*
* @since 4.5.0
*
* @see get_query_template()
*
* @return string Full path to embed template file.
*/
function get_embed_template() {
$object = get_queried_object();
$templates = array();
if ( ! empty( $object->post_type ) ) {
$post_format = get_post_format( $object );
if ( $post_format ) {
$templates[] = "embed-{$object->post_type}-{$post_format}.php";
}
$templates[] = "embed-{$object->post_type}.php";
}
$templates[] = "embed.php";
return get_query_template( 'embed', $templates );
}
/**
* Retrieves the path of the singular template in current or parent template.
*

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
*
* @global string $wp_version
*/
$wp_version = '4.5-beta2-36875';
$wp_version = '4.5-beta2-36876';
/**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.