X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/3f5685912e89eb3b0534acd85aa0946b1ca2bbe3..fef8173b8c3bad08f495551e43cfdeac1cae6021:/wp-admin/maint/repair.php diff --git a/wp-admin/maint/repair.php b/wp-admin/maint/repair.php index 7eb3abbf..c3430a7f 100644 --- a/wp-admin/maint/repair.php +++ b/wp-admin/maint/repair.php @@ -19,7 +19,7 @@ header( 'Content-Type: text/html; charset=utf-8' ); 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);"); + 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']) ) { $problems = array(); check_admin_referer('repair_db'); @@ -31,54 +31,56 @@ if ( !defined('WP_ALLOW_REPAIR') ) { $okay = true; - // 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"); + $tables = $wpdb->tables(); + // Sitecategories may not exist if global terms are disabled. + if ( is_multisite() && ! $wpdb->get_var( "SHOW TABLES LIKE '$wpdb->sitecategories'" ) ) + unset( $tables['sitecategories'] ); + $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"); if ( 'OK' == $check->Msg_text ) { - echo "

The {$wpdb->prefix}$table table is okay."; + echo "

The $table table is okay."; } 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"); + echo "

The $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 $table"); if ( 'OK' == $check->Msg_text ) { - echo "
    Sucessfully repaired the {$wpb->prefix}$table table."; + echo "
    Successfully repaired the $table table."; } else { - echo "
    Failed to repair the {$wpdb->prefix}$table table. Error: $check->Msg_text
"; - $problems["{$wpdb->prefix}$table"] = $check->Msg_text; + echo "
    Failed to repair the $table table. Error: $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"); if ( 'Table is already up to date' == $check->Msg_text ) { - echo "
    The {$wpb->prefix}$table table is already optimized."; + echo "
    The $table table is already optimized."; } else { - $check = $wpdb->get_row("OPTIMIZE TABLE {$wpdb->prefix}$table"); + $check = $wpdb->get_row("OPTIMIZE TABLE $table"); if ( 'OK' == $check->Msg_text || 'Table is already up to date' == $check->Msg_text ) - echo "
    Sucessfully optimized the {$wpb->prefix}$table table."; + echo "
    Successfully optimized the $table table."; else - echo "
    Failed to optimize the {$wpdb->prefix}$table table. Error: $check->Msg_text"; + echo "
    Failed to optimize the $table table. Error: $check->Msg_text"; } } echo '

'; } if ( !empty($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/3'); + 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/3'); $problem_output = array(); foreach ( $problems as $table => $problem ) $problem_output[] = "$table: $problem"; - echo ''; + 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.'); + _e('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.') + _e('WordPress can automatically look for some common database problems and repair them. Repairing can take a while, so please be patient.') ?>