From 946da2d398778031d9834a9b65b4eb4a25b6daa0 Mon Sep 17 00:00:00 2001
From: Dominik Schilling <dominikschilling+git@gmail.com>
Date: Wed, 26 Oct 2016 12:11:43 +0000
Subject: [PATCH] About Page: Use `get_user_language()` for the video
 subtitles.

Rename `$locale` to `$lang_code` to avoid stomping of the global `$locale`.

See #38485.
Built from https://develop.svn.wordpress.org/trunk@38952


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

diff --git a/wp-admin/about.php b/wp-admin/about.php
index 5bf7139ca3..b86e09e44c 100644
--- a/wp-admin/about.php
+++ b/wp-admin/about.php
@@ -34,10 +34,10 @@ function _wp_override_admin_video_width_limit( $output ) {
 }
 
 $video_url = 'https://videopress.com/embed/GbdhpGF3?hd=true';
-$locale    = str_replace( '_', '-', get_locale() );
-list( $locale ) = explode( '-', $locale );
-if ( 'en' !== $locale ) {
-	$video_url = add_query_arg( 'defaultLangCode', $locale, $video_url );
+$lang_code = str_replace( '_', '-', get_user_locale() );
+list( $lang_code ) = explode( '-', $lang_code );
+if ( 'en' !== $lang_code ) {
+	$video_url = add_query_arg( 'defaultLangCode', $lang_code, $video_url );
 }
 
 $title = __( 'About' );
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 17798803f2..ceed1e64f1 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.7-alpha-38951';
+$wp_version = '4.7-alpha-38952';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.