opdavies/presentations
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update WP and plugins

Browse source
This commit is contained in:
Oliver Davies 2019-04-16 20:56:22 +01:00
parent 10a4713229
commit 1fb77fc4ff
864 changed files with 101724 additions and 78262 deletions
Download patch file Download diff file Expand all files Collapse all files

60
wp-includes/template.php
View file

@ -23,8 +23,9 @@
function get_query_template( $type, $templates = array() ) {
$type = preg_replace( '|[^a-z0-9-]+|', '', $type );
if ( empty( $templates ) )
$templates = array("{$type}.php");
if ( empty( $templates ) ) {
$templates = array( "{$type}.php" );
}
/**
* Filters the list of template filenames that are searched for when retrieving a template to use.
@ -75,7 +76,7 @@ function get_query_template( $type, $templates = array() ) {
* @return string Full path to index template file.
*/
function get_index_template() {
return get_query_template('index');
return get_query_template( 'index' );
}
/**
@ -91,7 +92,7 @@ function get_index_template() {
* @return string Full path to 404 template file.
*/
function get_404_template() {
return get_query_template('404');
return get_query_template( '404' );
}
/**
@ -112,7 +113,7 @@ function get_archive_template() {
$templates = array();
if ( count( $post_types ) == 1 ) {
$post_type = reset( $post_types );
$post_type = reset( $post_types );
$templates[] = "archive-{$post_type}.php";
}
$templates[] = 'archive.php';
@ -134,8 +135,9 @@ function get_archive_template() {
*/
function get_post_type_archive_template() {
$post_type = get_query_var( 'post_type' );
if ( is_array( $post_type ) )
if ( is_array( $post_type ) ) {
$post_type = reset( $post_type );
}
$obj = get_post_type_object( $post_type );
if ( ! ( $obj instanceof WP_Post_Type ) || ! $obj->has_archive ) {
@ -335,7 +337,7 @@ function get_taxonomy_template() {
* @return string Full path to date template file.
*/
function get_date_template() {
return get_query_template('date');
return get_query_template( 'date' );
}
/**
@ -369,7 +371,7 @@ function get_home_template() {
* @return string Full path to front page template file.
*/
function get_front_page_template() {
$templates = array('front-page.php');
$templates = array( 'front-page.php' );
return get_query_template( 'front_page', $templates );
}
@ -403,20 +405,22 @@ function get_front_page_template() {
* @return string Full path to page template file.
*/
function get_page_template() {
$id = get_queried_object_id();
$id = get_queried_object_id();
$template = get_page_template_slug();
$pagename = get_query_var('pagename');
$pagename = get_query_var( 'pagename' );
if ( ! $pagename && $id ) {
// If a static page is set as the front page, $pagename will not be set. Retrieve it from the queried object
$post = get_queried_object();
if ( $post )
if ( $post ) {
$pagename = $post->post_name;
}
}
$templates = array();
if ( $template && 0 === validate_file( $template ) )
if ( $template && 0 === validate_file( $template ) ) {
$templates[] = $template;
}
if ( $pagename ) {
$pagename_decoded = urldecode( $pagename );
if ( $pagename_decoded !== $pagename ) {
@ -424,8 +428,9 @@ function get_page_template() {
}
$templates[] = "page-{$pagename}.php";
}
if ( $id )
if ( $id ) {
$templates[] = "page-{$id}.php";
}
$templates[] = 'page.php';
return get_query_template( 'page', $templates );
@ -444,7 +449,7 @@ function get_page_template() {
* @return string Full path to search template file.
*/
function get_search_template() {
return get_query_template('search');
return get_query_template( 'search' );
}
/**
@ -472,7 +477,7 @@ function get_search_template() {
* @since 4.4.0 `single-{post_type}-{post_name}.php` was added to the top of the template hierarchy.
* @since 4.7.0 The decoded form of `single-{post_type}-{post_name}.php` was added to the top of the
* template hierarchy when the post name contains multibyte characters.
* @since 4.7.0 {Post Type Template}.php was added to the top of the template hierarchy.
* @since 4.7.0 `{Post Type Template}.php` was added to the top of the template hierarchy.
*
* @see get_query_template()
*
@ -498,7 +503,7 @@ function get_single_template() {
$templates[] = "single-{$object->post_type}.php";
}
$templates[] = "single.php";
$templates[] = 'single.php';
return get_query_template( 'single', $templates );
}
@ -540,7 +545,7 @@ function get_embed_template() {
$templates[] = "embed-{$object->post_type}.php";
}
$templates[] = "embed.php";
$templates[] = 'embed.php';
return get_query_template( 'embed', $templates );
}
@ -626,15 +631,16 @@ function get_attachment_template() {
* @param bool $require_once Whether to require_once or require. Default true. Has no effect if $load is false.
* @return string The template filename if one is located.
*/
function locate_template($template_names, $load = false, $require_once = true ) {
function locate_template( $template_names, $load = false, $require_once = true ) {
$located = '';
foreach ( (array) $template_names as $template_name ) {
if ( !$template_name )
if ( ! $template_name ) {
continue;
if ( file_exists(STYLESHEETPATH . '/' . $template_name)) {
}
if ( file_exists( STYLESHEETPATH . '/' . $template_name ) ) {
$located = STYLESHEETPATH . '/' . $template_name;
break;
} elseif ( file_exists(TEMPLATEPATH . '/' . $template_name) ) {
} elseif ( file_exists( TEMPLATEPATH . '/' . $template_name ) ) {
$located = TEMPLATEPATH . '/' . $template_name;
break;
} elseif ( file_exists( ABSPATH . WPINC . '/theme-compat/' . $template_name ) ) {
@ -643,8 +649,9 @@ function locate_template($template_names, $load = false, $require_once = true )
}
}
if ( $load && '' != $located )
if ( $load && '' != $located ) {
load_template( $located, $require_once );
}
return $located;
}
@ -677,6 +684,15 @@ function load_template( $_template_file, $require_once = true ) {
global $posts, $post, $wp_did_header, $wp_query, $wp_rewrite, $wpdb, $wp_version, $wp, $id, $comment, $user_ID;
if ( is_array( $wp_query->query_vars ) ) {
/*
* This use of extract() cannot be removed. There are many possible ways that
* templates could depend on variables that it creates existing, and no way to
* detect and deprecate it.
*
* Passing the EXTR_SKIP flag is the safest option, ensuring globals and
* function variables cannot be overwritten.
*/
// phpcs:ignore WordPress.PHP.DontExtract.extract_extract
extract( $wp_query->query_vars, EXTR_SKIP );
}