<!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>[20557] trunk/wp-admin/theme-editor.php: Don't allow themes without a style.css editor to be edited.</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/20557">20557</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2012-04-21 20:57:54 +0000 (Sat, 21 Apr 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Don't allow themes without a style.css editor to be edited. These themes are too broken to be salvaged by the theme editor. 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>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminthemeeditorphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/theme-editor.php (20556 => 20557)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/theme-editor.php 2012-04-21 06:40:31 UTC (rev 20556)
+++ trunk/wp-admin/theme-editor.php 2012-04-21 20:57:54 UTC (rev 20557)
</span><span class="lines">@@ -54,26 +54,18 @@
</span><span class="cx"> if ( ! $theme->exists() )
</span><span class="cx"> wp_die( __( 'The requested theme does not exist.' ) );
</span><span class="cx">
</span><ins>+if ( $theme->errors() && 'theme_no_stylesheet' == $theme->errors()->get_error_code() )
+ wp_die( __( 'The requested theme does not exist.' ) . ' ' . $theme->errors()->get_error_message() );
+
</ins><span class="cx"> $allowed_files = $theme->get_files( 'php', 1 );
</span><span class="cx"> $has_templates = ! empty( $allowed_files );
</span><del>-
</del><span class="cx"> $style_files = $theme->get_files( 'css' );
</span><del>-if ( isset( $style_files['style.css'] ) ) {
- $allowed_files['style.css'] = $style_files['style.css'];
- unset( $style_files['style.css'] );
-} else {
- $style_files['style.css'] = false;
-}
</del><ins>+$allowed_files['style.css'] = $style_files['style.css'];
</ins><span class="cx"> $allowed_files += $style_files;
</span><span class="cx">
</span><span class="cx"> if ( empty( $file ) ) {
</span><del>- if ( ! empty( $allowed_files['style.css'] ) ) {
- $relative_file = 'style.css';
- $file = $allowed_files['style.css'];
- } else {
- $relative_file = key( $allowed_files );
- $file = current( $allowed_files );
- }
</del><ins>+ $relative_file = 'style.css';
+ $file = $allowed_files['style.css'];
</ins><span class="cx"> } else {
</span><span class="cx"> $relative_file = urldecode( stripslashes( $file ) );
</span><span class="cx"> $file = $theme->get_stylesheet_directory() . '/' . $relative_file;
</span><span class="lines">@@ -153,6 +145,9 @@
</span><span class="cx"> <select name="theme" id="theme">
</span><span class="cx"> <?php
</span><span class="cx"> foreach ( wp_get_themes( array( 'errors' => null ) ) as $a_stylesheet => $a_theme ) {
</span><ins>+ if ( $a_theme->errors() && 'theme_no_stylesheet' == $a_theme->errors()->get_error_code() )
+ continue;
+
</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">@@ -165,23 +160,20 @@
</span><span class="cx"> </div>
</span><span class="cx"> <div id="templateside">
</span><span class="cx"> <?php
</span><del>-if ( array_filter( $allowed_files ) ) :
</del><ins>+if ( $allowed_files ) :
</ins><span class="cx"> if ( $has_templates || $theme->is_child_theme() ) :
</span><span class="cx"> ?>
</span><span class="cx"> <h3><?php _e('Templates'); ?></h3>
</span><span class="cx"> <?php if ( $theme->is_child_theme() ) : ?>
</span><del>- <p class="howto"><?php printf( __( 'This child theme inherits templates from a parent theme, %s.' ), '<a href="' . self_admin_url('theme-editor.php?theme=' . $theme->get_template()) . '">' . $theme->parent()->display('Name') . '</a>' ); ?></p>
</del><ins>+ <p class="howto"><?php printf( __( 'This child theme inherits templates from a parent theme, %s.' ), '<a href="' . self_admin_url('theme-editor.php?theme=' . urlencode( $theme->get_template() ) ) . '">' . $theme->parent()->display('Name') . '</a>' ); ?></p>
</ins><span class="cx"> <?php endif; ?>
</span><span class="cx"> <ul>
</span><span class="cx"> <?php
</span><span class="cx"> endif;
</span><span class="cx">
</span><span class="cx"> foreach ( $allowed_files as $filename => $absolute_filename ) :
</span><del>- if ( 'style.css' == $filename ) {
</del><ins>+ if ( 'style.css' == $filename )
</ins><span class="cx"> echo "\t</ul>\n\t<h3>" . _x( 'Styles', 'Theme stylesheets in theme editor' ) . "</h3>\n\t<ul>\n";
</span><del>- if ( ! $absolute_filename )
- continue;
- }
</del><span class="cx">
</span><span class="cx"> $file_description = get_file_description( $filename );
</span><span class="cx"> if ( $file_description != basename( $filename ) )
</span></span></pre>
</div>
</div>
</body>
</html>