diff -r 346c88efed21 -r 5e2f62d02dcd wp/wp-admin/maint/repair.php --- a/wp/wp-admin/maint/repair.php Mon Jun 08 16:11:51 2015 +0000 +++ b/wp/wp-admin/maint/repair.php Tue Jun 09 03:35:32 2015 +0200 @@ -14,6 +14,7 @@ > + <?php _e( 'WordPress › Database Repair' ); ?> -

+

' . __( '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'] ) ) { $optimize = 2 == $_GET['repair']; $okay = true; @@ -35,8 +36,10 @@ $tables = $wpdb->tables(); // Sitecategories may not exist if global terms are disabled. - if ( is_multisite() && ! $wpdb->get_var( "SHOW TABLES 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'] ); + } /** * Filter additional database tables to repair. @@ -97,13 +100,13 @@ } 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' ) ); + 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 ) $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);"; + 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'] )