From 216f337a2add40355d38ffb91197f865ab4bcee2 Mon Sep 17 00:00:00 2001 From: Sergey Biryukov Date: Sat, 8 Mar 2025 12:51:20 +0000 Subject: [PATCH] Coding Standards: Correct conditional formatting in `get_calendar()`. Follow-up to [59947]. See #62279. Built from https://develop.svn.wordpress.org/trunk@59953 git-svn-id: http://core.svn.wordpress.org/trunk@59295 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/general-template.php | 12 +++++++----- wp-includes/version.php | 2 +- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/wp-includes/general-template.php b/wp-includes/general-template.php index 78a3d76aac..a7bd0a47dd 100644 --- a/wp-includes/general-template.php +++ b/wp-includes/general-template.php @@ -2310,9 +2310,9 @@ function get_calendar( $args = array() ) { * from generating a different key from the same values in the reverse order. * * `display` is excluded from the cache key as the cache contains the same - * HTML regardless of this functions need to echo or return the output. + * HTML regardless of this function's need to echo or return the output. * - * The global values contain data generated by the URL querystring variables. + * The global values contain data generated by the URL query string variables. */ $cache_args = $args; unset( $cache_args['display'] ); @@ -2497,11 +2497,13 @@ function get_calendar( $args = array() ) { if ( isset( $newrow ) && $newrow ) { $calendar_output .= "\n\t\n\t\n\t\t"; } + $newrow = false; - if ( (int) current_time( 'j' ) === $day && - (int) current_time( 'm' ) === $thismonth && - (int) current_time( 'Y' ) === $thisyear ) { + if ( (int) current_time( 'j' ) === $day + && (int) current_time( 'm' ) === $thismonth + && (int) current_time( 'Y' ) === $thisyear + ) { $calendar_output .= ''; } else { $calendar_output .= ''; diff --git a/wp-includes/version.php b/wp-includes/version.php index b788a5679a..9d39c3040d 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -16,7 +16,7 @@ * * @global string $wp_version */ -$wp_version = '6.8-beta1-59952'; +$wp_version = '6.8-beta1-59953'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.