<!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>[13254] trunk/wp-includes: Minor MS startup cleanups.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/13254">13254</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2010-02-20 14:07:23 +0000 (Sat, 20 Feb 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Minor MS startup cleanups. See <a href="http://trac.wordpress.org/ticket/11644">#11644</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesmsloadphp">trunk/wp-includes/ms-load.php</a></li>
<li><a href="#trunkwpincludesmssettingsphp">trunk/wp-includes/ms-settings.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludesmsloadphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/ms-load.php (13253 => 13254)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/ms-load.php 2010-02-20 13:51:32 UTC (rev 13253)
+++ trunk/wp-includes/ms-load.php 2010-02-20 14:07:23 UTC (rev 13254)
</span><span class="lines">@@ -180,7 +180,6 @@
</span><span class="cx"> *
</span><span class="cx"> * Used when blog does not exist. Checks for a missing $wpdb->site table as well.
</span><span class="cx"> *
</span><del>- * @todo Merge with is_blog_installed(), dead_db(), wp_not_installed(), etc.
</del><span class="cx"> * @access private
</span><span class="cx"> * @since 3.0.0
</span><span class="cx"> */
</span></span></pre></div>
<a id="trunkwpincludesmssettingsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/ms-settings.php (13253 => 13254)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/ms-settings.php 2010-02-20 13:51:32 UTC (rev 13253)
+++ trunk/wp-includes/ms-settings.php 2010-02-20 14:07:23 UTC (rev 13254)
</span><span class="lines">@@ -48,7 +48,7 @@
</span><span class="cx"> if ( is_subdomain_install() ) {
</span><span class="cx"> $current_blog = wp_cache_get( 'current_blog_' . $domain, 'site-options' );
</span><span class="cx"> if ( !$current_blog ) {
</span><del>- $current_blog = get_blog_details( array('domain' => $domain), false );
</del><ins>+ $current_blog = get_blog_details( array( 'domain' => $domain ), false );
</ins><span class="cx"> if ( $current_blog )
</span><span class="cx"> wp_cache_set( 'current_blog_' . $domain, $current_blog, 'site-options' );
</span><span class="cx"> }
</span><span class="lines">@@ -67,7 +67,7 @@
</span><span class="cx"> $path .= $blogname . '/';
</span><span class="cx"> $current_blog = wp_cache_get( 'current_blog_' . $domain . $path, 'site-options' );
</span><span class="cx"> if ( ! $current_blog ) {
</span><del>- $current_blog = $current_blog = get_blog_details( array('domain' => $domain, 'path' => $path ), false );
</del><ins>+ $current_blog = get_blog_details( array( 'domain' => $domain, 'path' => $path ), false );
</ins><span class="cx"> if ( $current_blog )
</span><span class="cx"> wp_cache_set( 'current_blog_' . $domain . $path, $current_blog, 'site-options' );
</span><span class="cx"> }
</span><span class="lines">@@ -91,7 +91,7 @@
</span><span class="cx"> header( 'Location: http://' . $current_site->domain . $current_site->path );
</span><span class="cx"> exit;
</span><span class="cx"> }
</span><del>- $current_blog = get_blog_details( array('domain' => $current_site->domain, 'path' => $current_site->path), false );
</del><ins>+ $current_blog = get_blog_details( array( 'domain' => $current_site->domain, 'path' => $current_site->path ), false );
</ins><span class="cx"> }
</span><span class="cx"> if ( ! $current_blog || ! $current_site )
</span><span class="cx"> ms_not_installed();
</span><span class="lines">@@ -107,10 +107,10 @@
</span><span class="cx"> $current_site = get_current_site_name( $current_site );
</span><span class="cx">
</span><span class="cx"> if ( ! $blog_id ) {
</span><del>- if ( defined('WP_INSTALLING') ) {
</del><ins>+ if ( defined( 'WP_INSTALLING' ) ) {
</ins><span class="cx"> $current_blog->blog_id = $blog_id = 1;
</span><span class="cx"> } else {
</span><del>- $msg = ! $wpdb->get_var( "SHOW TABLES LIKE '$wpdb->site'" ) ? __( 'Database tables are missing.' ) : '';
</del><ins>+ $msg = ! $wpdb->get_var( "SHOW TABLES LIKE '$wpdb->site'" ) ? ' ' . __( 'Database tables are missing.' ) : '';
</ins><span class="cx"> wp_die( __( 'No blog by that name on this system.' ) . $msg );
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -124,6 +124,6 @@
</span><span class="cx"> wp_start_object_cache();
</span><span class="cx">
</span><span class="cx"> // Define upload directory constants
</span><del>-ms_upload_constants( );
</del><ins>+ms_upload_constants();
</ins><span class="cx">
</span><span class="cx"> ?>
</span></span></pre>
</div>
</div>
</body>
</html>