X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/3f5685912e89eb3b0534acd85aa0946b1ca2bbe3..fa11948979fd6a4ea5705dc613b239699a459db3:/wp-admin/maint/repair.php diff --git a/wp-admin/maint/repair.php b/wp-admin/maint/repair.php index 7eb3abbf..98bf5790 100644 --- a/wp-admin/maint/repair.php +++ b/wp-admin/maint/repair.php @@ -1,90 +1,121 @@ - + >
-define('WP_ALLOW_REPAIR', true);
");
-} elseif ( isset($_GET['repair']) ) {
+if ( ! defined( 'WP_ALLOW_REPAIR' ) ) {
+ echo '' . __( '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.' ) . "
define('WP_ALLOW_REPAIR', true);
";
+} elseif ( isset( $_GET['repair'] ) ) {
+ $optimize = 2 == $_GET['repair'];
+ $okay = true;
$problems = array();
- check_admin_referer('repair_db');
- if ( 2 == $_GET['repair'] )
- $optimize = true;
- else
- $optimize = false;
+ $tables = $wpdb->tables();
- $okay = true;
+ // Sitecategories may not exist if global terms are disabled.
+ if ( is_multisite() && ! $wpdb->get_var( "SHOW TABLES LIKE '$wpdb->sitecategories'" ) )
+ unset( $tables['sitecategories'] );
+
+ /**
+ * Filter additional database tables to repair.
+ *
+ * @since 3.0.0
+ *
+ * @param array $tables Array of prefixed table names to be repaired.
+ */
+ $tables = array_merge( $tables, (array) apply_filters( 'tables_to_repair', array() ) );
- // Loop over the WP tables, checking and repairing as needed.
- foreach ($wpdb->tables as $table) {
- if ( in_array($table, $wpdb->old_tables) )
- continue;
+ // Loop over the tables, checking and repairing as needed.
+ foreach ( $tables as $table ) {
+ $check = $wpdb->get_row( "CHECK TABLE $table" );
- $check = $wpdb->get_row("CHECK TABLE {$wpdb->prefix}$table");
+ echo ''; if ( 'OK' == $check->Msg_text ) { - echo "
The {$wpdb->prefix}$table table is okay.";
+ /* translators: %s: table name */
+ printf( __( 'The %s table is okay.' ), "$table
" );
} else {
- echo "
The {$wpdb->prefix}$table table is not okay. It is reporting the following error: $check->Msg_text
. WordPress will attempt to repair this table…";
- $repair = $wpdb->get_row("REPAIR TABLE {$wpb->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…' ) , "$table
", "$check->Msg_text
" );
+
+ $repair = $wpdb->get_row( "REPAIR TABLE $table" );
+
+ echo '
';
if ( 'OK' == $check->Msg_text ) {
- echo "
Sucessfully repaired the {$wpb->prefix}$table table.";
+ /* translators: %s: table name */
+ printf( __( 'Successfully repaired the %s table.' ), "$table
" );
} else {
- echo "
Failed to repair the {$wpdb->prefix}$table table. Error: $check->Msg_text
";
- $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' ), "$table
", "$check->Msg_text
" ) . '
';
+ $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 '
';
if ( 'Table is already up to date' == $check->Msg_text ) {
- echo "
The {$wpb->prefix}$table table is already optimized.";
+ /* translators: %s: table name */
+ printf( __( 'The %s table is already optimized.' ), "$table
" );
} 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 "
Sucessfully optimized the {$wpb->prefix}$table table.";
- else
- echo "
Failed to optimize the {$wpdb->prefix}$table table. Error: $check->Msg_text";
+ $check = $wpdb->get_row( "OPTIMIZE TABLE $table" );
+
+ echo '
';
+ if ( 'OK' == $check->Msg_text || 'Table is already up to date' == $check->Msg_text ) {
+ /* translators: %s: table name */
+ printf( __( 'Successfully optimized the %s table.' ), "$table
" );
+ } else {
+ /* translators: 1: table name, 2: error message, */
+ printf( __( 'Failed to optimize the %1$s table. Error: %2$s' ), "$table
", "$check->Msg_text
" );
+ }
}
}
echo '
Some database problems could not be repaired. Please copy-and-paste the following list of errors to the WordPress support forums to get additional assistance.
'), 'http://wordpress.org/support/forum/3'); - $problem_output = array(); + if ( $problems ) { + printf( '' . __('Some database problems could not be repaired. Please copy-and-paste the following list of errors to the WordPress support forums to get additional assistance.') . '
', __( 'http://wordpress.org/support/forum/how-to-and-troubleshooting' ) ); + $problem_output = ''; foreach ( $problems as $table => $problem ) - $problem_output[] = "$table: $problem"; - echo ''; + $problem_output .= "$table: $problem\n"; + echo ''; } else { - _e("Repairs complete. Please remove the following line from wp-config.php to prevent this page from being used by unauthorized users.
define('WP_ALLOW_REPAIR', true);
");
+ echo '' . __( 'Repairs complete. Please remove the following line from wp-config.php to prevent this page from being used by unauthorized users.' ) . "
define('WP_ALLOW_REPAIR', true);
";
}
} 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 '' . __( '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.' ) . '
'; else - _e('WordPress can automatically look for some common database problems and repair them. Repairing can take awhile, so please be patient.') + echo '' . __( 'WordPress can automatically look for some common database problems and repair them. Repairing can take a while, so please be patient.' ) . '
'; ?> - - - + + + - \ No newline at end of file +