<!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>[16424] trunk: Register the default theme dir in wp-settings.
php so that it is registered even when get_themes() doesn't run.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/16424">16424</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2010-11-17 16:11:44 +0000 (Wed, 17 Nov 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Register the default theme dir in wp-settings.php so that it is registered even when get_themes() doesn't run. Fix counting of theme dirs. Add option to get_raw_theme_root() to disregard the current theme root cache. see <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>
<li><a href="#trunkwpsettingsphp">trunk/wp-settings.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 (16423 => 16424)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/theme.php 2010-11-17 12:33:32 UTC (rev 16423)
+++ trunk/wp-includes/theme.php 2010-11-17 16:11:44 UTC (rev 16424)
</span><span class="lines">@@ -267,9 +267,6 @@
</span><span class="cx"> if ( isset($wp_themes) )
</span><span class="cx"> return $wp_themes;
</span><span class="cx">
</span><del>- /* Register the default root as a theme directory */
- register_theme_directory( get_theme_root() );
-
</del><span class="cx"> if ( !$theme_files = search_theme_directories() )
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="lines">@@ -475,7 +472,7 @@
</span><span class="cx"> function get_theme_roots() {
</span><span class="cx"> global $wp_theme_directories;
</span><span class="cx">
</span><del>- if ( count($wp_theme_directories <= 1) )
</del><ins>+ if ( count($wp_theme_directories) <= 1 )
</ins><span class="cx"> return '/themes';
</span><span class="cx">
</span><span class="cx"> $theme_roots = get_site_transient( 'theme_roots' );
</span><span class="lines">@@ -703,19 +700,21 @@
</span><span class="cx"> * @param string $stylesheet_or_template The stylesheet or template name of the theme
</span><span class="cx"> * @return string Theme root
</span><span class="cx"> */
</span><del>-function get_raw_theme_root( $stylesheet_or_template ) {
</del><ins>+function get_raw_theme_root( $stylesheet_or_template, $no_cache = false ) {
</ins><span class="cx"> global $wp_theme_directories;
</span><span class="cx">
</span><del>- if ( count($wp_theme_directories <= 1) )
</del><ins>+ if ( count($wp_theme_directories) <= 1 )
</ins><span class="cx"> return '/themes';
</span><span class="cx">
</span><span class="cx"> $theme_root = false;
</span><span class="cx">
</span><span class="cx"> // If requesting the root for the current theme, consult options to avoid calling get_theme_roots()
</span><del>- 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');
</del><ins>+ if ( !$no_cache ) {
+ 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');
+ }
</ins><span class="cx">
</span><span class="cx"> if ( empty($theme_root) ) {
</span><span class="cx"> $theme_roots = get_theme_roots();
</span><span class="lines">@@ -1248,8 +1247,8 @@
</span><span class="cx"> update_option('template', $template);
</span><span class="cx"> update_option('stylesheet', $stylesheet);
</span><span class="cx"> if ( count($wp_theme_directories) > 1 ) {
</span><del>- update_option('template_root', get_raw_theme_root($template));
- update_option('stylesheet_root', get_raw_theme_root($stylesheet));
</del><ins>+ update_option('template_root', get_raw_theme_root($template, true));
+ update_option('stylesheet_root', get_raw_theme_root($stylesheet, true));
</ins><span class="cx"> }
</span><span class="cx"> delete_option('current_theme');
</span><span class="cx"> $theme = get_current_theme();
</span></span></pre></div>
<a id="trunkwpsettingsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-settings.php (16423 => 16424)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-settings.php 2010-11-17 12:33:32 UTC (rev 16423)
+++ trunk/wp-settings.php 2010-11-17 16:11:44 UTC (rev 16424)
</span><span class="lines">@@ -174,6 +174,9 @@
</span><span class="cx"> create_initial_taxonomies();
</span><span class="cx"> create_initial_post_types();
</span><span class="cx">
</span><ins>+// Register the default theme directory root
+register_theme_directory( get_theme_root() );
+
</ins><span class="cx"> // Load active plugins.
</span><span class="cx"> foreach ( wp_get_active_and_valid_plugins() as $plugin )
</span><span class="cx"> include_once( $plugin );
</span></span></pre>
</div>
</div>
</body>
</html>