Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 68b5fff

Browse files
committedNov 5, 2021
Code Modernization: Pass correct default value to http_build_query() in get_core_checksums() and wp_version_check().
The `get_core_checksums()` and `wp_version_check()` functions call the PHP native `http_build_query()` function, the second parameter of which is the ''optional'' `$numeric_prefix` parameter which expects a non-nullable `string`. A parameter being optional, however, does not automatically make it nullable. As of PHP 8.1, passing `null` to a non-nullable PHP native function will generate a deprecation notice. In this case, this function call yielded a `http_build_query(): Passing null to parameter #2 ($numeric_prefix) of type string is deprecated` notice. Changing the `null` to an empty string fixes this without a backward compatibility break. References: * [https://www.php.net/manual/en/function.http-build-query.php PHP Manual: http_build_query()] * [https://wiki.php.net/rfc/deprecate_null_to_scalar_internal_arg PHP RFC: Deprecate passing null to non-nullable arguments of internal functions] Follow-up to [18697], [25540]. Props bjorsch, kraftbj, hellofromTonya, jrf. See #54229. git-svn-id: https://develop.svn.wordpress.org/trunk@52019 602fd350-edb4-49c9-b593-d223f7449a82
1 parent 18e9b9a commit 68b5fff

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed
 

‎src/wp-admin/includes/update.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ function find_core_auto_update() {
120120
* @return array|false An array of checksums on success, false on failure.
121121
*/
122122
function get_core_checksums( $version, $locale ) {
123-
$http_url = 'http://api.wordpress.org/core/checksums/1.0/?' . http_build_query( compact( 'version', 'locale' ), null, '&' );
123+
$http_url = 'http://api.wordpress.org/core/checksums/1.0/?' . http_build_query( compact( 'version', 'locale' ), '', '&' );
124124
$url = $http_url;
125125

126126
$ssl = wp_http_supports( array( 'ssl' ) );

‎src/wp-includes/update.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ function wp_version_check( $extra_stats = array(), $force_check = false ) {
143143
$query['channel'] = WP_AUTO_UPDATE_CORE;
144144
}
145145

146-
$url = 'http://api.wordpress.org/core/version-check/1.7/?' . http_build_query( $query, null, '&' );
146+
$url = 'http://api.wordpress.org/core/version-check/1.7/?' . http_build_query( $query, '', '&' );
147147
$http_url = $url;
148148
$ssl = wp_http_supports( array( 'ssl' ) );
149149

0 commit comments

Comments
 (0)
Please sign in to comment.