<!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>[20315] trunk: Always set WP_Theme->template even when there is an error and we have no idea what the template is.</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/20315">20315</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2012-03-29 04:16:17 +0000 (Thu, 29 Mar 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Always set WP_Theme->template even when there is an error and we have no idea what the template is. (Assume it is the stylesheet.) Prevents a number of issues including WP_Theme->is_child_theme() lying. Tidy the theme editor for broken themes and themes with no templates (PHP files), or no template (parent), or are broken. Allow broken themes to be edited. see <a href="http://core.trac.wordpress.org/ticket/20103">#20103</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminthemeeditorphp">trunk/wp-admin/theme-editor.php</a></li>
<li><a href="#trunkwpincludesclasswpthemephp">trunk/wp-includes/class-wp-theme.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminthemeeditorphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/theme-editor.php (20314 => 20315)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/theme-editor.php 2012-03-29 03:34:51 UTC (rev 20314)
+++ trunk/wp-admin/theme-editor.php 2012-03-29 04:16:17 UTC (rev 20315)
</span><span class="lines">@@ -55,6 +55,8 @@
</span><span class="cx"> wp_die( __( 'The requested theme does not exist.' ) );
</span><span class="cx">
</span><span class="cx"> $allowed_files = $theme->get_files( 'php', 1 );
</span><ins>+$has_templates = ! empty( $allowed_files );
+
</ins><span class="cx"> $style_files = $theme->get_files( 'css' );
</span><span class="cx"> if ( isset( $style_files['style.css'] ) ) {
</span><span class="cx"> $allowed_files['style.css'] = $style_files['style.css'];
</span><span class="lines">@@ -132,7 +134,7 @@
</span><span class="cx"> <?php endif;
</span><span class="cx">
</span><span class="cx"> $description = get_file_description( $file );
</span><del>-$file_show = array_search( $file, $allowed_files );
</del><ins>+$file_show = array_search( $file, array_filter( $allowed_files ) );
</ins><span class="cx"> if ( $description != $file_show )
</span><span class="cx"> $description .= ' <span>(' . $file_show . ')</span>';
</span><span class="cx"> ?>
</span><span class="lines">@@ -142,14 +144,14 @@
</span><span class="cx">
</span><span class="cx"> <div class="fileedit-sub">
</span><span class="cx"> <div class="alignleft">
</span><del>-<h3><?php echo $theme->display('Name') . ': ' . $description; ?></h3>
</del><ins>+<h3><?php echo $theme->display('Name'); if ( $description ) echo ': ' . $description; ?></h3>
</ins><span class="cx"> </div>
</span><span class="cx"> <div class="alignright">
</span><span class="cx"> <form action="theme-editor.php" method="post">
</span><span class="cx"> <strong><label for="theme"><?php _e('Select theme to edit:'); ?> </label></strong>
</span><span class="cx"> <select name="theme" id="theme">
</span><span class="cx"> <?php
</span><del>-foreach ( wp_get_themes() as $a_stylesheet => $a_theme ) {
</del><ins>+foreach ( wp_get_themes( array( 'errors' => null ) ) as $a_stylesheet => $a_theme ) {
</ins><span class="cx"> $selected = $a_stylesheet == $stylesheet ? ' selected="selected"' : '';
</span><span class="cx"> echo "\n\t" . '<option value="' . esc_attr( $a_stylesheet ) . '"' . $selected . '>' . $a_theme->display('Name') . '</option>';
</span><span class="cx"> }
</span><span class="lines">@@ -162,7 +164,8 @@
</span><span class="cx"> </div>
</span><span class="cx"> <div id="templateside">
</span><span class="cx"> <?php
</span><del>-if ( $allowed_files ) :
</del><ins>+if ( array_filter( $allowed_files ) ) :
+ if ( $has_templates || $theme->is_child_theme() ) :
</ins><span class="cx"> ?>
</span><span class="cx"> <h3><?php _e('Templates'); ?></h3>
</span><span class="cx"> <?php if ( $theme->is_child_theme() ) : ?>
</span><span class="lines">@@ -170,6 +173,8 @@
</span><span class="cx"> <?php endif; ?>
</span><span class="cx"> <ul>
</span><span class="cx"> <?php
</span><ins>+ endif;
+
</ins><span class="cx"> foreach ( $allowed_files as $filename => $absolute_filename ) :
</span><span class="cx"> if ( 'style.css' == $filename ) {
</span><span class="cx"> echo "\t</ul>\n\t<h3>" . _x( 'Styles', 'Theme stylesheets in theme editor' ) . "</h3>\n\t<ul>\n";
</span></span></pre></div>
<a id="trunkwpincludesclasswpthemephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/class-wp-theme.php (20314 => 20315)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/class-wp-theme.php 2012-03-29 03:34:51 UTC (rev 20314)
+++ trunk/wp-includes/class-wp-theme.php 2012-03-29 04:16:17 UTC (rev 20315)
</span><span class="lines">@@ -199,14 +199,16 @@
</span><span class="cx"> $this->errors = new WP_Error( 'theme_not_found', __( 'The theme directory does not exist.' ) );
</span><span class="cx"> else
</span><span class="cx"> $this->errors = new WP_Error( 'theme_no_stylesheet', __( 'Stylesheet is missing.' ) );
</span><del>- $this->cache_add( 'theme', array( 'headers' => $this->headers, 'errors' => $this->errors, 'stylesheet' => $this->stylesheet ) );
</del><ins>+ $this->template = $this->stylesheet;
+ $this->cache_add( 'theme', array( 'headers' => $this->headers, 'errors' => $this->errors, 'stylesheet' => $this->stylesheet, 'template' => $this->template ) );
</ins><span class="cx"> if ( ! file_exists( $this->theme_root ) ) // Don't cache this one.
</span><span class="cx"> $this->errors->add( 'theme_root_missing', __( 'ERROR: The themes directory is either empty or doesn&#8217;t exist. Please check your installation.' ) );
</span><span class="cx"> return;
</span><span class="cx"> } elseif ( ! is_readable( $this->theme_root . '/' . $theme_file ) ) {
</span><span class="cx"> $this->headers['Name'] = $this->stylesheet;
</span><span class="cx"> $this->errors = new WP_Error( 'theme_stylesheet_not_readable', __( 'Stylesheet is not readable.' ) );
</span><del>- $this->cache_add( 'theme', array( 'headers' => $this->headers, 'errors' => $this->errors, 'stylesheet' => $this->stylesheet ) );
</del><ins>+ $this->template = $this->stylesheet;
+ $this->cache_add( 'theme', array( 'headers' => $this->headers, 'errors' => $this->errors, 'stylesheet' => $this->stylesheet, 'template' => $this->template ) );
</ins><span class="cx"> return;
</span><span class="cx"> } else {
</span><span class="cx"> $this->headers = get_file_data( $this->theme_root . '/' . $theme_file, self::$file_headers, 'theme' );
</span><span class="lines">@@ -218,13 +220,12 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- // (If template is set from cache, we know it's good.)
</del><ins>+ // (If template is set from cache [and there are no errors], we know it's good.)
</ins><span class="cx"> if ( ! $this->template && ! ( $this->template = $this->headers['Template'] ) ) {
</span><del>- if ( file_exists( $this->theme_root . '/' . $this->stylesheet . '/index.php' ) ) {
- $this->template = $this->stylesheet;
- } else {
</del><ins>+ $this->template = $this->stylesheet;
+ if ( ! file_exists( $this->theme_root . '/' . $this->stylesheet . '/index.php' ) ) {
</ins><span class="cx"> $this->errors = new WP_Error( 'theme_no_index', __( 'Template is missing.' ) );
</span><del>- $this->cache_add( 'theme', array( 'headers' => $this->headers, 'errors' => $this->errors, 'stylesheet' => $this->stylesheet ) );
</del><ins>+ $this->cache_add( 'theme', array( 'headers' => $this->headers, 'errors' => $this->errors, 'stylesheet' => $this->stylesheet, 'template' => $this->template ) );
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>