<!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>[14080] trunk: Use WP_FALLBACK_THEME instead of default.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/14080">14080</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2010-04-13 21:56:57 +0000 (Tue, 13 Apr 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Use WP_FALLBACK_THEME instead of default. Props MichaelH. see <a href="http://trac.wordpress.org/ticket/12846">#12846</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminincludesupgradephp">trunk/wp-admin/includes/upgrade.php</a></li>
<li><a href="#trunkwpincludescommenttemplatephp">trunk/wp-includes/comment-template.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminincludesupgradephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/upgrade.php (14079 => 14080)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/upgrade.php 2010-04-13 21:45:57 UTC (rev 14079)
+++ trunk/wp-admin/includes/upgrade.php 2010-04-13 21:56:57 UTC (rev 14080)
</span><span class="lines">@@ -1613,7 +1613,7 @@
</span><span class="cx"> if ($oldfile == 'index.php') { // Check to make sure it's not a new index
</span><span class="cx"> $index = implode('', file("$oldpath/$oldfile"));
</span><span class="cx"> if (strpos($index, 'WP_USE_THEMES') !== false) {
</span><del>- if (! @copy(WP_CONTENT_DIR . '/themes/default/index.php', "$site_dir/$newfile"))
</del><ins>+ if (! @copy(WP_CONTENT_DIR . '/themes/'.WP_FALLBACK_THEME.'/index.php', "$site_dir/$newfile"))
</ins><span class="cx"> return false;
</span><span class="cx"> continue; // Don't copy anything
</span><span class="cx"> }
</span><span class="lines">@@ -1673,7 +1673,7 @@
</span><span class="cx"> */
</span><span class="cx"> function make_site_theme_from_default($theme_name, $template) {
</span><span class="cx"> $site_dir = WP_CONTENT_DIR . "/themes/$template";
</span><del>- $default_dir = WP_CONTENT_DIR . '/themes/default';
</del><ins>+ $default_dir = WP_CONTENT_DIR . '/themes/'.WP_FALLBACK_THEME;
</ins><span class="cx">
</span><span class="cx"> // Copy files from the default theme to the site theme.
</span><span class="cx"> //$files = array('index.php', 'comments.php', 'comments-popup.php', 'footer.php', 'header.php', 'sidebar.php', 'style.css');
</span><span class="lines">@@ -1769,7 +1769,7 @@
</span><span class="cx">
</span><span class="cx"> // Make the new site theme active.
</span><span class="cx"> $current_template = __get_option('template');
</span><del>- if ($current_template == 'default') {
</del><ins>+ if ($current_template == WP_FALLBACK_THEME) {
</ins><span class="cx"> update_option('template', $template);
</span><span class="cx"> update_option('stylesheet', $template);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkwpincludescommenttemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/comment-template.php (14079 => 14080)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/comment-template.php 2010-04-13 21:45:57 UTC (rev 14079)
+++ trunk/wp-includes/comment-template.php 2010-04-13 21:56:57 UTC (rev 14080)
</span><span class="lines">@@ -890,7 +890,7 @@
</span><span class="cx"> elseif ( file_exists( TEMPLATEPATH . $file ) )
</span><span class="cx"> require( TEMPLATEPATH . $file );
</span><span class="cx"> else
</span><del>- require( get_theme_root() . '/default/comments.php');
</del><ins>+ require( get_theme_root() . '/'.WP_FALLBACK_THEME.'/comments.php');
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span></span></pre>
</div>
</div>
</body>
</html>