<!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>[13392] trunk/wp-includes/ms-load.php: Warnings, code & UI/UX cleanup,
See #11644</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/13392">13392</a></dd>
<dt>Author</dt> <dd>wpmuguru</dd>
<dt>Date</dt> <dd>2010-02-24 23:12:51 +0000 (Wed, 24 Feb 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Warnings, code & UI/UX cleanup, 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>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludesmsloadphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/ms-load.php (13391 => 13392)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/ms-load.php 2010-02-24 22:54:00 UTC (rev 13391)
+++ trunk/wp-includes/ms-load.php 2010-02-24 23:12:51 UTC (rev 13392)
</span><span class="lines">@@ -51,7 +51,7 @@
</span><span class="cx"> if ( file_exists( WP_CONTENT_DIR . '/blog-inactive.php' ) )
</span><span class="cx"> return WP_CONTENT_DIR . '/blog-inactive.php';
</span><span class="cx"> else
</span><del>- wp_die( sprintf( __( 'This blog has not been activated yet. If you are having problems activating your blog, please contact <a href="mailto:%1$s">%1$s</a>.' ), str_replace( '@', ' AT ', get_site_option( 'admin_email', "support@{$current_site->domain}" ) ) ) );
</del><ins>+ wp_die( sprintf( __( 'This site has not been activated yet. If you are having problems activating your site, please contact <a href="mailto:%1$s">%1$s</a>.' ), str_replace( '@', ' AT ', get_site_option( 'admin_email', "support@{$current_site->domain}" ) ) ) );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( $current_blog->archived == '1' || $current_blog->spam == '1' ) {
</span><span class="lines">@@ -110,7 +110,7 @@
</span><span class="cx"> else
</span><span class="cx"> $current_site->cookie_domain = $current_site->domain;
</span><span class="cx">
</span><del>- wp_load_core_site_options($current_site->id);
</del><ins>+ wp_load_core_site_options( $current_site->id );
</ins><span class="cx">
</span><span class="cx"> return $current_site;
</span><span class="cx"> }
</span><span class="lines">@@ -121,8 +121,8 @@
</span><span class="cx">
</span><span class="cx"> $sites = $wpdb->get_results( "SELECT * FROM $wpdb->site" ); // usually only one site
</span><span class="cx"> if ( 1 == count( $sites ) ) {
</span><del>- wp_load_core_site_options($current_site->id);
</del><span class="cx"> $current_site = $sites[0];
</span><ins>+ wp_load_core_site_options( $current_site->id );
</ins><span class="cx"> $path = $current_site->path;
</span><span class="cx"> $current_site->blog_id = $wpdb->get_var( $wpdb->prepare( "SELECT blog_id FROM $wpdb->blogs WHERE domain = %s AND path = %s", $current_site->domain, $current_site->path ) );
</span><span class="cx"> $current_site = get_current_site_name( $current_site );
</span><span class="lines">@@ -187,12 +187,12 @@
</span><span class="cx"> global $wpdb, $domain, $path;
</span><span class="cx">
</span><span class="cx"> $msg = '<h1>' . esc_html__( 'Fatal Error' ) . '</h1>';
</span><del>- $msg = '<p>' . __( 'If your blog does not display, please contact the owner of this site.' ) . '</p>';
- $msg .= '<p>' . __( 'If you are the owner of this site please check that MySQL is running properly and all tables are error free.' ) . '</p>';
</del><ins>+ $msg = '<p>' . __( 'If your site does not display, please contact the owner of this network.' ) . '</p>';
+ $msg .= '<p>' . __( 'If you are the owner of this network please check that MySQL is running properly and all tables are error free.' ) . '</p>';
</ins><span class="cx"> if ( ! $wpdb->get_var( "SHOW TABLES LIKE '$wpdb->site'" ) )
</span><span class="cx"> $msg .= '<p>' . sprintf( __( '<strong>Database tables are missing.</strong> This means that MySQL is not running, WordPress was not installed properly, or someone deleted <code>%s</code>. You really <em>should</em> look at your database now.' ), $wpdb->site ) . '</p>';
</span><span class="cx"> else
</span><del>- $msg .= '<p>' . sprintf( __( '<strong>Could Not Find Blog!</strong> Searched for table <em>%1$s</em> in <code>%2$s</code>. Is that right?' ), $domain . $path, DB_NAME, $wpdb->blogs ) . '</p>';
</del><ins>+ $msg .= '<p>' . sprintf( __( '<strong>Could Not Find Site!</strong> Searched for table <em>%1$s</em> in <code>%2$s</code>. Is that right?' ), $domain . $path, DB_NAME, $wpdb->blogs ) . '</p>';
</ins><span class="cx"> $msg .= '<h1>' . esc_html__( 'What do I do now?' ) . '</h1>';
</span><span class="cx"> // @todo Update WPMU codex link.
</span><span class="cx"> $msg .= '<p>' . __( 'Read the <a target="_blank" href="http://codex.wordpress.org/Debugging_WPMU">bug report</a> page. Some of the guidelines there may help you figure out what went wrong.' ) . '</p>';
</span></span></pre>
</div>
</div>
</body>
</html>