X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/fa11948979fd6a4ea5705dc613b239699a459db3..53f4633144ed68c8b8fb5861f992b5489894a940:/wp-includes/template.php

diff --git a/wp-includes/template.php b/wp-includes/template.php
index c2889954..3e4e9a40 100644
--- a/wp-includes/template.php
+++ b/wp-includes/template.php
@@ -16,9 +16,9 @@
  *
  * @since 1.5.0
  *
- * @param string $type Filename without extension.
- * @param array $templates An optional list of template candidates
- * @return string Full path to file.
+ * @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() ) {
 	$type = preg_replace( '|[^a-z0-9-]+|', '', $type );
@@ -27,16 +27,17 @@ function get_query_template( $type, $templates = array() ) {
 		$templates = array("{$type}.php");
 
 	$template = locate_template( $templates );
+
 	/**
 	 * Filter the path of the queried template by type.
 	 *
-	 * 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.
+	 * 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.
 	 *
-	 * @since 1.5.2
+	 * @since 1.5.0
 	 *
-	 * @param string $template Path to the template. @see locate_template()
+	 * @param string $template Path to the template. See locate_template().
 	 */
 	return apply_filters( "{$type}_template", $template );
 }
@@ -44,9 +45,14 @@ function get_query_template( $type, $templates = array() ) {
 /**
  * Retrieve path of index template in current or parent template.
  *
+ * The template path is filterable via the dynamic {@see '$type_template'} hook,
+ * e.g. 'index_template'.
+ *
  * @since 3.0.0
  *
- * @return string
+ * @see get_query_template()
+ *
+ * @return string Full path to index template file.
  */
 function get_index_template() {
 	return get_query_template('index');
@@ -55,9 +61,14 @@ function get_index_template() {
 /**
  * Retrieve path of 404 template in current or parent template.
  *
+ * The template path is filterable via the dynamic {@see '$type_template'} hook,
+ * e.g. '404_template'.
+ *
  * @since 1.5.0
  *
- * @return string
+ * @see get_query_template()
+ *
+ * @return string Full path to 404 template file.
  */
 function get_404_template() {
 	return get_query_template('404');
@@ -66,9 +77,14 @@ function get_404_template() {
 /**
  * Retrieve path of archive template in current or parent template.
  *
+ * The template path is filterable via the dynamic {@see '$type_template'} hook,
+ * e.g. 'archive_template'.
+ *
  * @since 1.5.0
  *
- * @return string
+ * @see get_query_template()
+ *
+ * @return string Full path to archive template file.
  */
 function get_archive_template() {
 	$post_types = array_filter( (array) get_query_var( 'post_type' ) );
@@ -87,9 +103,14 @@ function get_archive_template() {
 /**
  * Retrieve path of post type archive template in current or parent template.
  *
+ * The template path is filterable via the dynamic {@see '$type_template'} hook,
+ * e.g. 'archive_template'.
+ *
  * @since 3.7.0
  *
- * @return string
+ * @see get_archive_template()
+ *
+ * @return string Full path to archive template file.
  */
 function get_post_type_archive_template() {
 	$post_type = get_query_var( 'post_type' );
@@ -106,16 +127,21 @@ function get_post_type_archive_template() {
 /**
  * Retrieve path of author template in current or parent template.
  *
+ * The template path is filterable via the dynamic {@see '$type_template'} hook,
+ * e.g. 'author_template'.
+ *
  * @since 1.5.0
  *
- * @return string
+ * @see get_query_template()
+ *
+ * @return string Full path to author template file.
  */
 function get_author_template() {
 	$author = get_queried_object();
 
 	$templates = array();
 
-	if ( is_a( $author, 'WP_User' ) ) {
+	if ( $author instanceof WP_User ) {
 		$templates[] = "author-{$author->user_nicename}.php";
 		$templates[] = "author-{$author->ID}.php";
 	}
@@ -127,14 +153,18 @@ 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 dynamic {@see '$type_template'} hook,
+ * e.g. 'category_template'.
  *
  * @since 1.5.0
- * @uses apply_filters() Calls 'category_template' on file path of category template.
  *
- * @return string
+ * @see get_query_template()
+ *
+ * @return string Full path to category template file.
  */
 function get_category_template() {
 	$category = get_queried_object();
@@ -153,14 +183,18 @@ 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 dynamic {@see '$type_template'} hook,
+ * e.g. 'tag_template'.
  *
  * @since 2.3.0
- * @uses apply_filters() Calls 'tag_template' on file path of tag template.
  *
- * @return string
+ * @see get_query_template()
+ *
+ * @return string Full path to tag template file.
  */
 function get_tag_template() {
 	$tag = get_queried_object();
@@ -188,10 +222,14 @@ 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 dynamic {@see '$type_template'} hook,
+ * e.g. 'taxonomy_template'.
+ *
  * @since 2.5.0
- * @uses apply_filters() Calls 'taxonomy_template' filter on found path.
  *
- * @return string
+ * @see get_query_template()
+ *
+ * @return string Full path to taxonomy template file.
  */
 function get_taxonomy_template() {
 	$term = get_queried_object();
@@ -211,9 +249,14 @@ function get_taxonomy_template() {
 /**
  * Retrieve path of date template in current or parent template.
  *
+ * The template path is filterable via the dynamic {@see '$type_template'} hook,
+ * e.g. 'date_template'.
+ *
  * @since 1.5.0
  *
- * @return string
+ * @see get_query_template()
+ *
+ * @return string Full path to date template file.
  */
 function get_date_template() {
 	return get_query_template('date');
@@ -223,13 +266,16 @@ function get_date_template() {
  * Retrieve path of home template in current or parent 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 dynamic {@see '$type_template'} hook,
+ * e.g. 'home_template'.
+ *
  * @since 1.5.0
- * @uses apply_filters() Calls 'home_template' on file path of home template.
  *
- * @return string
+ * @see get_query_template()
+ *
+ * @return string Full path to home template file.
  */
 function get_home_template() {
 	$templates = array( 'home.php', 'index.php' );
@@ -240,12 +286,14 @@ function get_home_template() {
 /**
  * Retrieve path of front-page template in current or parent template.
  *
- * Looks for 'front-page.php'.
+ * Looks for 'front-page.php'. The template path is filterable via the
+ * dynamic {@see '$type_template'} hook, e.g. 'frontpage_template'.
  *
  * @since 3.0.0
- * @uses apply_filters() Calls 'front_page_template' on file path of template.
  *
- * @return string
+ * @see get_query_template()
+ *
+ * @return string Full path to front page template file.
  */
 function get_front_page_template() {
 	$templates = array('front-page.php');
@@ -260,9 +308,14 @@ 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 dynamic {@see '$type_template'} hook,
+ * e.g. 'page_template'.
+ *
  * @since 1.5.0
  *
- * @return string
+ * @see get_query_template()
+ *
+ * @return string Full path to page template file.
  */
 function get_page_template() {
 	$id = get_queried_object_id();
@@ -291,9 +344,14 @@ function get_page_template() {
 /**
  * Retrieve path of paged template in current or parent template.
  *
+ * The template path is filterable via the dynamic {@see '$type_template'} hook,
+ * e.g. 'paged_template'.
+ *
  * @since 1.5.0
  *
- * @return string
+ * @see get_query_template()
+ *
+ * @return string Full path to paged template file.
  */
 function get_paged_template() {
 	return get_query_template('paged');
@@ -302,9 +360,14 @@ function get_paged_template() {
 /**
  * Retrieve path of search template in current or parent template.
  *
+ * The template path is filterable via the dynamic {@see '$type_template'} hook,
+ * e.g. 'search_template'.
+ *
  * @since 1.5.0
  *
- * @return string
+ * @see get_query_template()
+ *
+ * @return string Full path to search template file.
  */
 function get_search_template() {
 	return get_query_template('search');
@@ -313,9 +376,14 @@ function get_search_template() {
 /**
  * Retrieve path of single template in current or parent template.
  *
+ * The template path is filterable via the dynamic {@see '$type_template'} hook,
+ * e.g. 'single_template'.
+ *
  * @since 1.5.0
  *
- * @return string
+ * @see get_query_template()
+ *
+ * @return string Full path to single template file.
  */
 function get_single_template() {
 	$object = get_queried_object();
@@ -329,6 +397,22 @@ function get_single_template() {
 	return get_query_template( 'single', $templates );
 }
 
+/**
+ * Retrieves the path of the singular template in current or parent template.
+ *
+ * The template path is filterable via the dynamic {@see '$type_template'} hook,
+ * e.g. 'singular_template'.
+ *
+ * @since 4.3.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.
  *
@@ -338,31 +422,40 @@ function get_single_template() {
  * 'attachment.php' is checked and returned.
  *
  * Some examples for the 'text/plain' mime type are 'text.php', 'plain.php', and
- * finally 'text_plain.php'.
+ * finally 'text-plain.php'.
+ *
+ * The template path is filterable via the dynamic {@see '$type_template'} hook,
+ * e.g. 'attachment_template'.
  *
  * @since 2.0.0
  *
- * @return string
+ * @see get_query_template()
+ *
+ * @global array $posts
+ *
+ * @return string Full path to attachment 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;
-			}
+	$attachment = get_queried_object();
+
+	$templates = array();
+
+	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 get_query_template( 'attachment' );
+	return get_query_template( 'attachment', $templates );
 }
 
 /**
@@ -371,15 +464,19 @@ function get_attachment_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. 'commentspopup_template'.
+ *
  * @since 1.5.0
- * @uses apply_filters() Calls 'comments_popup_template' filter on path.
  *
- * @return string
+ * @see get_query_template()
+ *
+ * @return string Full path to comments popup template file.
  */
 function get_comments_popup_template() {
 	$template = get_query_template( 'comments_popup', array( 'comments-popup.php' ) );
 
-	// Backward compat code will be removed in a future release
+	// Backward compat code will be removed in a future release.
 	if ('' == $template)
 		$template = ABSPATH . WPINC . '/theme-compat/comments-popup.php';
 
@@ -395,8 +492,8 @@ function get_comments_popup_template() {
  * @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 ) {
@@ -407,7 +504,7 @@ function locate_template($template_names, $load = false, $require_once = true )
 		if ( file_exists(STYLESHEETPATH . '/' . $template_name)) {
 			$located = STYLESHEETPATH . '/' . $template_name;
 			break;
-		} else if ( file_exists(TEMPLATEPATH . '/' . $template_name) ) {
+		} elseif ( file_exists(TEMPLATEPATH . '/' . $template_name) ) {
 			$located = TEMPLATEPATH . '/' . $template_name;
 			break;
 		}
@@ -428,18 +525,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 object     $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 );
+	}
 }