mirror of
https://github.com/WordPress/WordPress.git
synced 2024-09-28 23:27:39 +02: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. Built from https://develop.svn.wordpress.org/trunk@55054 git-svn-id: http://core.svn.wordpress.org/trunk@54587 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
parent
de505f0eac
commit
6e83ac5595
@ -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 ) {
|
||||
|
@ -16,7 +16,7 @@
|
||||
*
|
||||
* @global string $wp_version
|
||||
*/
|
||||
$wp_version = '6.2-alpha-55053';
|
||||
$wp_version = '6.2-alpha-55054';
|
||||
|
||||
/**
|
||||
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.
|
||||
|
Loading…
Reference in New Issue
Block a user