mirror of
https://github.com/gosticks/wordpress-develop.git
synced 2025-10-16 12:05:38 +00:00
Date/Time: Prevent errors in current_time() when using timestamp and no value for gmt_offset.
This changeset moves typecasting to affect the `get_option` value, which ensures that when math is done it does not generate any error. In PHP 7.4 and earlier the previous implementation was dismissed as a warning, but in PHP 8+ it would have throw a fatal error. Follow-up to [45856]. Props Nick_theGeek, SergeyBiryukov, johnbillion. Fixes #57035. git-svn-id: https://develop.svn.wordpress.org/trunk@55054 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
parent
0aa20cc050
commit
55c34595d0
@ -72,7 +72,7 @@ function mysql2date( $format, $date, $translate = true ) {
|
||||
function current_time( $type, $gmt = 0 ) {
|
||||
// Don't use non-GMT timestamp, unless you know the difference and really need to.
|
||||
if ( 'timestamp' === $type || 'U' === $type ) {
|
||||
return $gmt ? time() : time() + (int) ( get_option( 'gmt_offset' ) * HOUR_IN_SECONDS );
|
||||
return $gmt ? time() : time() + ( (int) get_option( 'gmt_offset' ) * HOUR_IN_SECONDS );
|
||||
}
|
||||
|
||||
if ( 'mysql' === $type ) {
|
||||
|
||||
Loading…
Reference in New Issue
Block a user