From 44cd1981b967966e22f4e40fa1ab04ee3ce2f728 Mon Sep 17 00:00:00 2001 From: Sergey Biryukov Date: Fri, 13 May 2022 12:19:35 +0000 Subject: [PATCH] Database: Use generic references to a database server in `ms_not_installed()`. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This replaces the references to “MySQL” with “your host’s database server” on the “Error establishing a database connection” page when Multisite could not be loaded. The generic “database server” term can refer to MySQL or MariaDB. Additionally, this brings some consistency with a similar error message in `wpdb::db_connect()`. Follow-up to [52367], [52423]. Props tj692, hansjovisyoast, tobifjellner. Fixes #55701. git-svn-id: https://develop.svn.wordpress.org/trunk@53394 602fd350-edb4-49c9-b593-d223f7449a82 --- src/wp-includes/ms-load.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/wp-includes/ms-load.php b/src/wp-includes/ms-load.php index 773139aefa..35942df0f8 100644 --- a/src/wp-includes/ms-load.php +++ b/src/wp-includes/ms-load.php @@ -472,12 +472,12 @@ function ms_not_installed( $domain, $path ) { $msg = '

' . $title . '

'; $msg .= '

' . __( 'If your site does not display, please contact the owner of this network.' ) . ''; - $msg .= ' ' . __( 'If you are the owner of this network please check that MySQL is running properly and all tables are error free.' ) . '

'; + $msg .= ' ' . __( 'If you are the owner of this network please check that your host’s database server is running properly and all tables are error free.' ) . '

'; $query = $wpdb->prepare( 'SHOW TABLES LIKE %s', $wpdb->esc_like( $wpdb->site ) ); if ( ! $wpdb->get_var( $query ) ) { $msg .= '

' . sprintf( /* translators: %s: Table name. */ - __( 'Database tables are missing. This means that MySQL is not running, WordPress was not installed properly, or someone deleted %s. You really should look at your database now.' ), + __( 'Database tables are missing. This means that your host’s database server is not running, WordPress was not installed properly, or someone deleted %s. You really should look at your database now.' ), '' . $wpdb->site . '' ) . '

'; } else {