<!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>[19251] trunk: Avoid notice when themes dir is empty or missing.</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/19251">19251</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2011-11-11 14:10:54 +0000 (Fri, 11 Nov 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Avoid notice when themes dir is empty or missing. Don't reset current theme in current_theme_info() if there are no themes. Show warning in Right Now if there are no themes. Props azaozz. fixes <a href="http://core.trac.wordpress.org/ticket/19089">#19089</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminincludesdashboardphp">trunk/wp-admin/includes/dashboard.php</a></li>
<li><a href="#trunkwpadminincludesthemephp">trunk/wp-admin/includes/theme.php</a></li>
<li><a href="#trunkwpincludesthemephp">trunk/wp-includes/theme.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminincludesdashboardphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/dashboard.php (19250 => 19251)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/dashboard.php 2011-11-10 23:16:21 UTC (rev 19250)
+++ trunk/wp-admin/includes/dashboard.php 2011-11-11 14:10:54 UTC (rev 19251)
</span><span class="lines">@@ -387,7 +387,11 @@
</span><span class="cx"> $ct = current_theme_info();
</span><span class="cx">
</span><span class="cx"> echo "\n\t<p>";
</span><del>- if ( !empty($wp_registered_sidebars) ) {
</del><ins>+
+ if ( empty( $ct->stylesheet_dir ) ) {
+ if ( ! is_multisite() || is_super_admin() )
+ echo '<span class="error-message">' . __('ERROR: The themes directory is either empty or doesn&#8217;t exist. Please check your installation.') . '</span>';
+ } elseif ( ! empty($wp_registered_sidebars) ) {
</ins><span class="cx"> $sidebars_widgets = wp_get_sidebars_widgets();
</span><span class="cx"> $num_widgets = 0;
</span><span class="cx"> foreach ( (array) $sidebars_widgets as $k => $v ) {
</span></span></pre></div>
<a id="trunkwpadminincludesthemephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/theme.php (19250 => 19251)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/theme.php 2011-11-10 23:16:21 UTC (rev 19250)
+++ trunk/wp-admin/includes/theme.php 2011-11-11 14:10:54 UTC (rev 19251)
</span><span class="lines">@@ -16,10 +16,18 @@
</span><span class="cx"> function current_theme_info() {
</span><span class="cx"> $themes = get_themes();
</span><span class="cx"> $current_theme = get_current_theme();
</span><ins>+
+ if ( ! $themes ) {
+ $ct = new stdClass;
+ $ct->name = $current_theme;
+ return $ct;
+ }
+
</ins><span class="cx"> if ( ! isset( $themes[$current_theme] ) ) {
</span><span class="cx"> delete_option( 'current_theme' );
</span><span class="cx"> $current_theme = get_current_theme();
</span><span class="cx"> }
</span><ins>+
</ins><span class="cx"> $ct = new stdClass;
</span><span class="cx"> $ct->name = $current_theme;
</span><span class="cx"> $ct->title = $themes[$current_theme]['Title'];
</span></span></pre></div>
<a id="trunkwpincludesthemephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/theme.php (19250 => 19251)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/theme.php 2011-11-10 23:16:21 UTC (rev 19250)
+++ trunk/wp-includes/theme.php 2011-11-11 14:10:54 UTC (rev 19251)
</span><span class="lines">@@ -518,12 +518,13 @@
</span><span class="cx"> return $theme;
</span><span class="cx">
</span><span class="cx"> $themes = get_themes();
</span><del>- $theme_names = array_keys($themes);
- $current_template = get_option('template');
- $current_stylesheet = get_option('stylesheet');
- $current_theme = 'Twenty Ten';
</del><ins>+ $current_theme = 'Twenty Eleven';
</ins><span class="cx">
</span><span class="cx"> if ( $themes ) {
</span><ins>+ $theme_names = array_keys( $themes );
+ $current_template = get_option( 'template' );
+ $current_stylesheet = get_option( 'stylesheet' );
+
</ins><span class="cx"> foreach ( (array) $theme_names as $theme_name ) {
</span><span class="cx"> if ( $themes[$theme_name]['Stylesheet'] == $current_stylesheet &&
</span><span class="cx"> $themes[$theme_name]['Template'] == $current_template ) {
</span></span></pre>
</div>
</div>
</body>
</html>