Changeset 49750

Timestamp:

12/04/2020 03:48:15 PM (6 years ago)

Author:

SergeyBiryukov

Message:

Database: Check the correct value for displaying the "Successfully repaired table" or "Failed to repair" messages on Database Repair screen.

Additionally, rename the variables holding the results of ANALYZE TABLE and OPTIMIZE TABLE requests, for clarity.

Props mehrshaddarzi.
Fixes #51932.

File:

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

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

@@ -107 +107 @@
 
                         echo '<br />&nbsp;&nbsp;&nbsp;&nbsp;';
-                        if ( 'OK' === $check->Msg_text ) {
+                        if ( 'OK' === $repair->Msg_text ) {
                                 /* translators: %s: Table name. */
                                 printf( __( 'Successfully repaired the %s table.' ), "<code>$table</code>" );
                         } else {
                                 /* translators: 1: Table name, 2: Error message. */
-                                printf( __( 'Failed to repair the %1$s table. Error: %2$s' ), "<code>$table</code>", "<code>$check->Msg_text</code>" ) . '<br />';
-                                $problems[ $table ] = $check->Msg_text;
+                                printf( __( 'Failed to repair the %1$s table. Error: %2$s' ), "<code>$table</code>", "<code>$repair->Msg_text</code>" ) . '<br />';
+                                $problems[ $table ] = $repair->Msg_text;
                                 $okay               = false;
                         }
@@ -119 +119 @@
 
                 if ( $okay && $optimize ) {
-                        $check = $wpdb->get_row( "ANALYZE TABLE $table" );
+                        $analyze = $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' === $analyze->Msg_text ) {
                                 /* translators: %s: Table name. */
                                 printf( __( 'The %s table is already optimized.' ), "<code>$table</code>" );
                         } else {
-                                $check = $wpdb->get_row( "OPTIMIZE TABLE $table" );
+                                $optimize = $wpdb->get_row( "OPTIMIZE TABLE $table" );
 
                                 echo '<br />&nbsp;&nbsp;&nbsp;&nbsp;';
-                                if ( 'OK' === $check->Msg_text || 'Table is already up to date' === $check->Msg_text ) {
+                                if ( 'OK' === $optimize->Msg_text || 'Table is already up to date' === $optimize->Msg_text ) {
                                         /* translators: %s: Table name. */
                                         printf( __( 'Successfully optimized the %s table.' ), "<code>$table</code>" );
                                 } else {
                                         /* translators: 1: Table name. 2: Error message. */
-                                        printf( __( 'Failed to optimize the %1$s table. Error: %2$s' ), "<code>$table</code>", "<code>$check->Msg_text</code>" );
+                                        printf( __( 'Failed to optimize the %1$s table. Error: %2$s' ), "<code>$table</code>", "<code>$optimize->Msg_text</code>" );
                                 }
                         }