Merge branch 'WordPress:trunk' into fix/59975

WordPress · Nov 29, 2023 · 45c8d32 · 45c8d32
2 parents 8e7861d + fdec267
commit 45c8d32
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 6 deletions.
diff --git a/.github/workflows/performance.yml b/.github/workflows/performance.yml
@@ -73,11 +73,13 @@ jobs:
   # - Check out target commit (target branch or previous commit).
   # - Install npm dependencies.
   # - Build WordPress.
+  # - Run any database upgrades.
   # - Run performance tests (previous/target commit).
   # - Print target performance tests results.
   # - Reset to original commit.
   # - Install npm dependencies.
   # - Set the environment to the baseline version.
+  # - Run any database upgrades.
   # - Run baseline performance tests.
   # - Print baseline performance tests results.
   # - Compare results with base.
@@ -194,6 +196,9 @@ jobs:
       - name: Build WordPress
         run: npm run build
 
+      - name: Run any database upgrades
+        run: npm run env:cli -- core update-db --path=/var/www/${{ env.LOCAL_DIR }}
+
       - name: Run target performance tests (base/previous commit)
         env:
           TEST_RESULTS_PREFIX: before
@@ -215,6 +220,9 @@ jobs:
           npm run env:cli -- core update --version=${{ env.BASE_TAG }} --force --path=/var/www/${{ env.LOCAL_DIR }}
           npm run env:cli -- core version --path=/var/www/${{ env.LOCAL_DIR }}
 
+      - name: Run any database upgrades
+        run: npm run env:cli -- core update-db --path=/var/www/${{ env.LOCAL_DIR }}
+
       - name: Run baseline performance tests
         env:
           TEST_RESULTS_PREFIX: base

diff --git a/src/wp-admin/includes/class-wp-site-health.php b/src/wp-admin/includes/class-wp-site-health.php
@@ -1288,13 +1288,9 @@ public function get_test_sql_server() {
 	 *
 	 * @since 5.2.0
 	 *
-	 * @global wpdb $wpdb WordPress database abstraction object.
-	 *
 	 * @return array The test results.
 	 */
 	public function get_test_utf8mb4_support() {
-		global $wpdb;
-
 		if ( ! $this->mysql_server_version ) {
 			$this->prepare_sql_data();
 		}

diff --git a/src/wp-login.php b/src/wp-login.php
@@ -257,17 +257,18 @@ function login_header( $title = 'Log In', $message = '', $wp_error = null ) {
 
 				$errors .= '</ul>';
 			} else {
-				$errors .= '<p>' . $error_message . '</p>';
+				$errors .= '<p>' . $error_list[0] . '</p>';
 			}
 
 			/**
 			 * Filters the error messages displayed above the login form.
 			 *
 			 * @since 2.1.0
 			 *
-			 * @param string $errors Login error message.
+			 * @param string $errors Login error messages.
 			 */
 			$errors = apply_filters( 'login_errors', $errors );
+
 			wp_admin_notice(
 				$errors,
 				array(
@@ -287,6 +288,7 @@ function login_header( $title = 'Log In', $message = '', $wp_error = null ) {
 			 * @param string $messages Login messages.
 			 */
 			$messages = apply_filters( 'login_messages', $messages );
+
 			wp_admin_notice(
 				$messages,
 				array(