<!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>[13575] trunk/wp-includes: remove __( calls from ms startup, see #11644</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/13575">13575</a></dd>
<dt>Author</dt> <dd>wpmuguru</dd>
<dt>Date</dt> <dd>2010-03-03 17:13:38 +0000 (Wed, 03 Mar 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>remove __( calls from ms startup, 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 (13574 => 13575)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/ms-load.php 2010-03-03 17:10:43 UTC (rev 13574)
+++ trunk/wp-includes/ms-load.php 2010-03-03 17:13:38 UTC (rev 13575)
</span><span class="lines">@@ -170,9 +170,9 @@
</span><span class="cx"> // Still no dice.
</span><span class="cx"> // @todo Update or remove WPMU codex link.
</span><span class="cx"> if ( 1 == count( $sites ) )
</span><del>- wp_die( sprintf( __( 'That blog does not exist. Please try <a href="%s">%s</a>.' ), $sites[0]->domain . $sites[0]->path ) );
</del><ins>+ wp_die( sprintf( 'That blog does not exist. Please try <a href="%s">%s</a>.', $sites[0]->domain . $sites[0]->path ) );
</ins><span class="cx"> else
</span><del>- wp_die( __( '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 further assistance.' ) );
</del><ins>+ wp_die( '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 further assistance.' );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -186,27 +186,27 @@
</span><span class="cx"> function ms_not_installed() {
</span><span class="cx"> global $wpdb, $domain, $path;
</span><span class="cx">
</span><del>- $msg = '<h1>' . esc_html__( 'Fatal Error' ) . '</h1>';
- $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>';
</del><ins>+ $msg = '<h1>' . esc_html( 'Fatal Error' ) . '</h1>';
+ $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><del>- $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>';
</del><ins>+ $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>';
</ins><span class="cx"> else
</span><del>- $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>';
- $msg .= '<h1>' . esc_html__( 'What do I do now?' ) . '</h1>';
</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>';
+ $msg .= '<h1>' . esc_html( 'What do I do now?' ) . '</h1>';
</ins><span class="cx"> // @todo Update WPMU codex link.
</span><del>- $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>';
- $msg .= '<p>' . __( "If you're still stuck with this message, then check that your database contains the following tables:" ) . '</p><ul>';
</del><ins>+ $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>';
+ $msg .= '<p>' . "If you're still stuck with this message, then check that your database contains the following tables:" . '</p><ul>';
</ins><span class="cx"> foreach ( $wpdb->global_tables as $table ) {
</span><span class="cx"> $msg .= '<li>' . $wpdb->prefix . $table . '</li>';
</span><span class="cx"> }
</span><span class="cx"> $msg .= '</ul>';
</span><span class="cx"> // @todo Update WPMU codex link and support instructions.
</span><del>- $msg = '<p>' . __( 'If you suspect a problem please report it to the support forums but you must include the information asked for in the <a target="_blank" href="http://codex.wordpress.org/Debugging_WPMU">WPMU bug reporting guidelines</a>! ' ) . '</p>';
</del><ins>+ $msg = '<p>' . 'If you suspect a problem please report it to the support forums but you must include the information asked for in the <a target="_blank" href="http://codex.wordpress.org/Debugging_WPMU">WPMU bug reporting guidelines</a>! ' . '</p>';
</ins><span class="cx">
</span><span class="cx"> // @todo This file no longer exists post-merge.
</span><span class="cx"> if ( is_file( 'release-info.txt' ) ) {
</span><del>- $msg .= '<p>' . __( 'Your bug report must include the following text:' ) . '</p>';
</del><ins>+ $msg .= '<p>' . 'Your bug report must include the following text:' . '</p>';
</ins><span class="cx"> $info = file( 'release-info.txt' );
</span><span class="cx"> $msg .= $info[ 4 ] . '"';
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkwpincludesmssettingsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/ms-settings.php (13574 => 13575)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/ms-settings.php 2010-03-03 17:10:43 UTC (rev 13574)
+++ trunk/wp-includes/ms-settings.php 2010-03-03 17:13:38 UTC (rev 13575)
</span><span class="lines">@@ -110,7 +110,7 @@
</span><span class="cx"> $current_blog->blog_id = $blog_id = 1;
</span><span class="cx"> } else {
</span><span class="cx"> $msg = ! $wpdb->get_var( "SHOW TABLES LIKE '$wpdb->site'" ) ? ' ' . __( 'Database tables are missing.' ) : '';
</span><del>- wp_die( __( 'No blog by that name on this system.' ) . $msg );
</del><ins>+ wp_die( 'No blog by that name on this system.' . $msg );
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>