Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-11-12 13:44:21 +01:00
Code Issues Projects Releases Wiki Activity

is_blog_installed() improvements and repair.php. see #10728

Browse Source 
git-svn-id: http://svn.automattic.com/wordpress/trunk@11902 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
ryan 2009-09-06 18:46:27 +00:00
parent 11c3cb07b9
commit 02c7c0e38e
3 changed files with 103 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
wp-admin/maint/repair.php Normal file
View File

@ -0,0 +1,68 @@
<?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>

26
wp-includes/functions.php
View File

@ -1771,7 +1771,31 @@ function is_blog_installed() {
$installed = !empty( $installed ); $installed = !empty( $installed );
wp_cache_set( 'is_blog_installed', $installed ); wp_cache_set( 'is_blog_installed', $installed );
return $installed; 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;
} }
/** /**

10
wp-includes/wp-db.php
View File

@ -254,6 +254,16 @@ class wpdb {
var $tables = array('users', 'usermeta', 'posts', 'categories', 'post2cat', 'comments', 'links', 'link2cat', 'options', var $tables = array('users', 'usermeta', 'posts', 'categories', 'post2cat', 'comments', 'links', 'link2cat', 'options',
'postmeta', 'terms', 'term_taxonomy', 'term_relationships'); 'postmeta', 'terms', 'term_taxonomy', 'term_relationships');
/**
* List of deprecated WordPress tables
*
* @since 2.9.0
* @access private
* @var array
*/
var $old_tables = array('categories', 'post2cat', 'link2cat');
/** /**
* Format specifiers for DB columns. Columns not listed here default to %s. Initialized in wp-settings.php. * Format specifiers for DB columns. Columns not listed here default to %s. Initialized in wp-settings.php.
* *