sergiotarxz/Wordpress
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Date/Time: Eliminate use of date_default_timezone_set() for determining DST status on General Options screen.

Browse Source 
Time calculations should not need to rely on manipulating global PHP configuration state.

Props Rarst.
Fixes #46483.

git-svn-id: https://develop.svn.wordpress.org/trunk@45556 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Sergey Biryukov 2019-06-20 14:10:44 +00:00
parent e283457e45
commit e9fc71bbbe
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/wp-admin/options-general.php
View File

@ -252,10 +252,10 @@ if ( empty( $tzstring ) ) { // Create a UTC+- zone if no timezone string exists
<p class="timezone-info"> <p class="timezone-info">
<span> <span>
<?php <?php
// Set TZ so localtime works. $now = new DateTime( 'now', new DateTimeZone( $tzstring ) );
date_default_timezone_set( $tzstring ); $dst = (bool) $now->format( 'I' );
$now = localtime( time(), true );
if ( $now['tm_isdst'] ) { if ( $dst ) {
_e( 'This timezone is currently in daylight saving time.' ); _e( 'This timezone is currently in daylight saving time.' );
} else { } else {
_e( 'This timezone is currently in standard time.' ); _e( 'This timezone is currently in standard time.' );
@ -296,8 +296,6 @@ if ( empty( $tzstring ) ) { // Create a UTC+- zone if no timezone string exists
_e( 'This timezone does not observe daylight saving time.' ); _e( 'This timezone does not observe daylight saving time.' );
} }
} }
// Set back to UTC.
date_default_timezone_set( 'UTC' );
?> ?>
</span> </span>
</p> </p>