From e7b601f7c56a43f75ad7d99bed947cf4f8f9b6a9 Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov.ru@gmail.com>
Date: Fri, 4 Dec 2020 15:50:12 +0000
Subject: [PATCH] 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.
Built from https://develop.svn.wordpress.org/trunk@49750


git-svn-id: http://core.svn.wordpress.org/trunk@49473 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/maint/repair.php | 16 ++++++++--------
 wp-includes/version.php   |  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/wp-admin/maint/repair.php b/wp-admin/maint/repair.php
index 853cc6c8f4..b4219b30ad 100644
--- a/wp-admin/maint/repair.php
+++ b/wp-admin/maint/repair.php
@@ -106,34 +106,34 @@ if ( ! defined( 'WP_ALLOW_REPAIR' ) || ! WP_ALLOW_REPAIR ) {
 			$repair = $wpdb->get_row( "REPAIR TABLE $table" );
 
 			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;
 			}
 		}
 
 		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>" );
 				}
 			}
 		}
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 25cc1d5783..3c4aa95a94 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -13,7 +13,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '5.7-alpha-49746';
+$wp_version = '5.7-alpha-49750';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.