Changeset 42343 for trunk/src/wp-admin/maint/repair.php

Timestamp:

11/30/2017 11:09:33 PM (6 years ago)

Author:

pento

Message:

Code is Poetry.
WordPress' code just... wasn't.
This is now dealt with.

Props jrf, pento, netweb, GaryJ, jdgrimes, westonruter, Greg Sherwood from PHPCS, and everyone who's ever contributed to WPCS and PHPCS.
Fixes #41057.

File:

• trunk/src/wp-admin/maint/repair.php (modified) (9 diffs)

trunk/src/wp-admin/maint/repair.php

@@ -6 +6 @@
  * @subpackage Database
  */
-define('WP_REPAIRING', true);
+define( 'WP_REPAIRING', true );
 
 require_once( dirname( dirname( dirname( __FILE__ ) ) ) . '/wp-load.php' );
@@ -69 +69 @@
         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'] ) ) {
 
@@ -75 +74 @@
 
     $optimize = 2 == $_GET['repair'];
-    $okay = true;
+    $okay     = true;
     $problems = array();
 
@@ -81 +80 @@
 
     // 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'] );
@@ -105 +104 @@
         } 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" );
@@ -116 +115 @@
                 /* 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;
-                $okay = false;
+                $problems[ $table ] = $check->Msg_text;
+                $okay               = false;
             }
         }
@@ -125 +124 @@
 
             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>" );
@@ -145 +144 @@
 
     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 {
@@ -157 +157 @@
     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>