<!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" />
<title>[20118] trunk/wp-includes/theme.php: Store relative-to-wp-content theme roots, as that is what get_theme_roots() should be receiving.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { 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 #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg > ul, #logmsg > ol { margin-left: 0; margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#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>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/20118">20118</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2012-03-06 01:50:54 +0000 (Tue, 06 Mar 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Store relative-to-wp-content theme roots, as that is what get_theme_roots() should be receiving. see <a href="http://core.trac.wordpress.org/ticket/20103">#20103</a>.
Since search_theme_directories() now generates this and leverages this as a cache, convert absolute to relative on cache storage, and relative to absolute on cache retrieval.</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 (20117 => 20118)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/theme.php 2012-03-05 17:39:26 UTC (rev 20117)
+++ trunk/wp-includes/theme.php 2012-03-06 01:50:54 UTC (rev 20118)
</span><span class="lines">@@ -398,13 +398,23 @@
</span><span class="cx">
</span><span class="cx"> $found_themes = array();
</span><span class="cx">
</span><ins>+ // Set up maybe-relative, maybe-absolute array of theme directories.
+ // We always want to return absolute, but we need to cache relative
+ // use in for get_theme_root().
+ foreach ( $wp_theme_directories as $theme_root ) {
+ if ( 0 === strpos( $theme_root, WP_CONTENT_DIR ) )
+ $relative_theme_roots[ str_replace( WP_CONTENT_DIR, '', $theme_root ) ] = $theme_root;
+ else
+ $relative_theme_roots[ $theme_root ] = $theme_root;
+ }
+
</ins><span class="cx"> if ( $cache_expiration = apply_filters( 'wp_cache_themes_persistently', false, 'search_theme_directories' ) ) {
</span><span class="cx"> $cached_roots = get_site_transient( 'theme_roots' );
</span><span class="cx"> if ( is_array( $cached_roots ) ) {
</span><span class="cx"> foreach ( $cached_roots as $theme_dir => $theme_root ) {
</span><span class="cx"> $found_themes[ $theme_dir ] = array(
</span><span class="cx"> 'theme_file' => $theme_dir . '/style.css',
</span><del>- 'theme_root' => $theme_root,
</del><ins>+ 'theme_root' => $relative_theme_roots[ $theme_root ], // Convert relative to absolute.
</ins><span class="cx"> );
</span><span class="cx"> }
</span><span class="cx"> return $found_themes;
</span><span class="lines">@@ -465,8 +475,10 @@
</span><span class="cx"> asort( $found_themes );
</span><span class="cx">
</span><span class="cx"> $theme_roots = array();
</span><ins>+ $relative_theme_roots = array_flip( $relative_theme_roots );
+
</ins><span class="cx"> foreach ( $found_themes as $theme_dir => $theme_data ) {
</span><del>- $theme_roots[ $theme_dir ] = $theme_data['theme_root'];
</del><ins>+ $theme_roots[ $theme_dir ] = $relative_theme_roots[ $theme_data['theme_root'] ]; // Convert absolute to relative.
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( $theme_roots != get_site_transient( 'theme_roots' ) )
</span></span></pre>
</div>
</div>
</body>
</html>