<!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>[13019] trunk/wp-includes: Switch to a constant for the fallback theme.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/13019">13019</a></dd>
<dt>Author</dt> <dd>westi</dd>
<dt>Date</dt> <dd>2010-02-07 22:36:37 +0000 (Sun, 07 Feb 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Switch to a constant for the fallback theme. See <a href="http://trac.wordpress.org/ticket/9015">#9015</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesdefaultconstantsphp">trunk/wp-includes/default-constants.php</a></li>
<li><a href="#trunkwpincludesthemephp">trunk/wp-includes/theme.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludesdefaultconstantsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/default-constants.php (13018 => 13019)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/default-constants.php 2010-02-07 22:27:51 UTC (rev 13018)
+++ trunk/wp-includes/default-constants.php 2010-02-07 22:36:37 UTC (rev 13019)
</span><span class="lines">@@ -258,6 +258,13 @@
</span><span class="cx"> * @since 2.1.0
</span><span class="cx"> */
</span><span class="cx"> define('STYLESHEETPATH', get_stylesheet_directory());
</span><ins>+
+ /**
+ * Slug of the fallback theme for this install.
+ * Will be used as the fallback if the current theme doesn't exist.
+ * @since 3.0.0
+ */
+ define( 'WP_FALLBACK_THEME', 'twentyten' );
</ins><span class="cx"> break;
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkwpincludesthemephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/theme.php (13018 => 13019)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/theme.php 2010-02-07 22:27:51 UTC (rev 13018)
+++ trunk/wp-includes/theme.php 2010-02-07 22:36:37 UTC (rev 13019)
</span><span class="lines">@@ -951,7 +951,7 @@
</span><span class="cx"> function get_comments_popup_template() {
</span><span class="cx"> $template = locate_template(array("comments-popup.php"));
</span><span class="cx"> if ('' == $template)
</span><del>- $template = get_theme_root() . '/default/comments-popup.php';
</del><ins>+ $template = get_theme_root() . '/' . WP_FALLBACK_THEME . '/comments-popup.php';
</ins><span class="cx">
</span><span class="cx"> return apply_filters('comments_popup_template', $template);
</span><span class="cx"> }
</span><span class="lines">@@ -1160,15 +1160,13 @@
</span><span class="cx"> if ( defined('WP_INSTALLING') || !apply_filters( 'validate_current_theme', true ) )
</span><span class="cx"> return true;
</span><span class="cx">
</span><del>- $fallback = 'twentyten';
-
- if ( get_template() != $fallback && !file_exists(get_template_directory() . '/index.php') ) {
- switch_theme($fallback, $fallback);
</del><ins>+ if ( get_template() != WP_FALLBACK_THEME && !file_exists(get_template_directory() . '/index.php') ) {
+ switch_theme( WP_FALLBACK_THEME, WP_FALLBACK_THEME );
</ins><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if ( get_stylesheet() != $fallback && !file_exists(get_template_directory() . '/style.css') ) {
- switch_theme($fallback, $fallback);
</del><ins>+ if ( get_stylesheet() != WP_FALLBACK_THEME && !file_exists(get_template_directory() . '/style.css') ) {
+ switch_theme( WP_FALLBACK_THEME, WP_FALLBACK_THEME );
</ins><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>