<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[15641] trunk/wp-includes/theme.php: Don'
t fetch theme_roots transient on every page load.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/15641">15641</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2010-09-21 19:41:35 +0000 (Tue, 21 Sep 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Don't fetch theme_roots transient on every page load. Avoid it altogether if there is only one theme dir. fixes <a href="http://trac.wordpress.org/ticket/14911">#14911</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesthemephp">trunk/wp-includes/theme.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludesthemephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/theme.php (15640 => 15641)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/theme.php 2010-09-21 14:52:03 UTC (rev 15640)
+++ trunk/wp-includes/theme.php 2010-09-21 19:41:35 UTC (rev 15641)
</span><span class="lines">@@ -466,9 +466,14 @@
</span><span class="cx"> *
</span><span class="cx"> * @since 2.9.0
</span><span class="cx"> *
</span><del>- * @return array Theme roots
</del><ins>+ * @return array|string An arry of theme roots keyed by template/stylesheet or a single theme root if all themes have the same root.
</ins><span class="cx"> */
</span><span class="cx"> function get_theme_roots() {
</span><ins>+ global $wp_theme_directories;
+
+ if ( count($wp_theme_directories <= 1) )
+ return '/themes';
+
</ins><span class="cx"> $theme_roots = get_site_transient( 'theme_roots' );
</span><span class="cx"> if ( false === $theme_roots ) {
</span><span class="cx"> get_themes();
</span><span class="lines">@@ -651,11 +656,9 @@
</span><span class="cx"> * @return string Theme path.
</span><span class="cx"> */
</span><span class="cx"> function get_theme_root( $stylesheet_or_template = false ) {
</span><del>- 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];
</del><ins>+ if ( $stylesheet_or_template ) {
+ if ( $theme_root = get_raw_theme_root($stylesheet_or_template) )
+ $theme_root = WP_CONTENT_DIR . $theme_root;
</ins><span class="cx"> else
</span><span class="cx"> $theme_root = WP_CONTENT_DIR . '/themes';
</span><span class="cx"> } else {
</span><span class="lines">@@ -676,17 +679,50 @@
</span><span class="cx"> * @return string Themes URI.
</span><span class="cx"> */
</span><span class="cx"> function get_theme_root_uri( $stylesheet_or_template = false ) {
</span><del>- $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
</del><ins>+ 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 {
</ins><span class="cx"> $theme_root_uri = content_url( 'themes' );
</span><ins>+ }
</ins><span class="cx">
</span><span class="cx"> return apply_filters( 'theme_root_uri', $theme_root_uri, get_option('siteurl'), $stylesheet_or_template );
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><ins>+ * 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 ) {
+ global $wp_theme_directories;
+
+ if ( count($wp_theme_directories <= 1) )
+ return '/themes';
+
+ $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;
+}
+
+/**
</ins><span class="cx"> * Retrieve path to a template
</span><span class="cx"> *
</span><span class="cx"> * Used to quickly retrieve the path of a template without including the file
</span><span class="lines">@@ -1213,8 +1249,14 @@
</span><span class="cx"> * @param string $stylesheet Stylesheet name.
</span><span class="cx"> */
</span><span class="cx"> function switch_theme($template, $stylesheet) {
</span><ins>+ global $wp_theme_directories;
+
</ins><span class="cx"> update_option('template', $template);
</span><span class="cx"> update_option('stylesheet', $stylesheet);
</span><ins>+ if ( count($wp_theme_directories) > 1 ) {
+ update_option('template_root', get_raw_theme_root($template));
+ update_option('stylesheet_root', get_raw_theme_root($stylesheet));
+ }
</ins><span class="cx"> delete_option('current_theme');
</span><span class="cx"> $theme = get_current_theme();
</span><span class="cx"> do_action('switch_theme', $theme);
</span></span></pre>
</div>
</div>
</body>
</html>