--- a/web/wp-admin/maint/repair.php Thu Sep 16 15:45:36 2010 +0000
+++ b/web/wp-admin/maint/repair.php Mon Nov 19 18:26:13 2012 +0100
@@ -1,90 +1,112 @@
<?php
-
+/**
+ * Database Repair and Optimization Script.
+ *
+ * @package WordPress
+ * @subpackage Database
+ */
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">
+<!DOCTYPE html>
<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 › Database Repair'); ?></title>
+ <title><?php _e( 'WordPress › Database Repair' ); ?></title>
<?php wp_admin_css( 'install', true ); ?>
</head>
<body>
-<h1 id="logo"><img alt="WordPress" src="../images/wordpress-logo.png" /></h1>
+<h1 id="logo"><img alt="WordPress" src="../images/wordpress-logo.png?ver=20120216" /></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']) ) {
+if ( ! defined( 'WP_ALLOW_REPAIR' ) ) {
+ echo '<p>' . __( 'To allow use of this page to automatically repair database problems, please add the following line to your <code>wp-config.php</code> file. Once this line is added to your config, reload this page.' ) . "</p><code>define('WP_ALLOW_REPAIR', true);</code>";
+} elseif ( isset( $_GET['repair'] ) ) {
+ $optimize = 2 == $_GET['repair'];
+ $okay = true;
$problems = array();
- check_admin_referer('repair_db');
+
+ $tables = $wpdb->tables();
- if ( 2 == $_GET['repair'] )
- $optimize = true;
- else
- $optimize = false;
+ // Sitecategories may not exist if global terms are disabled.
+ if ( is_multisite() && ! $wpdb->get_var( "SHOW TABLES LIKE '$wpdb->sitecategories'" ) )
+ unset( $tables['sitecategories'] );
- $okay = true;
+ $tables = array_merge( $tables, (array) apply_filters( 'tables_to_repair', array() ) ); // Return tables with table prefixes.
+
+ // Loop over the tables, checking and repairing as needed.
+ foreach ( $tables as $table ) {
+ $check = $wpdb->get_row( "CHECK TABLE $table" );
- // 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");
+ echo '<p>';
if ( 'OK' == $check->Msg_text ) {
- echo "<p>The {$wpdb->prefix}$table table is okay.";
+ /* translators: %s: table name */
+ printf( __( 'The %s table is okay.' ), "<code>$table</code>" );
} 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…";
- $repair = $wpdb->get_row("REPAIR TABLE {$wpdb->prefix}$table");
+ /* translators: 1: table name, 2: error message, */
+ printf( __( 'The %1$s table is not okay. It is reporting the following error: %2$s. WordPress will attempt to repair this table…' ) , "<code>$table</code>", "<code>$check->Msg_text</code>" );
+
+ $repair = $wpdb->get_row( "REPAIR TABLE $table" );
+
+ echo '<br /> ';
if ( 'OK' == $check->Msg_text ) {
- echo "<br /> Sucessfully repaired the {$wpdb->prefix}$table table.";
+ /* translators: %s: table name */
+ printf( __( 'Successfully repaired the %s table.' ), "<code>$table</code>" );
} else {
- echo "<br /> Failed to repair the {$wpdb->prefix}$table table. Error: $check->Msg_text<br />";
- $problems["{$wpdb->prefix}$table"] = $check->Msg_text;
+ /* translators: 1: table name, 2: error message, */
+ echo sprintf( __( 'Failed to repair the %1$s table. Error: %2$s' ), "<code>$table</code>", "<code>$check->Msg_text</code>" ) . '<br />';
+ $problems[$table] = $check->Msg_text;
$okay = false;
}
}
+
if ( $okay && $optimize ) {
- $check = $wpdb->get_row("ANALYZE TABLE {$wpdb->prefix}$table");
+ $check = $wpdb->get_row( "ANALYZE TABLE $table" );
+
+ echo '<br /> ';
if ( 'Table is already up to date' == $check->Msg_text ) {
- echo "<br /> The {$wpdb->prefix}$table table is already optimized.";
+ /* translators: %s: table name */
+ printf( __( 'The %s table is already optimized.' ), "<code>$table</code>" );
} else {
- $check = $wpdb->get_row("OPTIMIZE TABLE {$wpdb->prefix}$table");
- if ( 'OK' == $check->Msg_text || 'Table is already up to date' == $check->Msg_text )
- echo "<br /> Sucessfully optimized the {$wpdb->prefix}$table table.";
- else
- echo "<br /> Failed to optimize the {$wpdb->prefix}$table table. Error: $check->Msg_text";
+ $check = $wpdb->get_row( "OPTIMIZE TABLE $table" );
+
+ echo '<br /> ';
+ if ( 'OK' == $check->Msg_text || 'Table is already up to date' == $check->Msg_text ) {
+ /* translators: %s: table name */
+ printf( __( 'Successfully optimized the %s table.' ), "<code>$table</code>" );
+ } else {
+ /* translators: 1: table name, 2: error message, */
+ printf( __( 'Failed to optimize the %1$s table. Error: %2$s' ), "<code>$table</code>", "<code>$check->Msg_text</code>" );
+ }
}
}
echo '</p>';
}
- 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();
+ if ( $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/how-to-and-troubleshooting' ) );
+ $problem_output = '';
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>';
+ $problem_output .= "$table: $problem\n";
+ echo '<p><textarea name="errors" id="errors" rows="20" cols="60">' . esc_textarea( $problem_output ) . '</textarea></p>';
} 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>");
+ echo '<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.');
+ if ( isset( $_GET['referrer'] ) && 'is_blog_installed' == $_GET['referrer'] )
+ echo '<p>' . __( 'One or more database tables are unavailable. To allow WordPress to attempt to repair these tables, press the “Repair Database” button. Repairing can take a while, so please be patient.' ) . '</p>';
else
- _e('WordPress can automatically look for some common database problems and repair them. Repairing can take awhile, so please be patient.')
+ echo '<p>' . __( 'WordPress can automatically look for some common database problems and repair them. Repairing can take a while, so please be patient.' ) . '</p>';
?>
- <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 _e('WordPress can also attempt to optimize the database. This improves performance in some situations. Repairing and optimizing the database can take a long time and the database will be locked while optimizing.'); ?>
- <p class="step"><a class="button" href="<?php echo wp_nonce_url('repair.php?repair=2', 'repair_db') ?>"><?php _e( 'Repair and Optimize Database' ); ?></a></p>
+ <p class="step"><a class="button" href="repair.php?repair=1"><?php _e( 'Repair Database' ); ?></a></p>
+ <p><?php _e( 'WordPress can also attempt to optimize the database. This improves performance in some situations. Repairing and optimizing the database can take a long time and the database will be locked while optimizing.' ); ?></p>
+ <p class="step"><a class="button" href="repair.php?repair=2"><?php _e( 'Repair and Optimize Database' ); ?></a></p>
<?php
}
?>
</body>
-</html>
\ No newline at end of file
+</html>