<!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, #msg p { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul { 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>[11902] trunk: is_blog_installed() improvements and repair.php.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/11902">11902</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2009-09-06 18:46:27 +0000 (Sun, 06 Sep 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>is_blog_installed() improvements and repair.php. see <a href="http://trac.wordpress.org/ticket/10728">#10728</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesfunctionsphp">trunk/wp-includes/functions.php</a></li>
<li><a href="#trunkwpincludeswpdbphp">trunk/wp-includes/wp-db.php</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li>trunk/wp-admin/maint/</li>
<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="addfile"><h4>Added: trunk/wp-admin/maint/repair.php (0 => 11902)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/maint/repair.php (rev 0)
+++ trunk/wp-admin/maint/repair.php 2009-09-06 18:46:27 UTC (rev 11902)
</span><span class="lines">@@ -0,0 +1,68 @@
</span><ins>+<?php
+
+define('WP_REPAIRING', true);
+
+require_once('../../wp-load.php');
+
+header( 'Content-Type: text/html; charset=utf-8' );
+?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" <?php language_attributes(); ?>>
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+ <title><?php _e('WordPress &rsaquo; Database Repair'); ?></title>
+ <?php wp_admin_css( 'install', true ); ?>
+</head>
+<body>
+<h1 id="logo"><img alt="WordPress" src="../images/wordpress-logo.png" /></h1>
+
+<?php
+
+if ( !defined('WP_ALLOW_REPAIR') ) {
+ _e("<p>To allow use of this page to automatically repair database problems, please add the following line to your wp-config.php file. Once this line is added to your config, reload this page.</p><code>define('WP_ALLOW_REPAIR', true);</code>");
+} elseif ( isset($_GET['repair']) ) {
+ $problems = array();
+ check_admin_referer('repair_db');
+
+ // Loop over the WP tables, checking and repairing as needed.
+ foreach ($wpdb->tables as $table) {
+ if ( in_array($table, $wpdb->old_tables) )
+ continue;
+
+ $check = $wpdb->get_row("CHECK TABLE {$wpdb->prefix}$table");
+ if ( 'OK' == $check->Msg_text ) {
+ echo "<p>The {$wpdb->prefix}$table table is okay.</p>";
+ } else {
+ 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;<br/>";
+ $repair = $wpdb->get_row("REPAIR TABLE {$wpb->prefix}$table");
+ if ( 'OK' == $check->Msg_text ) {
+ echo "&nbsp;&nbsp;&nbsp;&nbsp;Sucessfully repaired the {$wpb->prefix}$table table.<br />";
+ } else {
+ echo "&nbsp;&nbsp;&nbsp;&nbsp;Failed to repair the {$wpdb->prefix}$table table. Error: $check->Msg_text<br />";
+ $problems["{$wpdb->prefix}$table"] = $check->Msg_text;
+ }
+ }
+ }
+
+ if ( !empty($problems) ) {
+ printf(__('<p>Some database problems could not be repaired. Please copy-and-paste the following list of errors to the <a href="%s">WordPress support forums</a> to get additional assistance.</p>'), 'http://wordpress.org/support/forum/3');
+ $problem_output = array();
+ foreach ( $problems as $table => $problem )
+ $problem_output[] = "$table: $problem";
+ echo '<textarea name="errors" id="errors" rows="20" cols="60">' . format_to_edit(implode("\n", $problem_output)) . '</textarea>';
+ } else {
+ _e("<p>Repairs complete. Please remove the following line from wp-config.php to prevent this page from being used by unauthorized users.</p><code>define('WP_ALLOW_REPAIR', true);</code>");
+ }
+} else {
+ if ( isset($_GET['referrer']) && 'is_blog_installed' == $_GET['referrer'] )
+ _e('One or more database tables is unavailable. To allow WordPress to attempt to repair these tables, press the "Repair Database" button. Repairing can take awhile, so please be patient.');
+ else
+ _e('WordPress can automatically look for some common database problems and repair them. Repairing can take awhile, so please be patient.')
+?>
+ <p class="step"><a class="button" href="<?php echo wp_nonce_url('repair.php?repair=1', 'repair_db') ?>"><?php _e( 'Repair Database' ); ?></a></p>
+<?php
+}
+
+?>
+</body>
+</html>
</ins><span class="cx">\ No newline at end of file
</span><span class="cx">Property changes on: trunk/wp-admin/maint/repair.php
</span><span class="cx">___________________________________________________________________
</span><span class="cx">Name: svn:eol-style
</span><span class="cx"> + native
</span></span></pre></div>
<a id="trunkwpincludesfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/functions.php (11901 => 11902)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/functions.php 2009-09-04 08:50:55 UTC (rev 11901)
+++ trunk/wp-includes/functions.php 2009-09-06 18:46:27 UTC (rev 11902)
</span><span class="lines">@@ -1771,7 +1771,31 @@
</span><span class="cx"> $installed = !empty( $installed );
</span><span class="cx"> wp_cache_set( 'is_blog_installed', $installed );
</span><span class="cx">
</span><del>- return $installed;
</del><ins>+ if ( $installed )
+ return true;
+
+ $suppress = $wpdb->suppress_errors();
+ $tables = $wpdb->get_col('SHOW TABLES');
+ $wpdb->suppress_errors( $suppress );
+
+ // Loop over the WP tables. If none exist, then scratch install is allowed.
+ // If one or more exist, suggest table repair since we got here because the options
+ // table could not be accessed.
+ foreach ($wpdb->tables as $table) {
+ // If one of the WP tables exist, then we are in an insane state.
+ if ( in_array($wpdb->prefix . $table, $tables) ) {
+ // If visiting repair.php, return true and let it take over.
+ if ( defined('WP_REPAIRING') )
+ return true;
+ // Die with a DB error.
+ $wpdb->error = __('One or more database tables are unavailable. The database may need to be <a href="maint/repair.php?referrer=is_blog_installed">repaired</a>.');
+ dead_db();
+ }
+ }
+
+ wp_cache_set( 'is_blog_installed', false );
+
+ return false;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span></span></pre></div>
<a id="trunkwpincludeswpdbphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/wp-db.php (11901 => 11902)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/wp-db.php 2009-09-04 08:50:55 UTC (rev 11901)
+++ trunk/wp-includes/wp-db.php 2009-09-06 18:46:27 UTC (rev 11902)
</span><span class="lines">@@ -255,6 +255,16 @@
</span><span class="cx"> 'postmeta', 'terms', 'term_taxonomy', 'term_relationships');
</span><span class="cx">
</span><span class="cx"> /**
</span><ins>+ * List of deprecated WordPress tables
+ *
+ * @since 2.9.0
+ * @access private
+ * @var array
+ */
+ var $old_tables = array('categories', 'post2cat', 'link2cat');
+
+
+ /**
</ins><span class="cx"> * Format specifiers for DB columns. Columns not listed here default to %s. Initialized in wp-settings.php.
</span><span class="cx"> *
</span><span class="cx"> * Keys are colmn names, values are format types: 'ID' => '%d'
</span></span></pre>
</div>
</div>
</body>
</html>