Ticket #13239: 13239.2.diff

wp-includes/template.php

@@ -359 +359 @@
  * inherit from a parent theme can just overload one file.
  *
  * @since 2.7.0
+ * @uses apply_filters() Calls 'locate_template' filter on array of template names.
  *
  * @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.
@@ -366 +367 @@
  * @return string The template filename if one is located.
  */
 function locate_template($template_names, $load = false, $require_once = true ) {
+        $template_names = apply_filters( 'locate_template', $template_names, $load, $require_once );
+
         $located = '';
         foreach ( (array) $template_names as $template_name ) {
                 if ( !$template_name )
                         continue;
-                if ( file_exists(STYLESHEETPATH . '/' . $template_name)) {
-                        $located = STYLESHEETPATH . '/' . $template_name;
+                if ( path_is_absolute( $template_name ) && file_exists( $template_name ) ) {
+                        $located = $template_name;
                         break;
-                } else if ( file_exists(TEMPLATEPATH . '/' . $template_name) ) {
-                        $located = TEMPLATEPATH . '/' . $template_name;
+                } else if ( file_exists( get_stylesheet_directory() . '/' . $template_name)) {
+                        $located = get_stylesheet_directory() . '/' . $template_name;
                         break;
+                } else if ( file_exists( get_template_directory() . '/' . $template_name) ) {
+                        $located = get_template_directory() . '/' . $template_name;
+                        break;
                 }
         }