X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/7f1521bf193b382565eb753043c161f4cb3fcda7..607b7e02d77e7326161e8ec15639052d2040f745:/wp-includes/template.php

diff --git a/wp-includes/template.php b/wp-includes/template.php
index cfe9bb06..380bb47b 100644
--- a/wp-includes/template.php
+++ b/wp-includes/template.php
@@ -11,13 +11,13 @@
  *
  * Used to quickly retrieve the path of a template without including the file
  * extension. It will also check the parent theme, if the file exists, with
- * the use of {@link locate_template()}. Allows for more generic template location
+ * the use of locate_template(). Allows for more generic template location
  * without the use of the other get_*_template() functions.
  *
  * @since 1.5.0
  *
- * @param string $type Filename without extension.
- * @param array $templates An optional list of template candidates
+ * @param string $type      Filename without extension.
+ * @param array  $templates An optional list of template candidates
  * @return string Full path to template file.
  */
 function get_query_template( $type, $templates = array() ) {
@@ -27,16 +27,20 @@ function get_query_template( $type, $templates = array() ) {
 		$templates = array("{$type}.php");
 
 	$template = locate_template( $templates );
+
 	/**
-	 * Filter the path of the queried template by type.
+	 * Filters the path of the queried template by type.
+	 *
+	 * The dynamic portion of the hook name, `$type`, refers to the filename -- minus the file
+	 * extension and any non-alphanumeric characters delimiting words -- of the file to load.
+	 * This hook also applies to various types of files loaded as part of the Template Hierarchy.
 	 *
-	 * The dynamic portion of the hook name, `$type`, refers to the filename
-	 * -- minus the extension -- of the file to load. This hook also applies
-	 * to various types of files loaded as part of the Template Hierarchy.
+	 * Possible values for `$type` include: 'index', '404', 'archive', 'author', 'category', 'tag', 'taxonomy', 'date',
+	 * 'home', 'front_page', 'page', 'paged', 'search', 'single', 'singular', and 'attachment'.
 	 *
 	 * @since 1.5.0
 	 *
-	 * @param string $template Path to the template. See {@see locate_template()}.
+	 * @param string $template Path to the template. See locate_template().
 	 */
 	return apply_filters( "{$type}_template", $template );
 }
@@ -44,7 +48,8 @@ function get_query_template( $type, $templates = array() ) {
 /**
  * Retrieve path of index template in current or parent template.
  *
- * The template path is filterable via the 'index_template' hook.
+ * The template path is filterable via the dynamic {@see '$type_template'} hook,
+ * e.g. 'index_template'.
  *
  * @since 3.0.0
  *
@@ -59,7 +64,8 @@ function get_index_template() {
 /**
  * Retrieve path of 404 template in current or parent template.
  *
- * The template path is filterable via the '404_template' hook.
+ * The template path is filterable via the dynamic {@see '$type_template'} hook,
+ * e.g. '404_template'.
  *
  * @since 1.5.0
  *
@@ -74,7 +80,8 @@ function get_404_template() {
 /**
  * Retrieve path of archive template in current or parent template.
  *
- * The template path is filterable via the 'archive_template' hook.
+ * The template path is filterable via the dynamic {@see '$type_template'} hook,
+ * e.g. 'archive_template'.
  *
  * @since 1.5.0
  *
@@ -99,7 +106,8 @@ function get_archive_template() {
 /**
  * Retrieve path of post type archive template in current or parent template.
  *
- * The template path is filterable via the 'archive_template' hook.
+ * The template path is filterable via the dynamic {@see '$type_template'} hook,
+ * e.g. 'archive_template'.
  *
  * @since 3.7.0
  *
@@ -122,7 +130,8 @@ function get_post_type_archive_template() {
 /**
  * Retrieve path of author template in current or parent template.
  *
- * The template path is filterable via the 'author_template' hook.
+ * The template path is filterable via the dynamic {@see '$type_template'} hook,
+ * e.g. 'author_template'.
  *
  * @since 1.5.0
  *
@@ -147,11 +156,12 @@ function get_author_template() {
 /**
  * Retrieve path of category template in current or parent template.
  *
- * Works by first retrieving the current slug, for example 'category-default.php', and then
- * trying category ID, for example 'category-1.php', and will finally fall back to category.php
- * template, if those files don't exist.
+ * Works by first retrieving the current slug, for example 'category-default.php',
+ * and then trying category ID, for example 'category-1.php', and will finally fall
+ * back to category.php template, if those files don't exist.
  *
- * The template path is filterable via the 'category_template' hook.
+ * The template path is filterable via the dynamic {@see '$type_template'} hook,
+ * e.g. 'category_template'.
  *
  * @since 1.5.0
  *
@@ -176,11 +186,12 @@ function get_category_template() {
 /**
  * Retrieve path of tag template in current or parent template.
  *
- * Works by first retrieving the current tag name, for example 'tag-wordpress.php', and then
- * trying tag ID, for example 'tag-1.php', and will finally fall back to tag.php
- * template, if those files don't exist.
+ * Works by first retrieving the current tag name, for example 'tag-wordpress.php',
+ * and then trying tag ID, for example 'tag-1.php', and will finally fall back to
+ * tag.php template, if those files don't exist.
  *
- * The template path is filterable via the 'tag_template' hook.
+ * The template path is filterable via the dynamic {@see '$type_template'} hook,
+ * e.g. 'tag_template'.
  *
  * @since 2.3.0
  *
@@ -214,7 +225,8 @@ function get_tag_template() {
  * template is used. If none of the files exist, then it will fall back on to
  * index.php.
  *
- * The template path is filterable via the 'taxonomy_template' hook.
+ * The template path is filterable via the dynamic {@see '$type_template'} hook,
+ * e.g. 'taxonomy_template'.
  *
  * @since 2.5.0
  *
@@ -240,7 +252,8 @@ function get_taxonomy_template() {
 /**
  * Retrieve path of date template in current or parent template.
  *
- * The template path is filterable via the 'date_template' hook.
+ * The template path is filterable via the dynamic {@see '$type_template'} hook,
+ * e.g. 'date_template'.
  *
  * @since 1.5.0
  *
@@ -258,7 +271,8 @@ function get_date_template() {
  * This is the template used for the page containing the blog posts.
  * Attempts to locate 'home.php' first before falling back to 'index.php'.
  *
- * The template path is filterable via the 'home_template' hook.
+ * The template path is filterable via the dynamic {@see '$type_template'} hook,
+ * e.g. 'home_template'.
  *
  * @since 1.5.0
  *
@@ -276,7 +290,7 @@ function get_home_template() {
  * Retrieve path of front-page template in current or parent template.
  *
  * Looks for 'front-page.php'. The template path is filterable via the
- * 'front_page_template' hook.
+ * dynamic {@see '$type_template'} hook, e.g. 'frontpage_template'.
  *
  * @since 3.0.0
  *
@@ -297,7 +311,8 @@ function get_front_page_template() {
  * Then will search for 'page-{slug}.php', followed by 'page-{id}.php',
  * and finally 'page.php'.
  *
- * The template path is filterable via the 'page_template' hook.
+ * The template path is filterable via the dynamic {@see '$type_template'} hook,
+ * e.g. 'page_template'.
  *
  * @since 1.5.0
  *
@@ -332,7 +347,8 @@ function get_page_template() {
 /**
  * Retrieve path of paged template in current or parent template.
  *
- * The template path is filterable via the 'paged_template' hook.
+ * The template path is filterable via the dynamic {@see '$type_template'} hook,
+ * e.g. 'paged_template'.
  *
  * @since 1.5.0
  *
@@ -347,7 +363,8 @@ function get_paged_template() {
 /**
  * Retrieve path of search template in current or parent template.
  *
- * The template path is filterable via the 'search_template' hook.
+ * The template path is filterable via the dynamic {@see '$type_template'} hook,
+ * e.g. 'search_template'.
  *
  * @since 1.5.0
  *
@@ -362,9 +379,11 @@ function get_search_template() {
 /**
  * Retrieve path of single template in current or parent template.
  *
- * The template path is filterable via the 'single_template' hook.
+ * The template path is filterable via the dynamic {@see '$type_template'} hook,
+ * e.g. 'single_template'.
  *
  * @since 1.5.0
+ * @since 4.4.0 `single-{post_type}-{post_name}.php` was added to the top of the template hierarchy.
  *
  * @see get_query_template()
  *
@@ -375,88 +394,120 @@ function get_single_template() {
 
 	$templates = array();
 
-	if ( ! empty( $object->post_type ) )
+	if ( ! empty( $object->post_type ) ) {
+		$templates[] = "single-{$object->post_type}-{$object->post_name}.php";
 		$templates[] = "single-{$object->post_type}.php";
+	}
+
 	$templates[] = "single.php";
 
 	return get_query_template( 'single', $templates );
 }
 
 /**
- * Retrieve path of attachment template in current or parent template.
+ * Retrieves an embed template path in the current or parent template.
  *
- * The attachment path first checks if the first part of the mime type exists.
- * The second check is for the second part of the mime type. The last check is
- * for both types separated by an underscore. If neither are found then the file
- * 'attachment.php' is checked and returned.
- *
- * Some examples for the 'text/plain' mime type are 'text.php', 'plain.php', and
- * finally 'text_plain.php'.
+ * By default the WordPress-template is returned.
  *
- * The template path is filterable via the 'attachment_template' hook.
+ * The template path is filterable via the dynamic {@see '$type_template'} hook,
+ * e.g. 'embed_template'.
  *
- * @since 2.0.0
+ * @since 4.5.0
  *
  * @see get_query_template()
  *
- * @return string Full path to attachment template file.
+ * @return string Full path to embed template file.
  */
-function get_attachment_template() {
-	global $posts;
-
-	if ( ! empty( $posts ) && isset( $posts[0]->post_mime_type ) ) {
-		$type = explode( '/', $posts[0]->post_mime_type );
-
-		if ( ! empty( $type ) ) {
-			if ( $template = get_query_template( $type[0] ) )
-				return $template;
-			elseif ( ! empty( $type[1] ) ) {
-				if ( $template = get_query_template( $type[1] ) )
-					return $template;
-				elseif ( $template = get_query_template( "$type[0]_$type[1]" ) )
-					return $template;
-			}
+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";
 	}
 
-	return get_query_template( 'attachment' );
+	$templates[] = "embed.php";
+
+	return get_query_template( 'embed', $templates );
 }
 
 /**
- * Retrieve path of comment popup template in current or parent template.
+ * Retrieves the path of the singular template in current or parent template.
  *
- * Checks for comment popup template in current template, if it exists or in the
- * parent template.
+ * The template path is filterable via the dynamic {@see '$type_template'} hook,
+ * e.g. 'singular_template'.
  *
- * The template path is filterable via the 'comments_popup_template' hook.
+ * @since 4.3.0
  *
- * @since 1.5.0
+ * @see get_query_template()
+ *
+ * @return string Full path to singular template file
+ */
+function get_singular_template() {
+	return get_query_template( 'singular' );
+}
+
+/**
+ * Retrieve path of attachment template in current or parent template.
+ *
+ * The attachment path first checks if the first part of the mime type exists.
+ * The second check is for the second part of the mime type. The last check is
+ * for both types separated by an underscore. If neither are found then the file
+ * 'attachment.php' is checked and returned.
+ *
+ * Some examples for the 'text/plain' mime type are 'text.php', 'plain.php', and
+ * finally 'text-plain.php'.
+ *
+ * The template path is filterable via the dynamic {@see '$type_template'} hook,
+ * e.g. 'attachment_template'.
+ *
+ * @since 2.0.0
  *
  * @see get_query_template()
  *
- * @return string Full path to comments popup template file.
+ * @global array $posts
+ *
+ * @return string Full path to attachment template file.
  */
-function get_comments_popup_template() {
-	$template = get_query_template( 'comments_popup', array( 'comments-popup.php' ) );
+function get_attachment_template() {
+	$attachment = get_queried_object();
+
+	$templates = array();
 
-	// Backward compat code will be removed in a future release
-	if ('' == $template)
-		$template = ABSPATH . WPINC . '/theme-compat/comments-popup.php';
+	if ( $attachment ) {
+		if ( false !== strpos( $attachment->post_mime_type, '/' ) ) {
+			list( $type, $subtype ) = explode( '/', $attachment->post_mime_type );
+		} else {
+			list( $type, $subtype ) = array( $attachment->post_mime_type, '' );
+		}
+
+		if ( ! empty( $subtype ) ) {
+			$templates[] = "{$type}-{$subtype}.php";
+			$templates[] = "{$subtype}.php";
+		}
+		$templates[] = "{$type}.php";
+	}
+	$templates[] = 'attachment.php';
 
-	return $template;
+	return get_query_template( 'attachment', $templates );
 }
 
 /**
  * Retrieve the name of the highest priority template file that exists.
  *
- * Searches in the STYLESHEETPATH before TEMPLATEPATH so that themes which
- * inherit from a parent theme can just overload one file.
+ * Searches in the STYLESHEETPATH before TEMPLATEPATH and wp-includes/theme-compat
+ * so that themes which inherit from a parent theme can just overload one file.
  *
  * @since 2.7.0
  *
  * @param string|array $template_names Template file(s) to search for, in order.
- * @param bool $load If true the template file will be loaded if it is found.
- * @param bool $require_once Whether to require_once or require. Default true. Has no effect if $load is false.
+ * @param bool         $load           If true the template file will be loaded if it is found.
+ * @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 ) {
@@ -470,6 +521,9 @@ function locate_template($template_names, $load = false, $require_once = true )
 		} elseif ( file_exists(TEMPLATEPATH . '/' . $template_name) ) {
 			$located = TEMPLATEPATH . '/' . $template_name;
 			break;
+		} elseif ( file_exists( ABSPATH . WPINC . '/theme-compat/' . $template_name ) ) {
+			$located = ABSPATH . WPINC . '/theme-compat/' . $template_name;
+			break;
 		}
 	}
 
@@ -488,18 +542,36 @@ function locate_template($template_names, $load = false, $require_once = true )
  *
  * @since 1.5.0
  *
+ * @global array      $posts
+ * @global WP_Post    $post
+ * @global bool       $wp_did_header
+ * @global WP_Query   $wp_query
+ * @global WP_Rewrite $wp_rewrite
+ * @global wpdb       $wpdb
+ * @global string     $wp_version
+ * @global WP         $wp
+ * @global int        $id
+ * @global WP_Comment $comment
+ * @global int        $user_ID
+ *
  * @param string $_template_file Path to template file.
- * @param bool $require_once Whether to require_once or require. Default true.
+ * @param bool   $require_once   Whether to require_once or require. Default true.
  */
 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 ) )
+	if ( is_array( $wp_query->query_vars ) ) {
 		extract( $wp_query->query_vars, EXTR_SKIP );
+	}
 
-	if ( $require_once )
+	if ( isset( $s ) ) {
+		$s = esc_attr( $s );
+	}
+
+	if ( $require_once ) {
 		require_once( $_template_file );
-	else
+	} else {
 		require( $_template_file );
+	}
 }