Ticket #22355: 22355.4.patch

src/wp-includes/link-template.php

@@ -2679 +2679 @@
 }
 
 /**
+ * Get URI for a theme file.
+ *
+ * Uses {@see get_template_directories} to first find the file, then get the
+ * relevant URI for it.
+ *
+ * @since 4.1.0
+ *
+ * @param string $path Optional. Path relative to the theme url.
+ * @return string Theme URL with optional path appended.
+ */
+function theme_url( $path = '' ) {
+        $directories = get_template_directories();
+        $path        = wp_normalize_path( $path );
+        $url         = get_stylesheet_directory_uri();
+
+        if ( $path && is_string( $path ) ) {
+                $path = '/' . ltrim( $path, '/' );
+        }
+
+        foreach ( $directories as $directory => $base_uri ) {
+                if ( file_exists( $directory . $path ) ) {
+                        $url = $base_uri . $path;
+                        break;
+                }
+        }
+
+        /**
+         * Filter the URL to the theme directory.
+         *
+         * @since 4.1.0
+         *
+         * @param string $url         The complete URL to the theme directory, including scheme and path.
+         * @param string $path        Path relative to the URL to the theme directory. Blank string if no path is specified.
+         * @param array  $directories The registered template directories to be relative to.
+         */
+        return apply_filters( 'theme_url', $url, $path, $directories );
+}
+
+/**
  * Retrieve the site url for the current network.
  *
  * Returns the site url with the appropriate protocol, 'https' if

src/wp-includes/template.php

@@ -447 +447 @@
 }
 
 /**
+ * Get template directories.
+ *
+ * Gives a map of theme base directories to theme base URLs, allowing searching
+ * themes for a certain file in order.
+ *
+ * @since 4.1.0
+ *
+ * @return array Map of base directory to base URL
+ */
+function get_template_directories() {
+
+        $directories = array(
+                get_stylesheet_directory() => get_stylesheet_directory_uri(),
+                get_template_directory()   => get_template_directory_uri(),
+        );
+
+        /**
+         * Filter registered template directories.
+         *
+         * @since 4.1.0
+         *
+         * @param array $directories The registered template directories.
+         */
+        return  apply_filters( 'get_template_directories', $directories );
+}
+
+/**
  * Retrieve the name of the highest priority template file that exists.
  *
  * Searches in the STYLESHEETPATH before TEMPLATEPATH so that themes which
@@ -460 +487 @@
  * @return string The template filename if one is located.
  */
 function locate_template($template_names, $load = false, $require_once = true ) {
-        $located = '';
+        $located     = '';
+        $directories = array_keys( get_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 ( $directories as $directory ) {
+                        if ( file_exists( $directory . '/' . $template_name ) ) {
+                                $located = $directory . '/' . $template_name;
+                                break 2;
+                        }
                 }
         }
 
@@ -502 +531 @@
         else
                 require( $_template_file );
 }
-