Changeset 20162 for trunk/wp-includes/theme.php

Timestamp:

03/08/2012 06:18:10 PM (13 years ago)

Author:

nacin

Message:

Pass WP_Theme->get_theme_root_uri() to get_theme_root_uri(), thereby always triggering the theme_root_uri filter. see #20103.

File:

• trunk/wp-includes/theme.php (modified) (1 diff)

trunk/wp-includes/theme.php

@@ -526 +526 @@
  * @since 1.5.0
  *
- * @param string $stylesheet_or_template The stylesheet or template name of the theme
+ * @param string $stylesheet_or_template Optional. The stylesheet or template name of the theme.
+ *  Default is to leverage the main theme root.
+ * @param string $theme_root Optional. The theme root for which calculations will be based, preventing
+ *  the need for a get_raw_theme_root() call.
  * @return string Themes URI.
  */
-function get_theme_root_uri( $stylesheet_or_template = false ) {
+function get_theme_root_uri( $stylesheet_or_template = false, $theme_root = false ) {
     global $wp_theme_directories;
 
-    if ( $stylesheet_or_template && $theme_root = get_raw_theme_root( $stylesheet_or_template ) ) {
+    if ( $stylesheet_or_template && ! $theme_root )
+        $theme_root = get_raw_theme_root( $stylesheet_or_template );
+
+    if ( $stylesheet_or_template && $theme_root ) {
         if ( in_array( $theme_root, (array) $wp_theme_directories ) ) {
             // Absolute path. Make an educated guess. YMMV -- but note the filter below.