Ticket #22355: 27322.diff

wp-includes/template.php

@@ -447 +447 @@
 }
 
 /**
+ * Get theme directories
+ *
+ * Gives a map of theme base directories to theme base URIs, allowing searching
+ * themes for a certain file in order.
+ *
+ * @return array Map of base directory to base URI
+ */
+function wp_template_directories() {
+        $directories = array(
+                get_stylesheet_directory() => get_stylesheet_directory_uri(),
+                get_template_directory() => get_template_directory_uri(),
+        );
+        return apply_filters( 'wp_template_directories', $directories );
+}
+
+/**
  * Retrieve the name of the highest priority template file that exists.
  *
  * Searches in the STYLESHEETPATH before TEMPLATEPATH so that themes which
@@ -461 +477 @@
  */
 function locate_template($template_names, $load = false, $require_once = true ) {
         $located = '';
+        $basedirs = array_keys( wp_template_directories() );
         foreach ( (array) $template_names as $template_name ) {
                 if ( !$template_name )
                         continue;
-                if ( file_exists(STYLESHEETPATH . '/' . $template_name)) {
-                        $located = STYLESHEETPATH . '/' . $template_name;
-                        break;
-                } else if ( file_exists(TEMPLATEPATH . '/' . $template_name) ) {
-                        $located = TEMPLATEPATH . '/' . $template_name;
-                        break;
+
+                foreach ( $basedirs as $directory ) {
+                        if ( file_exists( $directory . '/' . $template_name ) ) {
+                                $located = $directory . '/' . $template_name;
+                                break 2;
+                        }
                 }
         }
 
@@ -503 +520 @@
                 require( $_template_file );
 }
 
+/**
+ * Get URI for an image
+ *
+ * Uses {@see wp_template_directories} to first find the file, then get the
+ * relevant URI for it.
+ *
+ * @param string $file File name to search for
+ * @return string URI for the asset, empty string if none found
+ */
+function theme_url( $file ) {
+        $directories = wp_template_directories();
+        $uri = '';
+
+        foreach ( $directories as $directory => $base_uri ) {
+                $path = sprintf( '%s/%s', $directory, $file );
+                if ( file_exists( $path ) ) {
+                        $uri = sprintf( '%s/%s', $base_uri, $file );
+                        break;
+                }
+        }
+
+        return apply_filters( 'theme_url', $uri, $file, $directories );
+}
+