Changeset 17214

Timestamp:

01/04/2011 07:23:41 AM (14 years ago)

Author:

markjaquith

Message:

Revert [15611] for 3.1. Needs more time for peer review and iteration. see #14310

File:

• trunk/wp-includes/theme.php (modified) (10 diffs)

trunk/wp-includes/theme.php

@@ -729 +729 @@
  * Retrieve path to a template
  *
- * 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
+ * Used to quickly retrieve the path of file without including the file
+ * extension. It will also check the parent template, if the file exists, with
+ * the use of {@link locate_template()}. Allows for more generic file location
  * without the use of the other get_*_template() functions.
  *
+ * Can be used with include() or require() to retrieve path.
+ * <code>
+ * if( '' != get_query_template( '404' ) )
+ *     include( get_query_template( '404' ) );
+ * </code>
+ * or the same can be accomplished with
+ * <code>
+ * if( '' != get_404_template() )
+ *     include( get_404_template() );
+ * </code>
+ *
  * @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.
  */
-function get_query_template( $type, $templates = array() ) {
+function get_query_template($type) {
     $type = preg_replace( '|[^a-z0-9-]+|', '', $type );
-
-    if ( empty( $templates ) )
-        $templates = array("{$type}.php");
-
-    $templates = apply_filters( "{$type}_template_hierarchy", $templates );
-
-    return apply_filters( "{$type}_template", locate_template( $templates ) );
+    return apply_filters("{$type}_template", locate_template(array("{$type}.php")));
 }
 
@@ -808 +812 @@
     $templates[] = 'author.php';
 
-    return get_query_template( 'author', $templates );
+    $template = locate_template( $templates );
+    return apply_filters( 'author_template', $template );
 }
 
@@ -832 +837 @@
     $templates[] = "category.php";
 
-    return get_query_template( 'category', $templates );
+    $template = locate_template($templates);
+    return apply_filters('category_template', $template);
 }
 
@@ -856 +862 @@
     $templates[] = "tag.php";
 
-    return get_query_template( 'tag', $templates );
+    $template = locate_template($templates);
+    return apply_filters('tag_template', $template);
 }
 
@@ -886 +893 @@
     $templates[] = "taxonomy.php";
 
-    return get_query_template( 'taxonomy', $templates );
+    $template = locate_template($templates);
+    return apply_filters('taxonomy_template', $template);
 }
 
@@ -913 +921 @@
  */
 function get_home_template() {
-    $templates = array( 'home.php', 'index.php' );
-
-    return get_query_template( 'home', $templates );
+    $template = locate_template(array('home.php', 'index.php'));
+    return apply_filters('home_template', $template);
 }
 
@@ -929 +936 @@
  */
 function get_front_page_template() {
-    $templates = array('front-page.php');
-
-    return get_query_template( 'front_page', $templates );
+    return apply_filters( 'front_page_template', locate_template( array('front-page.php') ) );
 }
 
@@ -968 +973 @@
     $templates[] = "page.php";
 
-    return get_query_template( 'page', $templates );
+    return apply_filters('page_template', locate_template($templates));
 }
 
@@ -1051 +1056 @@
  */
 function get_comments_popup_template() {
-    $template = get_query_template( 'comments_popup', array( 'comments-popup.php' ) );
+    $template = locate_template(array("comments-popup.php"));
 
     // Backward compat code will be removed in a future release
@@ -1057 +1062 @@
         $template = ABSPATH . WPINC . '/theme-compat/comments-popup.php';
 
-    return $template;
+    return apply_filters('comments_popup_template', $template);
 }