WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Coding Standards: Cast `gmdate( 'w' )` to `int` before using as integer. 

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.
Built from https://develop.svn.wordpress.org/trunk@59471


git-svn-id: http://core.svn.wordpress.org/trunk@58857 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Sergey Biryukov 2024-11-28 22:52:17 +00:00
parent 1806172d05
commit dd967e2a2e
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
wp-includes/functions.php
View File

@ -594,10 +594,10 @@ function get_weekstartend( $mysqlstring, $start_of_week = '' ) {
$day = mktime( 0, 0, 0, $md, $mm, $my ); $day = mktime( 0, 0, 0, $md, $mm, $my );
// The day of the week from the timestamp. // The day of the week from the timestamp.
$weekday = gmdate( 'w', $day ); $weekday = (int) gmdate( 'w', $day );
if ( ! is_numeric( $start_of_week ) ) { 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 ) { if ( $weekday < $start_of_week ) {
@ -609,6 +609,7 @@ function get_weekstartend( $mysqlstring, $start_of_week = '' ) {
// $start + 1 week - 1 second. // $start + 1 week - 1 second.
$end = $start + WEEK_IN_SECONDS - 1; $end = $start + WEEK_IN_SECONDS - 1;
return compact( 'start', 'end' ); return compact( 'start', 'end' );
} }

6
wp-includes/general-template.php
View File

@ -2373,7 +2373,7 @@ function get_calendar( $initial = true, $display = true ) {
} }
// See how much we should pad in the beginning. // 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 ) { if ( 0 != $pad ) {
$calendar_output .= "\n\t\t" . '<td colspan="' . esc_attr( $pad ) . '" class="pad">&nbsp;</td>'; $calendar_output .= "\n\t\t" . '<td colspan="' . esc_attr( $pad ) . '" class="pad">&nbsp;</td>';
} }
@ -2412,12 +2412,12 @@ function get_calendar( $initial = true, $display = true ) {
$calendar_output .= '</td>'; $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; $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 ) { if ( 0 != $pad && 7 != $pad ) {
$calendar_output .= "\n\t\t" . '<td class="pad" colspan="' . esc_attr( $pad ) . '">&nbsp;</td>'; $calendar_output .= "\n\t\t" . '<td class="pad" colspan="' . esc_attr( $pad ) . '">&nbsp;</td>';
} }

2
wp-includes/version.php
View File

@ -16,7 +16,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '6.8-alpha-59470'; $wp_version = '6.8-alpha-59471';
/** /**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.