Skip to content

Commit

Permalink
Coding Standards: Cast gmdate( 'w' ) to int before using as integer.
Browse files Browse the repository at this point in the history
This addresses several instances of `gmdate( 'w' )` being used directly as an integer, when it's actually a numeric string. The issue is remediated by casting the value to `int` before use.

Affected functions:
* `get_calendar()`
* `get_weekstartend()`

Follow-up to [508], [1632].

Props justlevine.
See #52217.

git-svn-id: https://develop.svn.wordpress.org/trunk@59471 602fd350-edb4-49c9-b593-d223f7449a82
  • Loading branch information
SergeyBiryukov committed Nov 28, 2024
1 parent 8834f57 commit ce4627f
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 5 deletions.
5 changes: 3 additions & 2 deletions src/wp-includes/functions.php
Original file line number Diff line number Diff line change
Expand Up @@ -594,10 +594,10 @@ function get_weekstartend( $mysqlstring, $start_of_week = '' ) {
$day = mktime( 0, 0, 0, $md, $mm, $my );

// The day of the week from the timestamp.
$weekday = gmdate( 'w', $day );
$weekday = (int) gmdate( 'w', $day );

if ( ! is_numeric( $start_of_week ) ) {
$start_of_week = get_option( 'start_of_week' );
$start_of_week = (int) get_option( 'start_of_week' );
}

if ( $weekday < $start_of_week ) {
Expand All @@ -609,6 +609,7 @@ function get_weekstartend( $mysqlstring, $start_of_week = '' ) {

// $start + 1 week - 1 second.
$end = $start + WEEK_IN_SECONDS - 1;

return compact( 'start', 'end' );
}

Expand Down
6 changes: 3 additions & 3 deletions src/wp-includes/general-template.php
Original file line number Diff line number Diff line change
Expand Up @@ -2373,7 +2373,7 @@ function get_calendar( $initial = true, $display = true ) {
}

// See how much we should pad in the beginning.
$pad = calendar_week_mod( gmdate( 'w', $unixmonth ) - $week_begins );
$pad = calendar_week_mod( (int) gmdate( 'w', $unixmonth ) - $week_begins );
if ( 0 != $pad ) {
$calendar_output .= "\n\t\t" . '<td colspan="' . esc_attr( $pad ) . '" class="pad">&nbsp;</td>';
}
Expand Down Expand Up @@ -2412,12 +2412,12 @@ function get_calendar( $initial = true, $display = true ) {

$calendar_output .= '</td>';

if ( 6 == calendar_week_mod( gmdate( 'w', mktime( 0, 0, 0, $thismonth, $day, $thisyear ) ) - $week_begins ) ) {
if ( 6 == calendar_week_mod( (int) gmdate( 'w', mktime( 0, 0, 0, $thismonth, $day, $thisyear ) ) - $week_begins ) ) {
$newrow = true;
}
}

$pad = 7 - calendar_week_mod( gmdate( 'w', mktime( 0, 0, 0, $thismonth, $day, $thisyear ) ) - $week_begins );
$pad = 7 - calendar_week_mod( (int) gmdate( 'w', mktime( 0, 0, 0, $thismonth, $day, $thisyear ) ) - $week_begins );
if ( 0 != $pad && 7 != $pad ) {
$calendar_output .= "\n\t\t" . '<td class="pad" colspan="' . esc_attr( $pad ) . '">&nbsp;</td>';
}
Expand Down

0 comments on commit ce4627f

Please sign in to comment.