From 6151fddb6c1ed6f502e8df37ae0cc4ee3a9c77c8 Mon Sep 17 00:00:00 2001 From: Sergey Biryukov Date: Sun, 12 Jun 2022 11:11:11 +0000 Subject: [PATCH] Code Modernization: Pass correct default value to `setcookie()` in `wp_user_settings()`. The `wp_user_settings()` function calls the PHP native `setcookie()` function, the fifth parameter of which is the ''optional'' `$domain` parameter which expects a `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 `setcookie(): Passing null to parameter #5 ($domain) 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.setcookie.php PHP Manual: setcookie()] * [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 [29478]. Props ocean90, shenyanzhi, meysamnorouzi, jrf. Fixes #54914. Built from https://develop.svn.wordpress.org/trunk@53490 git-svn-id: http://core.svn.wordpress.org/trunk@53079 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/option.php | 4 ++-- wp-includes/version.php | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/wp-includes/option.php b/wp-includes/option.php index a65326f0a6..12f70fef04 100644 --- a/wp-includes/option.php +++ b/wp-includes/option.php @@ -1109,8 +1109,8 @@ function wp_user_settings() { // The cookie is not set in the current browser or the saved value is newer. $secure = ( 'https' === parse_url( admin_url(), PHP_URL_SCHEME ) ); - setcookie( 'wp-settings-' . $user_id, $settings, time() + YEAR_IN_SECONDS, SITECOOKIEPATH, null, $secure ); - setcookie( 'wp-settings-time-' . $user_id, time(), time() + YEAR_IN_SECONDS, SITECOOKIEPATH, null, $secure ); + setcookie( 'wp-settings-' . $user_id, $settings, time() + YEAR_IN_SECONDS, SITECOOKIEPATH, '', $secure ); + setcookie( 'wp-settings-time-' . $user_id, time(), time() + YEAR_IN_SECONDS, SITECOOKIEPATH, '', $secure ); $_COOKIE[ 'wp-settings-' . $user_id ] = $settings; } diff --git a/wp-includes/version.php b/wp-includes/version.php index 8c9290de5c..193d25e8c1 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -16,7 +16,7 @@ * * @global string $wp_version */ -$wp_version = '6.1-alpha-53489'; +$wp_version = '6.1-alpha-53490'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.