<!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>[13224] trunk/wp-admin/maint/repair.php:
First pass at Multisite support in DB repair.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/13224">13224</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2010-02-19 14:33:01 +0000 (Fri, 19 Feb 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>First pass at Multisite support in DB repair. When MS, include main blog tables; when not MS, include non-MS global tables (users, usermeta). See <a href="http://trac.wordpress.org/ticket/12083">#12083</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminmaintrepairphp">trunk/wp-admin/maint/repair.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminmaintrepairphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/maint/repair.php (13223 => 13224)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/maint/repair.php 2010-02-19 14:12:12 UTC (rev 13223)
+++ trunk/wp-admin/maint/repair.php 2010-02-19 14:33:01 UTC (rev 13224)
</span><span class="lines">@@ -31,35 +31,40 @@
</span><span class="cx">
</span><span class="cx"> $okay = true;
</span><span class="cx">
</span><ins>+ $tables = array_merge( $wpdb->tables, is_multisite() ? $wpdb->global_tables : array( 'users', 'usermeta' ) );
+ $prefix = $wpdb->prefix;
+ if ( is_multisite() && ! defined('MULTISITE') ) // _1 to get MU-era main blog
+ $prefix .= '_1';
+
</ins><span class="cx"> // Loop over the WP tables, checking and repairing as needed.
</span><del>- foreach ($wpdb->tables as $table) {
- if ( in_array($table, $wpdb->old_tables) )
</del><ins>+ foreach ( $tables as $table ) {
+ if ( in_array( $table, $wpdb->old_tables ) )
</ins><span class="cx"> continue;
</span><span class="cx">
</span><del>- $check = $wpdb->get_row("CHECK TABLE {$wpdb->prefix}$table");
</del><ins>+ $check = $wpdb->get_row("CHECK TABLE {$prefix}$table");
</ins><span class="cx"> if ( 'OK' == $check->Msg_text ) {
</span><del>- echo "<p>The {$wpdb->prefix}$table table is okay.";
</del><ins>+ echo "<p>The {$prefix}$table table is okay.";
</ins><span class="cx"> } else {
</span><del>- echo "<p>The {$wpdb->prefix}$table table is not okay. It is reporting the following error: <code>$check->Msg_text</code>. WordPress will attempt to repair this table&hellip;";
- $repair = $wpdb->get_row("REPAIR TABLE {$wpdb->prefix}$table");
</del><ins>+ echo "<p>The {$prefix}$table table is not okay. It is reporting the following error: <code>$check->Msg_text</code>. WordPress will attempt to repair this table&hellip;";
+ $repair = $wpdb->get_row("REPAIR TABLE {$prefix}$table");
</ins><span class="cx"> if ( 'OK' == $check->Msg_text ) {
</span><del>- echo "<br />&nbsp;&nbsp;&nbsp;&nbsp;Successfully repaired the {$wpdb->prefix}$table table.";
</del><ins>+ echo "<br />&nbsp;&nbsp;&nbsp;&nbsp;Successfully repaired the {$prefix}$table table.";
</ins><span class="cx"> } else {
</span><del>- echo "<br />&nbsp;&nbsp;&nbsp;&nbsp;Failed to repair the {$wpdb->prefix}$table table. Error: $check->Msg_text<br />";
- $problems["{$wpdb->prefix}$table"] = $check->Msg_text;
</del><ins>+ echo "<br />&nbsp;&nbsp;&nbsp;&nbsp;Failed to repair the {prefix}$table table. Error: $check->Msg_text<br />";
+ $problems["{$prefix}$table"] = $check->Msg_text;
</ins><span class="cx"> $okay = false;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> if ( $okay && $optimize ) {
</span><del>- $check = $wpdb->get_row("ANALYZE TABLE {$wpdb->prefix}$table");
</del><ins>+ $check = $wpdb->get_row("ANALYZE TABLE {$prefix}$table");
</ins><span class="cx"> if ( 'Table is already up to date' == $check->Msg_text ) {
</span><del>- echo "<br />&nbsp;&nbsp;&nbsp;&nbsp;The {$wpdb->prefix}$table table is already optimized.";
</del><ins>+ echo "<br />&nbsp;&nbsp;&nbsp;&nbsp;The {$prefix}$table table is already optimized.";
</ins><span class="cx"> } else {
</span><del>- $check = $wpdb->get_row("OPTIMIZE TABLE {$wpdb->prefix}$table");
</del><ins>+ $check = $wpdb->get_row("OPTIMIZE TABLE {$prefix}$table");
</ins><span class="cx"> if ( 'OK' == $check->Msg_text || 'Table is already up to date' == $check->Msg_text )
</span><del>- echo "<br />&nbsp;&nbsp;&nbsp;&nbsp;Successfully optimized the {$wpdb->prefix}$table table.";
</del><ins>+ echo "<br />&nbsp;&nbsp;&nbsp;&nbsp;Successfully optimized the {$prefix}$table table.";
</ins><span class="cx"> else
</span><del>- echo "<br />&nbsp;&nbsp;&nbsp;&nbsp;Failed to optimize the {$wpdb->prefix}$table table. Error: $check->Msg_text";
</del><ins>+ echo "<br />&nbsp;&nbsp;&nbsp;&nbsp;Failed to optimize the {$prefix}$table table. Error: $check->Msg_text";
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> echo '</p>';
</span></span></pre>
</div>
</div>
</body>
</html>