<!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>[12118] trunk/wp-includes/theme.php: More theme subdir fixes.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/12118">12118</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2009-10-27 17:17:23 +0000 (Tue, 27 Oct 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>More theme subdir fixes. see <a href="http://trac.wordpress.org/ticket/10467">#10467</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 (12117 => 12118)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/theme.php 2009-10-27 16:45:30 UTC (rev 12117)
+++ trunk/wp-includes/theme.php 2009-10-27 17:17:23 UTC (rev 12118)
</span><span class="lines">@@ -296,8 +296,8 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( empty($template) ) {
</span><del>- if ( file_exists(dirname("$theme_root/$theme_file/index.php")) )
- $template = dirname($theme_file);
</del><ins>+ if ( file_exists("$theme_root/$stylesheet/index.php") )
+ $template = $stylesheet;
</ins><span class="cx"> else
</span><span class="cx"> continue;
</span><span class="cx"> }
</span><span class="lines">@@ -307,7 +307,8 @@
</span><span class="cx"> if ( !file_exists("$theme_root/$template/index.php") ) {
</span><span class="cx"> $parent_dir = dirname(dirname($theme_file));
</span><span class="cx"> if ( file_exists("$theme_root/$parent_dir/$template/index.php") ) {
</span><del>- $template = "$theme_root/$parent_dir/$template";
</del><ins>+ $template = "$parent_dir/$template";
+ $template_directory = "$theme_root/$parent_dir/$template";
</ins><span class="cx"> } else {
</span><span class="cx"> /**
</span><span class="cx"> * The parent theme doesn't exist in the current theme's folder or sub folder
</span><span class="lines">@@ -323,7 +324,7 @@
</span><span class="cx">
</span><span class="cx"> }
</span><span class="cx"> } else {
</span><del>- $template = trim( $theme_root . '/' . $template );
</del><ins>+ $template_directory = trim( $theme_root . '/' . $template );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> $stylesheet_files = array();
</span><span class="lines">@@ -342,20 +343,20 @@
</span><span class="cx"> @ $stylesheet_dir->close();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- $template_dir = @ dir("$template");
</del><ins>+ $template_dir = @ dir("$template_directory");
</ins><span class="cx"> if ( $template_dir ) {
</span><span class="cx"> while ( ($file = $template_dir->read()) !== false ) {
</span><span class="cx"> if ( preg_match('|^\.+$|', $file) )
</span><span class="cx"> continue;
</span><span class="cx"> if ( preg_match('|\.php$|', $file) ) {
</span><del>- $template_files[] = "$template/$file";
- } elseif ( is_dir("$template/$file") ) {
- $template_subdir = @ dir("$template/$file");
</del><ins>+ $template_files[] = "$template_directory/$file";
+ } elseif ( is_dir("$template_directory/$file") ) {
+ $template_subdir = @ dir("$template_directory/$file");
</ins><span class="cx"> while ( ($subfile = $template_subdir->read()) !== false ) {
</span><span class="cx"> if ( preg_match('|^\.+$|', $subfile) )
</span><span class="cx"> continue;
</span><span class="cx"> if ( preg_match('|\.php$|', $subfile) )
</span><del>- $template_files[] = "$template/$file/$subfile";
</del><ins>+ $template_files[] = "$template_directory/$file/$subfile";
</ins><span class="cx"> }
</span><span class="cx"> @ $template_subdir->close();
</span><span class="cx"> }
</span><span class="lines">@@ -390,7 +391,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> $theme_roots[$stylesheet] = str_replace( WP_CONTENT_DIR, '', $theme_root );
</span><del>- $themes[$name] = array( 'Name' => $name, 'Title' => $title, 'Description' => $description, 'Author' => $author, 'Version' => $version, 'Template' => basename( $template ), 'Stylesheet' => $stylesheet, 'Template Files' => $template_files, 'Stylesheet Files' => $stylesheet_files, 'Template Dir' => $template_dir, 'Stylesheet Dir' => $stylesheet_dir, 'Status' => $theme_data['Status'], 'Screenshot' => $screenshot, 'Tags' => $theme_data['Tags'], 'Theme Root' => $theme_root, 'Theme Root URI' => str_replace( WP_CONTENT_DIR, content_url(), $theme_root ) );
</del><ins>+ $themes[$name] = array( 'Name' => $name, 'Title' => $title, 'Description' => $description, 'Author' => $author, 'Version' => $version, 'Template' => $template, 'Stylesheet' => $stylesheet, 'Template Files' => $template_files, 'Stylesheet Files' => $stylesheet_files, 'Template Dir' => $template_dir, 'Stylesheet Dir' => $stylesheet_dir, 'Status' => $theme_data['Status'], 'Screenshot' => $screenshot, 'Tags' => $theme_data['Tags'], 'Theme Root' => $theme_root, 'Theme Root URI' => str_replace( WP_CONTENT_DIR, content_url(), $theme_root ) );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /* Resolve theme dependencies. */
</span></span></pre>
</div>
</div>
</body>
</html>