diff -r c7c34916027a -r 177826044cd9 wp/wp-admin/maint/repair.php --- a/wp/wp-admin/maint/repair.php Mon Oct 14 18:06:33 2019 +0200 +++ b/wp/wp-admin/maint/repair.php Mon Oct 14 18:28:13 2019 +0200 @@ -5,7 +5,7 @@ * @package WordPress * @subpackage Database */ -define('WP_REPAIRING', true); +define( 'WP_REPAIRING', true ); require_once( dirname( dirname( dirname( __FILE__ ) ) ) . '/wp-load.php' ); @@ -18,16 +18,14 @@ <?php _e( 'WordPress › Database Repair' ); ?> - + - + ' . __( 'Allow automatic database repair' ) . ''; @@ -65,22 +63,21 @@ echo '

' . __( 'Check secret keys' ) . '

'; - // Translators: 1: wp-config.php; 2: Secret key service URL. + /* translators: 1: wp-config.php, 2: secret key service URL */ echo '

' . sprintf( __( 'While you are editing your %1$s file, take a moment to make sure you have all 8 keys and that they are unique. You can generate these using the WordPress.org secret key service.' ), 'wp-config.php', 'https://api.wordpress.org/secret-key/1.1/salt/' ) . '

'; } - } elseif ( isset( $_GET['repair'] ) ) { echo '

' . __( 'Database repair results' ) . '

'; $optimize = 2 == $_GET['repair']; - $okay = true; + $okay = true; $problems = array(); $tables = $wpdb->tables(); // Sitecategories may not exist if global terms are disabled. - $query = $wpdb->prepare( "SHOW TABLES LIKE %s", $wpdb->esc_like( $wpdb->sitecategories ) ); + $query = $wpdb->prepare( 'SHOW TABLES LIKE %s', $wpdb->esc_like( $wpdb->sitecategories ) ); if ( is_multisite() && ! $wpdb->get_var( $query ) ) { unset( $tables['sitecategories'] ); } @@ -90,7 +87,7 @@ * * @since 3.0.0 * - * @param array $tables Array of prefixed table names to be repaired. + * @param string[] $tables Array of prefixed table names to be repaired. */ $tables = array_merge( $tables, (array) apply_filters( 'tables_to_repair', array() ) ); @@ -104,7 +101,7 @@ printf( __( 'The %s table is okay.' ), "$table" ); } else { /* 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" ); + 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" ); @@ -115,8 +112,8 @@ } else { /* 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; + $problems[ $table ] = $check->Msg_text; + $okay = false; } } @@ -124,7 +121,7 @@ $check = $wpdb->get_row( "ANALYZE TABLE $table" ); echo '
    '; - if ( 'Table is already up to date' == $check->Msg_text ) { + if ( 'Table is already up to date' == $check->Msg_text ) { /* translators: %s: table name */ printf( __( 'The %s table is already optimized.' ), "$table" ); } else { @@ -144,10 +141,11 @@ } 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.') . '

', __( 'https://wordpress.org/support/forum/how-to-and-troubleshooting' ) ); + 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.' ) . '

', __( 'https://wordpress.org/support/forum/how-to-and-troubleshooting' ) ); $problem_output = ''; - foreach ( $problems as $table => $problem ) + foreach ( $problems as $table => $problem ) { $problem_output .= "$table: $problem\n"; + } echo '

'; } else { 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);

"; @@ -156,15 +154,16 @@ echo '

' . __( 'WordPress database repair' ) . '

'; - if ( isset( $_GET['referrer'] ) && 'is_blog_installed' == $_GET['referrer'] ) + 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 + } else { echo '

' . __( 'WordPress can automatically look for some common database problems and repair them. Repairing can take a while, so please be patient.' ) . '

'; -?> + } + ?>

-