' . sprintf(
/* translators: %s: Database name. */
- __( 'We were able to connect to the database server (which means your username and password is okay) but not able to select the %s database.' ),
+ __( 'The database server could be connected to (which means your username and password is okay) but the %s database could not be selected.' ),
'' . htmlspecialchars( $db, ENT_QUOTES ) . ''
) . "
' . sprintf( /* translators: %s: Support forums URL. */ - __( 'If you don’t know how to set up a database you should contact your host. If all else fails you may find help at the WordPress Support Forums.' ), + __( 'If you do not know how to set up a database you should contact your host. If all else fails you may find help at the WordPress Support Forums.' ), __( 'https://wordpress.org/support/forums/' ) ) . "
\n"; @@ -1140,7 +1232,7 @@ * @param string $string * @return string */ - function _weak_escape( $string ) { + public function _weak_escape( $string ) { if ( func_num_args() === 1 && function_exists( '_deprecated_function' ) ) { _deprecated_function( __METHOD__, '3.6.0', 'wpdb::prepare() or esc_sql()' ); } @@ -1158,8 +1250,8 @@ * @param string $string String to escape. * @return string Escaped string. */ - function _real_escape( $string ) { - if ( ! is_scalar( $string ) && ! is_null( $string ) ) { + public function _real_escape( $string ) { + if ( ! is_scalar( $string ) ) { return ''; } @@ -1171,12 +1263,11 @@ } } else { $class = get_class( $this ); - if ( function_exists( '__' ) ) { - /* translators: %s: Database access abstraction class, usually wpdb or a class extending wpdb. */ - _doing_it_wrong( $class, sprintf( __( '%s must set a database connection for use with escaping.' ), $class ), '3.6.0' ); - } else { - _doing_it_wrong( $class, sprintf( '%s must set a database connection for use with escaping.', $class ), '3.6.0' ); - } + + wp_load_translations_early(); + /* translators: %s: Database access abstraction class, usually wpdb or a class extending wpdb. */ + _doing_it_wrong( $class, sprintf( __( '%s must set a database connection for use with escaping.' ), $class ), '3.6.0' ); + $escaped = addslashes( $string ); } @@ -1260,18 +1351,19 @@ * Prepares a SQL query for safe execution. * * Uses sprintf()-like syntax. The following placeholders can be used in the query string: - * %d (integer) - * %f (float) - * %s (string) + * + * - %d (integer) + * - %f (float) + * - %s (string) * * All placeholders MUST be left unquoted in the query string. A corresponding argument * MUST be passed for each placeholder. * * Note: There is one exception to the above: for compatibility with old behavior, - * numbered or formatted string placeholders (eg, %1$s, %5s) will not have quotes + * numbered or formatted string placeholders (eg, `%1$s`, `%5s`) will not have quotes * added by this function, so should be passed with appropriate quotes around them. * - * Literal percentage signs (%) in the query string must be written as %%. Percentage wildcards + * Literal percentage signs (`%`) in the query string must be written as `%%`. Percentage wildcards * (for example, to use in LIKE syntax) must be passed via a substitution argument containing * the complete LIKE string, these cannot be inserted directly in the query string. * Also see wpdb::esc_like(). @@ -1280,6 +1372,7 @@ * containing all arguments. A combination of the two is not supported. * * Examples: + * * $wpdb->prepare( "SELECT * FROM `table` WHERE `column` = %s AND `field` = %d OR `other_field` LIKE %s", array( 'foo', 1337, '%bar' ) ); * $wpdb->prepare( "SELECT DATE_FORMAT(`field`, '%%c') FROM `table` WHERE `column` = %s", 'foo' ); * @@ -1320,7 +1413,7 @@ // If args were passed as an array (as in vsprintf), move them up. $passed_as_array = false; - if ( is_array( $args[0] ) && count( $args ) === 1 ) { + if ( isset( $args[0] ) && is_array( $args[0] ) && 1 === count( $args ) ) { $passed_as_array = true; $args = $args[0]; } @@ -1420,7 +1513,7 @@ } /** - * First half of escaping for LIKE special characters % and _ before preparing for MySQL. + * First half of escaping for `LIKE` special characters `%` and `_` before preparing for SQL. * * Use this only before wpdb::prepare() or esc_sql(). Reversing the order is very bad for security. * @@ -1609,7 +1702,7 @@ /** * Connects to and selects database. * - * If $allow_bail is false, the lack of database connection will need to be handled manually. + * If `$allow_bail` is false, the lack of database connection will need to be handled manually. * * @since 3.0.0 * @since 3.9.0 $allow_bail parameter added. @@ -1628,6 +1721,13 @@ $client_flags = defined( 'MYSQL_CLIENT_FLAGS' ) ? MYSQL_CLIENT_FLAGS : 0; if ( $this->use_mysqli ) { + /* + * Set the MySQLi error reporting off because WordPress handles its own. + * This is due to the default value change from `MYSQLI_REPORT_OFF` + * to `MYSQLI_REPORT_ERROR|MYSQLI_REPORT_STRICT` in PHP 8.1. + */ + mysqli_report( MYSQLI_REPORT_OFF ); + $this->dbh = mysqli_init(); $host = $this->dbhost; @@ -1702,7 +1802,7 @@ $message .= '' . sprintf(
/* translators: 1: wp-config.php, 2: Database host. */
- __( 'This either means that the username and password information in your %1$s file is incorrect or we can’t contact the database server at %2$s. This could mean your host’s database server is down.' ),
+ __( 'This either means that the username and password information in your %1$s file is incorrect or that contact with the database server at %2$s could not be established. This could mean your host’s database server is down.' ),
'wp-config.php',
'' . htmlspecialchars( $this->dbhost, ENT_QUOTES ) . ''
) . "
' . sprintf( /* translators: %s: Support forums URL. */ - __( 'If you’re unsure what these terms mean you should probably contact your host. If you still need help you can always visit the WordPress Support Forums.' ), + __( 'If you are unsure what these terms mean you should probably contact your host. If you still need help you can always visit the WordPress Support Forums.' ), __( 'https://wordpress.org/support/forums/' ) ) . "
\n"; @@ -1751,9 +1851,16 @@ * @since 4.9.0 * * @param string $host The DB_HOST setting to parse. - * @return array|false Array containing the host, the port, the socket and - * whether it is an IPv6 address, in that order. - * False if $host couldn't be parsed. + * @return array|false { + * Array containing the host, the port, the socket and + * whether it is an IPv6 address, in that order. + * False if the host couldn't be parsed. + * + * @type string $0 Host name. + * @type string|null $1 Port. + * @type string|null $2 Socket. + * @type bool $3 Whether it is an IPv6 address. + * } */ public function parse_db_host( $host ) { $port = null; @@ -1801,7 +1908,7 @@ * If this function is unable to reconnect, it will forcibly die, or if called * after the {@see 'template_redirect'} hook has been fired, return false instead. * - * If $allow_bail is false, the lack of database connection will need to be handled manually. + * If `$allow_bail` is false, the lack of database connection will need to be handled manually. * * @since 3.9.0 * @@ -1861,7 +1968,7 @@ $message .= '' . sprintf(
/* translators: %s: Database host. */
- __( 'This means that we lost contact with the database server at %s. This could mean your host’s database server is down.' ),
+ __( 'This means that the contact with the database server at %s was lost. This could mean your host’s database server is down.' ),
'' . htmlspecialchars( $this->dbhost, ENT_QUOTES ) . ''
) . "
' . sprintf( /* translators: %s: Support forums URL. */ - __( 'If you’re unsure what these terms mean you should probably contact your host. If you still need help you can always visit the WordPress Support Forums.' ), + __( 'If you are unsure what these terms mean you should probably contact your host. If you still need help you can always visit the WordPress Support Forums.' ), __( 'https://wordpress.org/support/forums/' ) ) . "
\n"; @@ -1885,7 +1992,7 @@ } /** - * Performs a MySQL database query, using current database connection. + * Performs a database query, using current database connection. * * More information can be found on the documentation page. * @@ -1932,7 +2039,13 @@ // to flush again, just to make sure everything is clear. $this->flush(); if ( $stripped_query !== $query ) { - $this->insert_id = 0; + $this->insert_id = 0; + $this->last_query = $query; + + wp_load_translations_early(); + + $this->last_error = __( 'WordPress database error: Could not perform query because it contains invalid data.' ); + return false; } } @@ -1944,7 +2057,7 @@ $this->_do_query( $query ); - // MySQL server has gone away, try to reconnect. + // Database server has gone away, try to reconnect. $mysql_errno = 0; if ( ! empty( $this->dbh ) ) { if ( $this->use_mysqli ) { @@ -2169,6 +2282,7 @@ * Inserts a row into the table. * * Examples: + * * wpdb::insert( 'table', array( 'column' => 'foo', 'field' => 'bar' ) ) * wpdb::insert( 'table', array( 'column' => 'foo', 'field' => 1337 ), array( '%s', '%d' ) ) * @@ -2198,6 +2312,7 @@ * Replaces a row in the table. * * Examples: + * * wpdb::replace( 'table', array( 'column' => 'foo', 'field' => 'bar' ) ) * wpdb::replace( 'table', array( 'column' => 'foo', 'field' => 1337 ), array( '%s', '%d' ) ) * @@ -2248,7 +2363,7 @@ * Default 'INSERT'. * @return int|false The number of rows affected, or false on error. */ - function _insert_replace_helper( $table, $data, $format = null, $type = 'INSERT' ) { + public function _insert_replace_helper( $table, $data, $format = null, $type = 'INSERT' ) { $this->insert_id = 0; if ( ! in_array( strtoupper( $type ), array( 'REPLACE', 'INSERT' ), true ) ) { @@ -2285,6 +2400,7 @@ * Updates a row in the table. * * Examples: + * * wpdb::update( 'table', array( 'column' => 'foo', 'field' => 'bar' ), array( 'ID' => 1 ) ) * wpdb::update( 'table', array( 'column' => 'foo', 'field' => 1337 ), array( 'ID' => 1 ), array( '%s', '%d' ), array( '%d' ) ) * @@ -2364,6 +2480,7 @@ * Deletes a row in the table. * * Examples: + * * wpdb::delete( 'table', array( 'ID' => 1 ) ) * wpdb::delete( 'table', array( 'ID' => 1 ), array( '%d' ) ) * @@ -2452,6 +2569,30 @@ $converted_data = $this->strip_invalid_text( $data ); if ( $data !== $converted_data ) { + + $problem_fields = array(); + foreach ( $data as $field => $value ) { + if ( $value !== $converted_data[ $field ] ) { + $problem_fields[] = $field; + } + } + + wp_load_translations_early(); + + if ( 1 === count( $problem_fields ) ) { + $this->last_error = sprintf( + /* translators: %s: Database field where the error occurred. */ + __( 'WordPress database error: Processing the value for the following field failed: %s. The supplied value may be too long or contains invalid data.' ), + reset( $problem_fields ) + ); + } else { + $this->last_error = sprintf( + /* translators: %s: Database fields where the error occurred. */ + __( 'WordPress database error: Processing the values for the following fields failed: %s. The supplied values may be too long or contain invalid data.' ), + implode( ', ', $problem_fields ) + ); + } + return false; } @@ -2573,11 +2714,11 @@ public function get_var( $query = null, $x = 0, $y = 0 ) { $this->func_call = "\$db->get_var(\"$query\", $x, $y)"; - if ( $this->check_current_query && $this->check_safe_collation( $query ) ) { - $this->check_current_query = false; - } - if ( $query ) { + if ( $this->check_current_query && $this->check_safe_collation( $query ) ) { + $this->check_current_query = false; + } + $this->query( $query ); } @@ -2607,11 +2748,11 @@ public function get_row( $query = null, $output = OBJECT, $y = 0 ) { $this->func_call = "\$db->get_row(\"$query\",$output,$y)"; - if ( $this->check_current_query && $this->check_safe_collation( $query ) ) { - $this->check_current_query = false; - } - if ( $query ) { + if ( $this->check_current_query && $this->check_safe_collation( $query ) ) { + $this->check_current_query = false; + } + $this->query( $query ); } else { return null; @@ -2649,11 +2790,11 @@ * @return array Database query result. Array indexed from 0 by SQL result row number. */ public function get_col( $query = null, $x = 0 ) { - if ( $this->check_current_query && $this->check_safe_collation( $query ) ) { - $this->check_current_query = false; - } - if ( $query ) { + if ( $this->check_current_query && $this->check_safe_collation( $query ) ) { + $this->check_current_query = false; + } + $this->query( $query ); } @@ -2687,11 +2828,11 @@ public function get_results( $query = null, $output = OBJECT ) { $this->func_call = "\$db->get_results(\"$query\", $output)"; - if ( $this->check_current_query && $this->check_safe_collation( $query ) ) { - $this->check_current_query = false; - } - if ( $query ) { + if ( $this->check_current_query && $this->check_safe_collation( $query ) ) { + $this->check_current_query = false; + } + $this->query( $query ); } else { return null; @@ -2749,13 +2890,14 @@ /** * Filters the table charset value before the DB is checked. * - * Passing a non-null value to the filter will effectively short-circuit + * Returning a non-null value from the filter will effectively short-circuit * checking the DB for the charset, returning that value instead. * * @since 4.2.0 * - * @param string|null $charset The character set to use. Default null. - * @param string $table The name of the table being checked. + * @param string|WP_Error|null $charset The character set to use, WP_Error object + * if it couldn't be found. Default null. + * @param string $table The name of the table being checked. */ $charset = apply_filters( 'pre_get_table_charset', null, $table ); if ( null !== $charset ) { @@ -2773,7 +2915,7 @@ $table = '`' . implode( '`.`', $table_parts ) . '`'; $results = $this->get_results( "SHOW FULL COLUMNS FROM $table" ); if ( ! $results ) { - return new WP_Error( 'wpdb_get_table_charset_failure' ); + return new WP_Error( 'wpdb_get_table_charset_failure', __( 'Could not retrieve table charset.' ) ); } foreach ( $results as $column ) { @@ -2908,9 +3050,12 @@ * * @param string $table Table name. * @param string $column Column name. - * @return array|false|WP_Error array( 'length' => (int), 'type' => 'byte' | 'char' ). - * False if the column has no length (for example, numeric column). - * WP_Error object if there was an error. + * @return array|false|WP_Error { + * Array of column length information, false if the column has no length (for + * example, numeric column), WP_Error object if there was an error. + * + * @type int $length The column length. + * @type string $type One of 'byte' or 'char'. */ public function get_col_length( $table, $column ) { $tablekey = strtolower( $table ); @@ -3215,7 +3360,7 @@ $this->check_current_query = false; $row = $this->get_row( 'SELECT ' . implode( ', ', $sql ), ARRAY_A ); if ( ! $row ) { - return new WP_Error( 'wpdb_strip_invalid_text_failure' ); + return new WP_Error( 'wpdb_strip_invalid_text_failure', __( 'Could not strip invalid text.' ) ); } foreach ( array_keys( $data ) as $column ) { @@ -3510,7 +3655,6 @@ } } - /** * Closes the current database connection. * @@ -3656,7 +3800,7 @@ } /** - * Retrieves the MySQL server version. + * Retrieves the database server version. * * @since 2.7.0 * @@ -3667,7 +3811,7 @@ } /** - * Retrieves full MySQL server information. + * Retrieves full database server information. * * @since 5.5.0 *