Skip to content

Hoist loop-invariant work out of get_calendar() #13615

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mukeshpanchal27 wants to merge 1 commit into
base: trunk
Choose a base branch
from
+8 −5
Open

Hoist loop-invariant work out of get_calendar() #13615

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 8 additions & 5 deletions src/wp-includes/general-template.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2662,6 +2662,9 @@ function get_calendar( $args = array() ) {
// week_begins = 0 stands for Sunday.
$week_begins = (int) get_option( 'start_of_week' );

// Read the current date once.
list( $current_year, $current_month, $current_day ) = array_map( 'intval', explode( '-', current_time( 'Y-m-j' ) ) );

// Let's figure out when we are.
if ( ! empty( $monthnum ) && ! empty( $year ) ) {
$thismonth = (int) $monthnum;
Expand All @@ -2686,8 +2689,8 @@ function get_calendar( $args = array() ) {
$thismonth = (int) substr( $m, 4, 2 );
}
} else {
$thisyear = (int) current_time( 'Y' );
$thismonth = (int) current_time( 'm' );
$thisyear = $current_year;
$thismonth = $current_month;
}

$unixmonth = mktime( 0, 0, 0, $thismonth, 1, $thisyear );
Expand Down Expand Up @@ -2793,9 +2796,9 @@ function get_calendar( $args = array() ) {

$newrow = false;

if ( (int) current_time( 'j' ) === $day
&& (int) current_time( 'm' ) === $thismonth
&& (int) current_time( 'Y' ) === $thisyear
if ( $current_day === $day
&& $current_month === $thismonth
&& $current_year === $thisyear
) {
$calendar_output .= '<td id="today">';
} else {
Expand Down
Loading