From e9d572f43197f8299fd69a41abe277c8a06de745 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Helen=20Hou-Sand=C3=AD?= <helen.y.hou@gmail.com>
Date: Thu, 1 Oct 2020 17:43:08 +0000
Subject: [PATCH] WP Date: Add timezone abbreviation to wp-date settings.

Props mkaz.
Fixes #50624.

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


git-svn-id: http://core.svn.wordpress.org/trunk@48845 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/script-loader.php | 12 +++++++++++-
 wp-includes/version.php       |  2 +-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/wp-includes/script-loader.php b/wp-includes/script-loader.php
index f97cac5d33..48b6e7587a 100644
--- a/wp-includes/script-loader.php
+++ b/wp-includes/script-loader.php
@@ -323,6 +323,15 @@ function wp_default_packages_inline_scripts( $scripts ) {
 		)
 	);
 
+	// Calculate the timezone abbr (EDT, PST) if possible.
+	$timezone_string = get_option( 'timezone_string', 'UTC' );
+	$timezone_abbr   = '';
+
+	if ( ! empty( $timezone_string ) ) {
+		$timezone_date = new DateTime( null, new DateTimeZone( $timezone_string ) );
+		$timezone_abbr = $timezone_date->format( 'T' );
+	}
+
 	$scripts->add_inline_script(
 		'wp-date',
 		sprintf(
@@ -355,7 +364,8 @@ function wp_default_packages_inline_scripts( $scripts ) {
 					),
 					'timezone' => array(
 						'offset' => get_option( 'gmt_offset', 0 ),
-						'string' => get_option( 'timezone_string', 'UTC' ),
+						'string' => $timezone_string,
+						'abbr'   => $timezone_abbr,
 					),
 				)
 			)
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 26d3e23880..584b6ae5d3 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -13,7 +13,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '5.6-alpha-49082';
+$wp_version = '5.6-alpha-49083';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.