<!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>[15369] branches/3.0/wp-includes/ms-load.php:
Update WPMU Codex links and remove todos.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/15369">15369</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2010-07-06 20:31:38 +0000 (Tue, 06 Jul 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Update WPMU Codex links and remove todos. props wpmuguru, fixes <a href="http://trac.wordpress.org/ticket/14014">#14014</a> for 3.0</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches30wpincludesmsloadphp">branches/3.0/wp-includes/ms-load.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branches30wpincludesmsloadphp"></a>
<div class="modfile"><h4>Modified: branches/3.0/wp-includes/ms-load.php (15368 => 15369)</h4>
<pre class="diff"><span>
<span class="info">--- branches/3.0/wp-includes/ms-load.php 2010-07-06 20:25:30 UTC (rev 15368)
+++ branches/3.0/wp-includes/ms-load.php 2010-07-06 20:31:38 UTC (rev 15369)
</span><span class="lines">@@ -182,11 +182,10 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Still no dice.
</span><del>- // @todo Update or remove WPMU codex link.
</del><span class="cx"> if ( 1 == count( $sites ) )
</span><span class="cx"> wp_die( sprintf( /*WP_I18N_BLOG_DOESNT_EXIST*/'That site does not exist. Please try <a href="%s">%s</a>.'/*/WP_I18N_BLOG_DOESNT_EXIST*/, $sites[0]->domain . $sites[0]->path ) );
</span><span class="cx"> else
</span><del>- wp_die( /*WP_I18N_NO_SITE_DEFINED*/'No site defined on this host. If you are the owner of this site, please check <a href="http://codex.wordpress.org/Debugging_WPMU">Debugging WPMU</a> for help.'/*/WP_I18N_NO_SITE_DEFINED*/ );
</del><ins>+ wp_die( /*WP_I18N_NO_SITE_DEFINED*/'No site defined on this host. If you are the owner of this site, please check <a href="http://codex.wordpress.org/Debugging_a_WordPress_Network">Debugging a WordPress Network</a> for help.'/*/WP_I18N_NO_SITE_DEFINED*/ );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -194,8 +193,6 @@
</span><span class="cx"> *
</span><span class="cx"> * Used when a blog's tables do not exist. Checks for a missing $wpdb->site table as well.
</span><span class="cx"> *
</span><del>- * @todo update Codex link for 3.0.0
- *
</del><span class="cx"> * @access private
</span><span class="cx"> * @since 3.0.0
</span><span class="cx"> */
</span><span class="lines">@@ -213,7 +210,7 @@
</span><span class="cx"> else
</span><span class="cx"> $msg .= '<p>' . sprintf( /*WP_I18N_NO_SITE_FOUND*/'<strong>Could not find site <code>%1$s</code>.</strong> Searched for table <code>%2$s</code> in database <code>%3$s</code>. Is that right?'/*/WP_I18N_NO_SITE_FOUND*/, rtrim( $domain . $path, '/' ), $wpdb->blogs, DB_NAME ) . '</p>';
</span><span class="cx"> $msg .= '<p><strong>' . /*WP_I18N_WHAT_DO_I_DO*/'What do I do now?'/*WP_I18N_WHAT_DO_I_DO*/ . '</strong> ';
</span><del>- $msg .= /*WP_I18N_RTFM*/'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.'/*/WP_I18N_RTFM*/;
</del><ins>+ $msg .= /*WP_I18N_RTFM*/'Read the <a target="_blank" href="http://codex.wordpress.org/Debugging_a_WordPress_Network">bug report</a> page. Some of the guidelines there may help you figure out what went wrong.'/*/WP_I18N_RTFM*/;
</ins><span class="cx"> $msg .= ' ' . /*WP_I18N_STUCK*/'If you&#8217;re still stuck with this message, then check that your database contains the following tables:'/*/WP_I18N_STUCK*/ . '</p><ul>';
</span><span class="cx"> foreach ( $wpdb->tables('global') as $t => $table ) {
</span><span class="cx"> if ( 'sitecategories' == $t )
</span></span></pre>
</div>
</div>
</body>
</html>