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

equal deleted inserted replaced

-:34716fd837a4
+:be944660c56a
 	 * Default is to show errors if both WP_DEBUG and WP_DEBUG_DISPLAY evaluate to true.
 	 *
 	 * @since 0.71
 	 * @var bool
 	 */
-	var $show_errors = false;
+	public $show_errors = false;
 	/**
 	 * Whether to suppress errors during the DB bootstrapping. Default false.
 	 *
 	 * @since 2.5.0
 	 * @var bool
 	 */
-	var $suppress_errors = false;
+	public $suppress_errors = false;
 	/**
 	 * The error encountered during the last query.
 	 *
 	 * @since 2.5.0
 	 * Count of rows affected by the last query.
 	 *
 	 * @since 0.71
 	 * @var int
 	 */
-	var $rows_affected = 0;
+	public $rows_affected = 0;
 	/**
 	 * The ID generated for an AUTO_INCREMENT column by the last query (usually INSERT).
 	 *
 	 * @since 0.71
 	 * The last query made.
 	 *
 	 * @since 0.71
 	 * @var string
 	 */
-	var $last_query;
+	public $last_query;
 	/**
 	 * Results of the last query.
 	 *
 	 * @since 0.71
 	 * @var array|null
 	 */
-	var $last_result;
+	public $last_result;
 	/**
 	 * MySQL result, which is either a resource or boolean.
 	 *
 	 * @since 0.71
 	 *         @type float  $3 Unix timestamp of the time at the start of the query.
 	 *         @type array  $4 Custom query data.
 	 *     }
 	 * }
 	 */
-	var $queries;
+	public $queries;
 	/**
 	 * The number of times to retry reconnecting before dying. Default 5.
 	 *
 	 * @since 3.9.0
 	 * Whether the database queries are ready to start executing.
 	 *
 	 * @since 2.3.2
 	 * @var bool
 	 */
-	var $ready = false;
+	public $ready = false;
 	/**
 	 * Blog ID.
 	 *
 	 * @since 3.0.0
 	 *
 	 * @since 2.5.0
 	 * @see wpdb::tables()
 	 * @var array
 	 */
-	var $tables = array(
+	public $tables = array(
 		'posts',
 		'comments',
 		'links',
 		'options',
 		'postmeta',
 	 *
 	 * @since 2.9.0
 	 * @see wpdb::tables()
 	 * @var array
 	 */
-	var $old_tables = array( 'categories', 'post2cat', 'link2cat' );
+	public $old_tables = array( 'categories', 'post2cat', 'link2cat' );
 	/**
 	 * List of WordPress global tables.
 	 *
 	 * @since 3.0.0
 	 * @see wpdb::tables()
 	 * @var array
 	 */
-	var $global_tables = array( 'users', 'usermeta' );
+	public $global_tables = array( 'users', 'usermeta' );
 	/**
 	 * List of Multisite global tables.
 	 *
 	 * @since 3.0.0
 	 * @see wpdb::tables()
 	 * @var array
 	 */
-	var $ms_global_tables = array(
+	public $ms_global_tables = array(
 		'blogs',
 		'blogmeta',
 		'signups',
 		'site',
 		'sitemeta',
 	 *
 	 * @param string $string String to escape.
 	 * @return string Escaped string.
 	 */
 	function _real_escape( $string ) {
+		if ( ! is_scalar( $string ) && ! is_null( $string ) ) {
+			return '';
+		}
 		if ( $this->dbh ) {
 			if ( $this->use_mysqli ) {
 				$escaped = mysqli_real_escape_string( $this->dbh, $string );
 			} else {
 				$escaped = mysql_real_escape_string( $string, $this->dbh );
 		$query = preg_replace( "/%(?:%|$|(?!($allowed_format)?[sdF]))/", '%%\\1', $query ); // Escape any unescaped percents.
 		// Count the number of valid placeholders in the query.
 		$placeholders = preg_match_all( "/(^|[^%]|(%%)+)%($allowed_format)?[sdF]/", $query, $matches );
-		if ( count( $args ) !== $placeholders ) {
+		$args_count = count( $args );
+		if ( $args_count !== $placeholders ) {
 			if ( 1 === $placeholders && $passed_as_array ) {
 				// If the passed query only expected one argument, but the wrong number of arguments were sent as an array, bail.
 				wp_load_translations_early();
 				_doing_it_wrong(
 					'wpdb::prepare',
 					'wpdb::prepare',
 					sprintf(
 						/* translators: 1: Number of placeholders, 2: Number of arguments passed. */
 						__( 'The query does not contain the correct number of placeholders (%1$d) for the number of arguments passed (%2$d).' ),
 						$placeholders,
-						count( $args )
+						$args_count
 					),
 					'4.8.3'
 				);
+				/*
+				 * If we don't have enough arguments to match the placeholders,
+				 * return an empty string to avoid a fatal error on PHP 8.
+				 */
+				if ( $args_count < $placeholders ) {
+					$max_numbered_placeholder = ! empty( $matches[3] ) ? max( array_map( 'intval', $matches[3] ) ) : 0;
+					if ( ! $max_numbered_placeholder || $args_count < $max_numbered_placeholder ) {
+						return '';
+					}
+				}
 			}
 		}
 		array_walk( $args, array( $this, 'escape_by_ref' ) );
 		$query = vsprintf( $query, $args );
 	}
 	/**
 	 * Performs a MySQL database query, using current database connection.
 	 *
-	 * More information can be found on the Codex page.
+	 * More information can be found on the documentation page.
 	 *
 	 * @since 0.71
 	 *
-	 * @link https://codex.wordpress.org/Function_Reference/wpdb_Class
+	 * @link https://developer.wordpress.org/reference/classes/wpdb/
 	 *
 	 * @param string $query Database query.
 	 * @return int|bool Boolean true for CREATE, ALTER, TRUNCATE and DROP queries. Number of rows
 	 *                  affected/selected for all other queries. Boolean false on error.
 	 */
 		 *
 		 * @param string $query Database query.
 		 */
 		$query = apply_filters( 'query', $query );
+		if ( ! $query ) {
+			$this->insert_id = 0;
+			return false;
+		}
 		$this->flush();
 		// Log how the function was called.
 		$this->func_call = "\$db->query(\"$query\")";
 	 * @param float  $query_start     Unix timestamp of the time at the start of the query.
 	 * @param array  $query_data      Custom query data.
 	 */
 	public function log_query( $query, $query_time, $query_callstack, $query_start, $query_data ) {
 		/**
-		 * Filters the custom query data being logged.
+		 * Filters the custom data to log alongside a query.
 		 *
 		 * Caution should be used when modifying any of this data, it is recommended that any additional
-		 * information you need to store about a query be added as a new associative entry to the fourth
+		 * information you need to store about a query be added as a new associative array element.
-		 * element $query_data.
 		 *
 		 * @since 5.3.0
 		 *
 		 * @param array  $query_data      Custom query data.
 		 * @param string $query           The query's SQL.
 		return false;
 	}
 	/**
-	 * Retrieves the name of the function that called wpdb.
+	 * Retrieves a comma-separated list of the names of the functions that called wpdb.
-	 *
-	 * Searches up the list of functions until it reaches the one that would
-	 * most logically had called this method.
 	 *
 	 * @since 2.5.0
 	 *
 	 * @return string Comma-separated list of the calling functions.
 	 */

changeset 18	be944660c56a
parent 16	a86126ab1dd4
child 19	3d72ae0968f4