From 0f88dbfee03f962378f2db452c7b4ab95ada22fe Mon Sep 17 00:00:00 2001
From: Andrea Fercia <a.fercia@gmail.com>
Date: Fri, 19 Feb 2016 16:09:26 +0000
Subject: [PATCH] Accessibility: Fix displaying of Universal time and Local
 time info on the General Settings screen.

In [36263] they were mistakenly moved within a conditional check.

Fixes #35064.
Built from https://develop.svn.wordpress.org/trunk@36585


git-svn-id: http://core.svn.wordpress.org/trunk@36552 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/options-general.php | 4 ++--
 wp-includes/version.php      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/wp-admin/options-general.php b/wp-admin/options-general.php
index 11bda9545e..89830222f5 100644
--- a/wp-admin/options-general.php
+++ b/wp-admin/options-general.php
@@ -146,7 +146,6 @@ if ( empty($tzstring) ) { // Create a UTC+- zone if no timezone string exists
 </select>
 
 <p class="description" id="timezone-description"><?php _e( 'Choose a city in the same timezone as you.' ); ?></p>
-<?php if ( $check_zone_info && $tzstring ) : ?>
 
 <p class="timezone-info">
 	<span id="utc-time"><?php
@@ -166,6 +165,7 @@ if ( empty($tzstring) ) { // Create a UTC+- zone if no timezone string exists
 <?php endif; ?>
 </p>
 
+<?php if ( $check_zone_info && $tzstring ) : ?>
 <p class="timezone-info">
 <span>
 	<?php
@@ -215,8 +215,8 @@ if ( empty($tzstring) ) { // Create a UTC+- zone if no timezone string exists
 	date_default_timezone_set('UTC');
 	?>
 	</span>
-<?php endif; ?>
 </p>
+<?php endif; ?>
 </td>
 
 </tr>
diff --git a/wp-includes/version.php b/wp-includes/version.php
index ab770dba19..69798d7287 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.5-alpha-36584';
+$wp_version = '4.5-alpha-36585';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.