enmi-conf.org: comparison wp/wp-includes/wp-db.php

equal deleted inserted replaced

-:be944660c56a
+:3d72ae0968f4
 	 * Whether to show SQL/DB errors.
 	 *
 	 * Default is to show errors if both WP_DEBUG and WP_DEBUG_DISPLAY evaluate to true.
 	 *
 	 * @since 0.71
+	 *
 	 * @var bool
 	 */
 	public $show_errors = false;
 	/**
 	 * Whether to suppress errors during the DB bootstrapping. Default false.
 	 *
 	 * @since 2.5.0
+	 *
 	 * @var bool
 	 */
 	public $suppress_errors = false;
 	/**
 	 * The error encountered during the last query.
 	 *
 	 * @since 2.5.0
+	 *
 	 * @var string
 	 */
 	public $last_error = '';
 	/**
 	 * The number of queries made.
 	 *
 	 * @since 1.2.0
+	 *
 	 * @var int
 	 */
 	public $num_queries = 0;
 	/**
 	 * Count of rows returned by the last query.
 	 *
 	 * @since 0.71
+	 *
 	 * @var int
 	 */
 	public $num_rows = 0;
 	/**
 	 * Count of rows affected by the last query.
 	 *
 	 * @since 0.71
+	 *
 	 * @var int
 	 */
 	public $rows_affected = 0;
 	/**
 	 * The ID generated for an AUTO_INCREMENT column by the last query (usually INSERT).
 	 *
 	 * @since 0.71
+	 *
 	 * @var int
 	 */
 	public $insert_id = 0;
 	/**
 	 * The last query made.
 	 *
 	 * @since 0.71
+	 *
 	 * @var string
 	 */
 	public $last_query;
 	/**
 	 * Results of the last query.
 	 *
 	 * @since 0.71
-	 * @var array|null
+	 *
+	 * @var stdClass[]|null
 	 */
 	public $last_result;
 	/**
-	 * MySQL result, which is either a resource or boolean.
+	 * Database query result.
+	 *
+	 * Possible values:
+	 *
+	 * - For successful SELECT, SHOW, DESCRIBE, or EXPLAIN queries:
+	 *   - `mysqli_result` instance when the `mysqli` driver is in use
+	 *   - `resource` when the older `mysql` driver is in use
+	 * - `true` for other query types that were successful
+	 * - `null` if a query is yet to be made or if the result has since been flushed
+	 * - `false` if the query returned an error
 	 *
 	 * @since 0.71
-	 * @var mixed
+	 *
+	 * @var mysqli_result|resource|bool|null
 	 */
 	protected $result;
 	/**
 	 * Cached column info, for sanity checking data before inserting.
 	 *
 	 * @since 4.2.0
+	 *
 	 * @var array
 	 */
 	protected $col_meta = array();
 	/**
-	 * Calculated character sets on tables.
+	 * Calculated character sets keyed by table name.
 	 *
 	 * @since 4.2.0
-	 * @var array
+	 *
+	 * @var string[]
 	 */
 	protected $table_charset = array();
 	/**
-	 * Whether text fields in the current query need to be sanity checked. Default false.
+	 * Whether text fields in the current query need to be sanity checked.
 	 *
 	 * @since 4.2.0
+	 *
 	 * @var bool
 	 */
 	protected $check_current_query = true;
 	/**
 	 * Flag to ensure we don't run into recursion problems when checking the collation.
 	 *
 	 * @since 4.2.0
+	 *
 	 * @see wpdb::check_safe_collation()
 	 * @var bool
 	 */
 	private $checking_collation = false;
 	/**
 	 * Saved info on the table column.
 	 *
 	 * @since 0.71
+	 *
 	 * @var array
 	 */
 	protected $col_info;
 	/**
 	 * @since 2.5.0 The third element in each query log was added to record the calling functions.
 	 * @since 5.1.0 The fourth element in each query log was added to record the start time.
 	 * @since 5.3.0 The fifth element in each query log was added to record custom data.
 	 *
 	 * @var array[] {
-	 *     Array of queries that were executed.
+	 *     Array of arrays containing information about queries that were executed.
 	 *
 	 *     @type array ...$0 {
 	 *         Data for each query.
 	 *
 	 *         @type string $0 The query's SQL.
 	/**
 	 * The number of times to retry reconnecting before dying. Default 5.
 	 *
 	 * @since 3.9.0
+	 *
 	 * @see wpdb::check_connection()
 	 * @var int
 	 */
 	protected $reconnect_retries = 5;
 	/**
-	 * WordPress table prefix
+	 * WordPress table prefix.
 	 *
 	 * You can set this to have multiple WordPress installations in a single database.
 	 * The second reason is for possible security precautions.
 	 *
 	 * @since 2.5.0
+	 *
 	 * @var string
 	 */
 	public $prefix = '';
 	/**
 	 * WordPress base table prefix.
 	 *
 	 * @since 3.0.0
+	 *
 	 * @var string
 	 */
 	public $base_prefix;
 	/**
 	 * Whether the database queries are ready to start executing.
 	 *
 	 * @since 2.3.2
+	 *
 	 * @var bool
 	 */
 	public $ready = false;
 	/**
 	 * Blog ID.
 	 *
 	 * @since 3.0.0
+	 *
 	 * @var int
 	 */
 	public $blogid = 0;
 	/**
 	 * Site ID.
 	 *
 	 * @since 3.0.0
+	 *
 	 * @var int
 	 */
 	public $siteid = 0;
 	/**
-	 * List of WordPress per-blog tables.
+	 * List of WordPress per-site tables.
 	 *
 	 * @since 2.5.0
+	 *
 	 * @see wpdb::tables()
-	 * @var array
+	 * @var string[]
 	 */
 	public $tables = array(
 		'posts',
 		'comments',
 		'links',
 	 * List of deprecated WordPress tables.
 	 *
 	 * 'categories', 'post2cat', and 'link2cat' were deprecated in 2.3.0, db version 5539.
 	 *
 	 * @since 2.9.0
+	 *
 	 * @see wpdb::tables()
-	 * @var array
+	 * @var string[]
 	 */
 	public $old_tables = array( 'categories', 'post2cat', 'link2cat' );
 	/**
 	 * List of WordPress global tables.
 	 *
 	 * @since 3.0.0
+	 *
 	 * @see wpdb::tables()
-	 * @var array
+	 * @var string[]
 	 */
 	public $global_tables = array( 'users', 'usermeta' );
 	/**
 	 * List of Multisite global tables.
 	 *
 	 * @since 3.0.0
+	 *
 	 * @see wpdb::tables()
-	 * @var array
+	 * @var string[]
 	 */
 	public $ms_global_tables = array(
 		'blogs',
 		'blogmeta',
 		'signups',
 	/**
 	 * WordPress Comments table.
 	 *
 	 * @since 1.5.0
+	 *
 	 * @var string
 	 */
 	public $comments;
 	/**
 	 * WordPress Comment Metadata table.
 	 *
 	 * @since 2.9.0
+	 *
 	 * @var string
 	 */
 	public $commentmeta;
 	/**
 	 * WordPress Links table.
 	 *
 	 * @since 1.5.0
+	 *
 	 * @var string
 	 */
 	public $links;
 	/**
 	 * WordPress Options table.
 	 *
 	 * @since 1.5.0
+	 *
 	 * @var string
 	 */
 	public $options;
 	/**
 	 * WordPress Post Metadata table.
 	 *
 	 * @since 1.5.0
+	 *
 	 * @var string
 	 */
 	public $postmeta;
 	/**
 	 * WordPress Posts table.
 	 *
 	 * @since 1.5.0
+	 *
 	 * @var string
 	 */
 	public $posts;
 	/**
 	 * WordPress Terms table.
 	 *
 	 * @since 2.3.0
+	 *
 	 * @var string
 	 */
 	public $terms;
 	/**
 	 * WordPress Term Relationships table.
 	 *
 	 * @since 2.3.0
+	 *
 	 * @var string
 	 */
 	public $term_relationships;
 	/**
 	 * WordPress Term Taxonomy table.
 	 *
 	 * @since 2.3.0
+	 *
 	 * @var string
 	 */
 	public $term_taxonomy;
 	/**
 	 * WordPress Term Meta table.
 	 *
 	 * @since 4.4.0
+	 *
 	 * @var string
 	 */
 	public $termmeta;
 	//
 	/**
 	 * WordPress User Metadata table.
 	 *
 	 * @since 2.3.0
+	 *
 	 * @var string
 	 */
 	public $usermeta;
 	/**
 	 * WordPress Users table.
 	 *
 	 * @since 1.5.0
+	 *
 	 * @var string
 	 */
 	public $users;
 	/**
 	 * Multisite Blogs table.
 	 *
 	 * @since 3.0.0
+	 *
 	 * @var string
 	 */
 	public $blogs;
 	/**
 	 * Multisite Blog Metadata table.
 	 *
 	 * @since 5.1.0
+	 *
 	 * @var string
 	 */
 	public $blogmeta;
 	/**
 	 * Multisite Registration Log table.
 	 *
 	 * @since 3.0.0
+	 *
 	 * @var string
 	 */
 	public $registration_log;
 	/**
 	 * Multisite Signups table.
 	 *
 	 * @since 3.0.0
+	 *
 	 * @var string
 	 */
 	public $signups;
 	/**
 	 * Multisite Sites table.
 	 *
 	 * @since 3.0.0
+	 *
 	 * @var string
 	 */
 	public $site;
 	/**
 	 * Multisite Sitewide Terms table.
 	 *
 	 * @since 3.0.0
+	 *
 	 * @var string
 	 */
 	public $sitecategories;
 	/**
 	 * Multisite Site Metadata table.
 	 *
 	 * @since 3.0.0
+	 *
 	 * @var string
 	 */
 	public $sitemeta;
 	/**
 	 *
 	 * Columns not listed here default to %s. Initialized during WP load.
 	 * Keys are column names, values are format types: 'ID' => '%d'.
 	 *
 	 * @since 2.8.0
+	 *
 	 * @see wpdb::prepare()
 	 * @see wpdb::insert()
 	 * @see wpdb::update()
 	 * @see wpdb::delete()
 	 * @see wp_set_wpdb_vars()
 	/**
 	 * Database table columns charset.
 	 *
 	 * @since 2.2.0
+	 *
 	 * @var string
 	 */
 	public $charset;
 	/**
 	 * Database table columns collate.
 	 *
 	 * @since 2.2.0
+	 *
 	 * @var string
 	 */
 	public $collate;
 	/**
 	 * Database Username.
 	 *
 	 * @since 2.9.0
+	 *
 	 * @var string
 	 */
 	protected $dbuser;
 	/**
 	 * Database Password.
 	 *
 	 * @since 3.1.0
+	 *
 	 * @var string
 	 */
 	protected $dbpassword;
 	/**
 	 * Database Name.
 	 *
 	 * @since 3.1.0
+	 *
 	 * @var string
 	 */
 	protected $dbname;
 	/**
 	 * Database Host.
 	 *
 	 * @since 3.1.0
+	 *
 	 * @var string
 	 */
 	protected $dbhost;
 	/**
-	 * Database Handle.
+	 * Database handle.
+	 *
+	 * Possible values:
+	 *
+	 * - `mysqli` instance when the `mysqli` driver is in use
+	 * - `resource` when the older `mysql` driver is in use
+	 * - `null` if the connection is yet to be made or has been closed
+	 * - `false` if the connection has failed
 	 *
 	 * @since 0.71
-	 * @var string
+	 *
+	 * @var mysqli|resource|false|null
 	 */
 	protected $dbh;
 	/**
 	 * A textual description of the last query/get_row/get_var call.
 	 *
 	 * @since 3.0.0
+	 *
 	 * @var string
 	 */
 	public $func_call;
 	/**
 	 * against the required MySQL version for WordPress. Normally, a replacement
 	 * database drop-in (db.php) will skip these checks, but setting this to true
 	 * will force the checks to occur.
 	 *
 	 * @since 3.3.0
+	 *
 	 * @var bool
 	 */
 	public $is_mysql = null;
 	/**
 	 * A list of incompatible SQL modes.
 	 *
 	 * @since 3.9.0
-	 * @var array
+	 *
+	 * @var string[]
 	 */
 	protected $incompatible_modes = array(
 		'NO_ZERO_DATE',
 		'ONLY_FULL_GROUP_BY',
 		'STRICT_TRANS_TABLES',
 	/**
 	 * Whether to use mysqli over mysql. Default false.
 	 *
 	 * @since 3.9.0
+	 *
 	 * @var bool
 	 */
 	private $use_mysqli = false;
 	/**
 	 * Whether we've managed to successfully connect at some point.
 	 *
 	 * @since 3.9.0
+	 *
 	 * @var bool
 	 */
 	private $has_connected = false;
 	/**
+	 * Time when the last query was performed.
+	 *
+	 * Only set when `SAVEQUERIES` is defined and truthy.
+	 *
+	 * @since 1.5.0
+	 *
+	 * @var float
+	 */
+	public $time_start = null;
+	/**
+	 * The last SQL error that was encountered.
+	 *
+	 * @since 2.5.0
+	 *
+	 * @var WP_Error|string
+	 */
+	public $error = null;
+	/**
 	 * Connects to the database server and selects a database.
 	 *
-	 * PHP5 style constructor for compatibility with PHP5. Does the actual setting up
+	 * Does the actual setting up
 	 * of the class properties and connection to the database.
 	 *
 	 * @since 2.0.8
 	 *
 	 * @link https://core.trac.wordpress.org/ticket/3354
-	 * @global string $wp_version The WordPress version string.
+	 *
-	 *
+	 * @param string $dbuser     Database user.
-	 * @param string $dbuser     MySQL database user.
+	 * @param string $dbpassword Database password.
-	 * @param string $dbpassword MySQL database password.
+	 * @param string $dbname     Database name.
-	 * @param string $dbname     MySQL database name.
+	 * @param string $dbhost     Database host.
-	 * @param string $dbhost     MySQL database host.
 	 */
 	public function __construct( $dbuser, $dbpassword, $dbname, $dbhost ) {
 		if ( WP_DEBUG && WP_DEBUG_DISPLAY ) {
 			$this->show_errors();
 		}
-		// Use ext/mysqli if it exists unless WP_USE_EXT_MYSQL is defined as true.
+		// Use the `mysqli` extension if it exists unless `WP_USE_EXT_MYSQL` is defined as true.
 		if ( function_exists( 'mysqli_connect' ) ) {
 			$this->use_mysqli = true;
 			if ( defined( 'WP_USE_EXT_MYSQL' ) ) {
 				$this->use_mysqli = ! WP_USE_EXT_MYSQL;
 	/**
 	 * Sets the connection's character set.
 	 *
 	 * @since 3.1.0
 	 *
-	 * @param resource $dbh     The resource given by mysql_connect.
+	 * @param mysqli|resource $dbh     The connection returned by `mysqli_connect()` or `mysql_connect()`.
-	 * @param string   $charset Optional. The character set. Default null.
+	 * @param string          $charset Optional. The character set. Default null.
-	 * @param string   $collate Optional. The collation. Default null.
+	 * @param string          $collate Optional. The collation. Default null.
 	 */
 	public function set_charset( $dbh, $charset = null, $collate = null ) {
 		if ( ! isset( $charset ) ) {
 			$charset = $this->charset;
 		}
 	}
 	/**
 	 * Returns an array of WordPress tables.
 	 *
-	 * Also allows for the CUSTOM_USER_TABLE and CUSTOM_USER_META_TABLE to override the WordPress users
+	 * Also allows for the `CUSTOM_USER_TABLE` and `CUSTOM_USER_META_TABLE` to override the WordPress users
 	 * and usermeta tables that would otherwise be determined by the prefix.
 	 *
-	 * The $scope argument can take one of the following:
+	 * The `$scope` argument can take one of the following:
 	 *
-	 * 'all' - returns 'all' and 'global' tables. No old tables are returned.
+	 * - 'all' - returns 'all' and 'global' tables. No old tables are returned.
-	 * 'blog' - returns the blog-level tables for the queried blog.
+	 * - 'blog' - returns the blog-level tables for the queried blog.
-	 * 'global' - returns the global tables for the installation, returning multisite tables only on multisite.
+	 * - 'global' - returns the global tables for the installation, returning multisite tables only on multisite.
-	 * 'ms_global' - returns the multisite global tables, regardless if current installation is multisite.
+	 * - 'ms_global' - returns the multisite global tables, regardless if current installation is multisite.
-	 * 'old' - returns tables which are deprecated.
+	 * - 'old' - returns tables which are deprecated.
 	 *
 	 * @since 3.0.0
 	 *
 	 * @uses wpdb::$tables
 	 * @uses wpdb::$old_tables
 	 * @param string $scope   Optional. Possible values include 'all', 'global', 'ms_global', 'blog',
 	 *                        or 'old' tables. Default 'all'.
 	 * @param bool   $prefix  Optional. Whether to include table prefixes. If blog prefix is requested,
 	 *                        then the custom users and usermeta tables will be mapped. Default true.
 	 * @param int    $blog_id Optional. The blog_id to prefix. Used only when prefix is requested.
-	 *                        Defaults to wpdb::$blogid.
+	 *                        Defaults to `wpdb::$blogid`.
-	 * @return array Table names. When a prefix is requested, the key is the unprefixed table name.
+	 * @return string[] Table names. When a prefix is requested, the key is the unprefixed table name.
 	 */
 	public function tables( $scope = 'all', $prefix = true, $blog_id = 0 ) {
 		switch ( $scope ) {
 			case 'all':
 				$tables = array_merge( $this->global_tables, $this->tables );
 		return $tables;
 	}
 	/**
-	 * Selects a database using the current database connection.
+	 * Selects a database using the current or provided database connection.
 	 *
 	 * The database name will be changed based on the current database connection.
 	 * On failure, the execution will bail and display a DB error.
 	 *
 	 * @since 0.71
 	 *
-	 * @param string        $db  MySQL database name.
+	 * @param string          $db  Database name.
-	 * @param resource|null $dbh Optional link identifier.
+	 * @param mysqli|resource $dbh Optional database connection.
 	 */
 	public function select( $db, $dbh = null ) {
 		if ( is_null( $dbh ) ) {
 			$dbh = $this->dbh;
 		}
 		if ( ! $success ) {
 			$this->ready = false;
 			if ( ! did_action( 'template_redirect' ) ) {
 				wp_load_translations_early();
-				$message = '<h1>' . __( 'Can&#8217;t select database' ) . "</h1>\n";
+				$message = '<h1>' . __( 'Cannot select database' ) . "</h1>\n";
 				$message .= '<p>' . 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.' ),
 					'<code>' . htmlspecialchars( $db, ENT_QUOTES ) . '</code>'
 				) . "</p>\n";
 				$message .= "<ul>\n";
 				$message .= '<li>' . __( 'Are you sure it exists?' ) . "</li>\n";
 				$message .= "</ul>\n";
 				$message .= '<p>' . sprintf(
 					/* translators: %s: Support forums URL. */
-					__( 'If you don&#8217;t know how to set up a database you should <strong>contact your host</strong>. If all else fails you may find help at the <a href="%s">WordPress Support Forums</a>.' ),
+					__( 'If you do not know how to set up a database you should <strong>contact your host</strong>. If all else fails you may find help at the <a href="%s">WordPress Support Forums</a>.' ),
 					__( 'https://wordpress.org/support/forums/' )
 				) . "</p>\n";
 				$this->bail( $message, 'db_select_fail' );
 			}
 	 * @see esc_sql()
 	 *
 	 * @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()' );
 		}
 		return addslashes( $string );
 	}
 	 * @see mysql_real_escape_string()
 	 *
 	 * @param string $string String to escape.
 	 * @return string Escaped string.
 	 */
-	function _real_escape( $string ) {
+	public function _real_escape( $string ) {
-		if ( ! is_scalar( $string ) && ! is_null( $string ) ) {
+		if ( ! is_scalar( $string ) ) {
 			return '';
 		}
 		if ( $this->dbh ) {
 			if ( $this->use_mysqli ) {
 			} else {
 				$escaped = mysql_real_escape_string( $string, $this->dbh );
 			}
 		} else {
 			$class = get_class( $this );
-			if ( function_exists( '__' ) ) {
-				/* translators: %s: Database access abstraction class, usually wpdb or a class extending wpdb. */
+			wp_load_translations_early();
-				_doing_it_wrong( $class, sprintf( __( '%s must set a database connection for use with escaping.' ), $class ), '3.6.0' );
+			/* translators: %s: Database access abstraction class, usually wpdb or a class extending wpdb. */
-			} else {
+			_doing_it_wrong( $class, sprintf( __( '%s must set a database connection for use with escaping.' ), $class ), '3.6.0' );
-				_doing_it_wrong( $class, sprintf( '%s must set a database connection for use with escaping.', $class ), '3.6.0' );
-			}
 			$escaped = addslashes( $string );
 		}
 		return $this->add_placeholder_escape( $escaped );
 	}
 	/**
 	 * 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)
+	 * - %d (integer)
-	 *   %s (string)
+	 * - %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().
 	 *
 	 * Arguments may be passed as individual arguments to the method, or as a single array
 	 * 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' );
 	 *
 	 * @since 2.3.0
 	 * @since 5.3.0 Formalized the existing and already documented `...$args` parameter
 			);
 		}
 		// 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];
 		}
 		foreach ( $args as $arg ) {
 		return $this->add_placeholder_escape( $query );
 	}
 	/**
-	 * 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.
 	 *
 	 * Example Prepared Statement:
 	 *
 	}
 	/**
 	 * 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.
 	 *
 	 * @param bool $allow_bail Optional. Allows the function to bail. Default true.
 		 */
 		$new_link     = defined( 'MYSQL_NEW_LINK' ) ? MYSQL_NEW_LINK : true;
 		$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;
 			$port    = null;
 			$socket  = null;
 			$message = '<h1>' . __( 'Error establishing a database connection' ) . "</h1>\n";
 			$message .= '<p>' . 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&#8217;t contact the database server at %2$s. This could mean your host&#8217;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&#8217;s database server is down.' ),
 				'<code>wp-config.php</code>',
 				'<code>' . htmlspecialchars( $this->dbhost, ENT_QUOTES ) . '</code>'
 			) . "</p>\n";
 			$message .= "<ul>\n";
 			$message .= '<li>' . __( 'Are you sure the database server is running?' ) . "</li>\n";
 			$message .= "</ul>\n";
 			$message .= '<p>' . sprintf(
 				/* translators: %s: Support forums URL. */
-				__( 'If you&#8217;re unsure what these terms mean you should probably contact your host. If you still need help you can always visit the <a href="%s">WordPress Support Forums</a>.' ),
+				__( 'If you are unsure what these terms mean you should probably contact your host. If you still need help you can always visit the <a href="%s">WordPress Support Forums</a>.' ),
 				__( 'https://wordpress.org/support/forums/' )
 			) . "</p>\n";
 			$this->bail( $message, 'db_connect_fail' );
 	 * and/or socket file.
 	 *
 	 * @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
+	 * @return array|false {
-	 *                     whether it is an IPv6 address, in that order.
+	 *     Array containing the host, the port, the socket and
-	 *                     False if $host couldn't be parsed.
+	 *     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;
 		$socket  = null;
 		$is_ipv6 = false;
 	 * Checks that the connection to the database is still up. If not, try to reconnect.
 	 *
 	 * 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
 	 *
 	 * @param bool $allow_bail Optional. Allows the function to bail. Default true.
 	 * @return bool|void True if the connection is up.
 		$message = '<h1>' . __( 'Error reconnecting to the database' ) . "</h1>\n";
 		$message .= '<p>' . sprintf(
 			/* translators: %s: Database host. */
-			__( 'This means that we lost contact with the database server at %s. This could mean your host&#8217;s database server is down.' ),
+			__( 'This means that the contact with the database server at %s was lost. This could mean your host&#8217;s database server is down.' ),
 			'<code>' . htmlspecialchars( $this->dbhost, ENT_QUOTES ) . '</code>'
 		) . "</p>\n";
 		$message .= "<ul>\n";
 		$message .= '<li>' . __( 'Are you sure the database server is running?' ) . "</li>\n";
 		$message .= '<li>' . __( 'Are you sure the database server is not under particularly heavy load?' ) . "</li>\n";
 		$message .= "</ul>\n";
 		$message .= '<p>' . sprintf(
 			/* translators: %s: Support forums URL. */
-			__( 'If you&#8217;re unsure what these terms mean you should probably contact your host. If you still need help you can always visit the <a href="%s">WordPress Support Forums</a>.' ),
+			__( 'If you are unsure what these terms mean you should probably contact your host. If you still need help you can always visit the <a href="%s">WordPress Support Forums</a>.' ),
 			__( 'https://wordpress.org/support/forums/' )
 		) . "</p>\n";
 		// We weren't able to reconnect, so we better bail.
 		$this->bail( $message, 'db_connect_fail' );
 		// It has ceased to be (at least temporarily).
 		dead_db();
 	}
 	/**
-	 * 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.
 	 *
 	 * @since 0.71
 	 *
 			$stripped_query = $this->strip_invalid_text_from_query( $query );
 			// strip_invalid_text_from_query() can perform queries, so we need
 			// 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;
 			}
 		}
 		$this->check_current_query = true;
 		// Keep track of the last query for debug.
 		$this->last_query = $query;
 		$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 ) {
 				if ( $this->dbh instanceof mysqli ) {
 					$mysql_errno = mysqli_errno( $this->dbh );
 	/**
 	 * 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' ) )
 	 *
 	 * @since 2.5.0
 	 *
 	/**
 	 * 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' ) )
 	 *
 	 * @since 3.0.0
 	 *
 	 *                             specified in wpdb::$field_types.
 	 * @param string       $type   Optional. Type of operation. Possible values include 'INSERT' or 'REPLACE'.
 	 *                             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 ) ) {
 			return false;
 		}
 	/**
 	 * 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' ) )
 	 *
 	 * @since 2.5.0
 	 *
 	/**
 	 * Deletes a row in the table.
 	 *
 	 * Examples:
+	 *
 	 *     wpdb::delete( 'table', array( 'ID' => 1 ) )
 	 *     wpdb::delete( 'table', array( 'ID' => 1 ), array( '%d' ) )
 	 *
 	 * @since 3.4.0
 	 *
 		}
 		$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;
 		}
 		return $data;
 	}
 	 * @return string|null Database query result (as string), or null on failure.
 	 */
 	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 );
 		}
 		// Extract var out of cached results based on x,y vals.
 		if ( ! empty( $this->last_result[ $y ] ) ) {
 	 * @return array|object|null|void Database query result in format specified by $output or null on failure.
 	 */
 	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;
 		}
 	 * @param string|null $query Optional. SQL query. Defaults to previous query.
 	 * @param int         $x     Optional. Column to return. Indexed from 0.
 	 * @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 );
 		}
 		$new_array = array();
 		// Extract the column values.
 	 * @return array|object|null Database query results.
 	 */
 	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;
 		}
 		$tablekey = strtolower( $table );
 		/**
 		 * 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|WP_Error|null $charset The character set to use, WP_Error object
-		 * @param string      $table   The name of the table being checked.
+		 *                                      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 ) {
 			return $charset;
 		}
 		$table_parts = explode( '.', $table );
 		$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 ) {
 			$columns[ strtolower( $column->Field ) ] = $column;
 		}
 	 *
 	 * @since 4.2.1
 	 *
 	 * @param string $table  Table name.
 	 * @param string $column Column name.
-	 * @return array|false|WP_Error array( 'length' => (int), 'type' => 'byte' | 'char' ).
+	 * @return array|false|WP_Error {
-	 *                              False if the column has no length (for example, numeric column).
+	 *     Array of column length information, false if the column has no length (for
-	 *                              WP_Error object if there was an error.
+	 *     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 );
 		$columnkey = strtolower( $column );
 			}
 			$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 ) {
 				if ( isset( $row[ "x_$column" ] ) ) {
 					$data[ $column ]['value'] = $row[ "x_$column" ];
 			return false;
 		}
 	}
 	/**
 	 * Closes the current database connection.
 	 *
 	 * @since 4.5.0
 	 *
 	public function get_caller() {
 		return wp_debug_backtrace_summary( __CLASS__ );
 	}
 	/**
-	 * Retrieves the MySQL server version.
+	 * Retrieves the database server version.
 	 *
 	 * @since 2.7.0
 	 *
 	 * @return string|null Version number on success, null on failure.
 	 */
 	public function db_version() {
 		return preg_replace( '/[^0-9.].*/', '', $this->db_server_info() );
 	}
 	/**
-	 * Retrieves full MySQL server information.
+	 * Retrieves full database server information.
 	 *
 	 * @since 5.5.0
 	 *
 	 * @return string|false Server info on success, false on failure.
 	 */

changeset 19	3d72ae0968f4
parent 18	be944660c56a
child 21	48c4eec2b7e6