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

Administration: Use a bool when when a bool is called for 

The third parameter of `date_i18n` is a bool.  Currently, it's a weak check, otherwise the call showing the universal time on the "General Settings" screen would be messed up. Use an actual bool so we call our own functions correctly.

Fixes #37634.
Props fronaldaraujo.


Built from https://develop.svn.wordpress.org/trunk@38502


git-svn-id: http://core.svn.wordpress.org/trunk@38443 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Aaron Jorbin 2016-09-01 18:34:28 +00:00
parent 93ad7eab80
commit 22e6d59c67
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wp-admin/options-general.php
View File

@ -157,7 +157,7 @@ if ( empty($tzstring) ) { // Create a UTC+- zone if no timezone string exists
/* translators: 1: UTC abbreviation, 2: UTC time */ /* translators: 1: UTC abbreviation, 2: UTC time */
printf( __( 'Universal time (%1$s) is %2$s.' ), printf( __( 'Universal time (%1$s) is %2$s.' ),
'<abbr>' . __( 'UTC' ) . '</abbr>', '<abbr>' . __( 'UTC' ) . '</abbr>',
'<code>' . date_i18n( $timezone_format, false, 'gmt' ) . '</code>' '<code>' . date_i18n( $timezone_format, false, true ) . '</code>'
); );
?></span> ?></span>
<?php if ( get_option( 'timezone_string' ) || ! empty( $current_offset ) ) : ?> <?php if ( get_option( 'timezone_string' ) || ! empty( $current_offset ) ) : ?>

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '4.7-alpha-38501'; $wp_version = '4.7-alpha-38502';
/** /**
* 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.