Ticket #14911: 14911.diff

wp-includes/theme.php

@@ -651 +651 @@
  * @return string Theme path.
  */
 function get_theme_root( $stylesheet_or_template = false ) {
-        if ($stylesheet_or_template) {
-                $theme_roots = get_theme_roots();
-
-                if ( ! empty( $theme_roots[$stylesheet_or_template] ) )
-                        $theme_root = WP_CONTENT_DIR . $theme_roots[$stylesheet_or_template];
+        if ( $stylesheet_or_template ) {
+                if ( $theme_root = get_raw_theme_root($stylesheet_or_template) )
+                        $theme_root = WP_CONTENT_DIR . $theme_root;
                 else
                         $theme_root = WP_CONTENT_DIR . '/themes';
         } else {
@@ -676 +674 @@
  * @return string Themes URI.
  */
 function get_theme_root_uri( $stylesheet_or_template = false ) {
-        $theme_roots = get_theme_roots();
 
-        if ( isset( $theme_roots[$stylesheet_or_template] ) && $theme_roots[$stylesheet_or_template] )
-                $theme_root_uri = content_url( $theme_roots[$stylesheet_or_template] );
-        else
+        if ($stylesheet_or_template) {
+                if ( $theme_root = get_raw_theme_root($stylesheet_or_template) )
+                        $theme_root_uri = content_url( $theme_root );
+                else
+                        $theme_root_uri = content_url( 'themes' );
+        } else {
                 $theme_root_uri = content_url( 'themes' );
+        }
 
         return apply_filters( 'theme_root_uri', $theme_root_uri, get_option('siteurl'), $stylesheet_or_template );
 }
 
 /**
+ * Get the raw theme root relative to the content directory with no filters applied.
+ *
+ * @since 3.1.0
+ *
+ * @param string $stylesheet_or_template The stylesheet or template name of the theme
+ * @return string Theme root
+ */
+function get_raw_theme_root( $stylesheet_or_template ) {
+        $theme_root = false;
+
+        // If requesting the root for the current theme, consult options to avoid calling get_theme_roots()
+        if ( get_option('stylesheet') == $stylesheet_or_template )
+                $theme_root = get_option('stylesheet_root');
+        elseif ( get_option('template') == $stylesheet_or_template )
+                $theme_root = get_option('template_root');
+
+        if ( empty($theme_root) ) {
+                $theme_roots = get_theme_roots();
+                if ( !empty($theme_roots[$stylesheet_or_template]) )
+                        $theme_root = $theme_roots[$stylesheet_or_template];
+        }
+
+        return $theme_root;
+}
+
+/**
  * Retrieve path to a template
  *
  * Used to quickly retrieve the path of a template without including the file
@@ -1215 +1242 @@
 function switch_theme($template, $stylesheet) {
         update_option('template', $template);
         update_option('stylesheet', $stylesheet);
+        update_option('template_root', get_raw_theme_root($template));
+        update_option('stylesheet_root', get_raw_theme_root($stylesheet));
         delete_option('current_theme');
         $theme = get_current_theme();
         do_action('switch_theme', $theme);