From 001cc12b714d726c047d1b11baa570ceac2c091c Mon Sep 17 00:00:00 2001 From: Sergey Biryukov Date: Wed, 27 Nov 2024 11:40:18 +0000 Subject: [PATCH] Coding Standards: Cast `gmdate( 'Z' )` to an integer before addition. This addresses two instances of the (numeric string) `gmdate( 'Z' )` being added to an `int` value. Affected functions: * `upgrade_110()` * `WP_Date_Query::validate_date_values()` Follow-up to [942], [29925], [45424]. Props justlevine. See #52217. Built from https://develop.svn.wordpress.org/trunk@59465 git-svn-id: http://core.svn.wordpress.org/trunk@58851 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/includes/upgrade.php | 2 +- wp-includes/class-wp-date-query.php | 2 +- wp-includes/version.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/wp-admin/includes/upgrade.php b/wp-admin/includes/upgrade.php index 090a5f1853..068e28b040 100644 --- a/wp-admin/includes/upgrade.php +++ b/wp-admin/includes/upgrade.php @@ -992,7 +992,7 @@ function upgrade_110() { $time_difference = $all_options->time_difference; - $server_time = time() + gmdate( 'Z' ); + $server_time = time() + (int) gmdate( 'Z' ); $weblogger_time = $server_time + $time_difference * HOUR_IN_SECONDS; $gmt_time = time(); diff --git a/wp-includes/class-wp-date-query.php b/wp-includes/class-wp-date-query.php index b8ae95461c..76b7084949 100644 --- a/wp-includes/class-wp-date-query.php +++ b/wp-includes/class-wp-date-query.php @@ -317,7 +317,7 @@ class WP_Date_Query { $_year = $date_query['year']; } - $max_days_of_year = gmdate( 'z', mktime( 0, 0, 0, 12, 31, $_year ) ) + 1; + $max_days_of_year = (int) gmdate( 'z', mktime( 0, 0, 0, 12, 31, $_year ) ) + 1; } else { // Otherwise we use the max of 366 (leap-year). $max_days_of_year = 366; diff --git a/wp-includes/version.php b/wp-includes/version.php index 432b44f16d..74a0da422c 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -16,7 +16,7 @@ * * @global string $wp_version */ -$wp_version = '6.8-alpha-59464'; +$wp_version = '6.8-alpha-59465'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.