From 22e6d59c67cfe070a2899ac6dd5e88eec3b77f2a Mon Sep 17 00:00:00 2001
From: Aaron Jorbin <aaron@jorb.in>
Date: Thu, 1 Sep 2016 18:34:28 +0000
Subject: [PATCH] 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
---
 wp-admin/options-general.php | 2 +-
 wp-includes/version.php      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/wp-admin/options-general.php b/wp-admin/options-general.php
index ce95119d7e..765c93f8d7 100644
--- a/wp-admin/options-general.php
+++ b/wp-admin/options-general.php
@@ -157,7 +157,7 @@ if ( empty($tzstring) ) { // Create a UTC+- zone if no timezone string exists
 		/* translators: 1: UTC abbreviation, 2: UTC time */
 		printf( __( 'Universal time (%1$s) is %2$s.' ),
 			'<abbr>' . __( 'UTC' ) . '</abbr>',
-			'<code>' . date_i18n( $timezone_format, false, 'gmt' ) . '</code>'
+			'<code>' . date_i18n( $timezone_format, false, true ) . '</code>'
 		);
 	?></span>
 <?php if ( get_option( 'timezone_string' ) || ! empty( $current_offset ) ) : ?>
diff --git a/wp-includes/version.php b/wp-includes/version.php
index b31e55b41d..0834260e84 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @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.