enmi-conf.org: comparison wp/wp-admin/maint/repair.php

equal deleted inserted replaced

-:c7c34916027a
+:177826044cd9
 * Database Repair and Optimization Script.
 *
 * @package WordPress
 * @subpackage Database
 */
-define('WP_REPAIRING', true);
+define( 'WP_REPAIRING', true );
 require_once( dirname( dirname( dirname( __FILE__ ) ) ) . '/wp-load.php' );
 header( 'Content-Type: text/html; charset=utf-8' );
 ?>
 <head>
 	<meta name="viewport" content="width=device-width" />
 	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 	<meta name="robots" content="noindex,nofollow" />
 	<title><?php _e( 'WordPress &rsaquo; Database Repair' ); ?></title>
-	<?php
+	<?php wp_admin_css( 'install', true ); ?>
-	wp_admin_css( 'install', true );
-	?>
 </head>
 <body class="wp-core-ui">
-<p id="logo"><a href="<?php echo esc_url( __( 'https://wordpress.org/' ) ); ?>" tabindex="-1"><?php _e( 'WordPress' ); ?></a></p>
+<p id="logo"><a href="<?php echo esc_url( __( 'https://wordpress.org/' ) ); ?>"><?php _e( 'WordPress' ); ?></a></p>
 <?php
-if ( ! defined( 'WP_ALLOW_REPAIR' ) ) {
+if ( ! defined( 'WP_ALLOW_REPAIR' ) || ! WP_ALLOW_REPAIR ) {
 	echo '<h1 class="screen-reader-text">' . __( 'Allow automatic database repair' ) . '</h1>';
 	echo '<p>';
 	printf(
 	if ( $duplicated_keys || $missing_key ) {
 		echo '<h2 class="screen-reader-text">' . __( 'Check secret keys' ) . '</h2>';
-		// Translators: 1: wp-config.php; 2: Secret key service URL.
+		/* translators: 1: wp-config.php, 2: secret key service URL */
 		echo '<p>' . 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 <a href="%2$s">WordPress.org secret key service</a>.' ), '<code>wp-config.php</code>', 'https://api.wordpress.org/secret-key/1.1/salt/' ) . '</p>';
 	}
 } elseif ( isset( $_GET['repair'] ) ) {
 	echo '<h1 class="screen-reader-text">' . __( 'Database repair results' ) . '</h1>';
 	$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'] );
 	}
 	/**
 	 * Filters additional database tables to repair.
 	 *
 	 * @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() ) );
 	// Loop over the tables, checking and repairing as needed.
 	foreach ( $tables as $table ) {
 		if ( 'OK' == $check->Msg_text ) {
 			/* translators: %s: table name */
 			printf( __( 'The %s table is okay.' ), "<code>$table</code>" );
 		} 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&hellip;' ) , "<code>$table</code>", "<code>$check->Msg_text</code>" );
+			printf( __( 'The %1$s table is not okay. It is reporting the following error: %2$s. WordPress will attempt to repair this table&hellip;' ), "<code>$table</code>", "<code>$check->Msg_text</code>" );
 			$repair = $wpdb->get_row( "REPAIR TABLE $table" );
 			echo '<br />&nbsp;&nbsp;&nbsp;&nbsp;';
 			if ( 'OK' == $check->Msg_text ) {
 				/* translators: %s: table name */
 				printf( __( 'Successfully repaired the %s table.' ), "<code>$table</code>" );
 			} else {
 				/* 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;
+				$problems[ $table ] = $check->Msg_text;
-				$okay = false;
+				$okay               = false;
 			}
 		}
 		if ( $okay && $optimize ) {
 			$check = $wpdb->get_row( "ANALYZE TABLE $table" );
 			echo '<br />&nbsp;&nbsp;&nbsp;&nbsp;';
-			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.' ), "<code>$table</code>" );
 			} else {
 				$check = $wpdb->get_row( "OPTIMIZE TABLE $table" );
 		}
 		echo '</p>';
 	}
 	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>', __( 'https://wordpress.org/support/forum/how-to-and-troubleshooting' ) );
+		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>', __( '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 '<p><textarea name="errors" id="errors" rows="20" cols="60">' . esc_textarea( $problem_output ) . '</textarea></p>';
 	} else {
 		echo '<p>' . __( 'Repairs complete. Please remove the following line from wp-config.php to prevent this page from being used by unauthorized users.' ) . "</p><p><code>define('WP_ALLOW_REPAIR', true);</code></p>";
 	}
 } else {
 	echo '<h1 class="screen-reader-text">' . __( 'WordPress database repair' ) . '</h1>';
-	if ( isset( $_GET['referrer'] ) && 'is_blog_installed' == $_GET['referrer'] )
+	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 &#8220;Repair Database&#8221; button. Repairing can take a while, so please be patient.' ) . '</p>';
-	else
+	} else {
 		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 button-large" 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 button-large" href="repair.php?repair=2"><?php _e( 'Repair and Optimize Database' ); ?></a></p>
-<?php
+	<?php
 }
 ?>
 </body>
 </html>

changeset 9	177826044cd9
parent 7	cf61fcea0001
child 16	a86126ab1dd4