From 5bf387bb070eb58673f42224323be79187e230b9 Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov.ru@gmail.com>
Date: Tue, 11 Feb 2020 16:36:06 +0000
Subject: [PATCH] Customize: Avoid unnecessary `get_theme_mod()` call and
 premature escaping in `get_header_video_url()`.

The result is still escaped with `esc_url_raw()` for retrieval, and with `esc_url()` for display in `the_header_video_url()`.

Props dlh, Tkama.
Fixes #40044.
Built from https://develop.svn.wordpress.org/trunk@47267


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

diff --git a/wp-includes/theme.php b/wp-includes/theme.php
index c158b51969..c7c4c3ca63 100644
--- a/wp-includes/theme.php
+++ b/wp-includes/theme.php
@@ -1427,12 +1427,13 @@ function has_header_video() {
  * @return string|false Header video URL or false if there is no video.
  */
 function get_header_video_url() {
-	$id  = absint( get_theme_mod( 'header_video' ) );
-	$url = esc_url( get_theme_mod( 'external_header_video' ) );
+	$id = absint( get_theme_mod( 'header_video' ) );
 
 	if ( $id ) {
 		// Get the file URL from the attachment ID.
 		$url = wp_get_attachment_url( $id );
+	} else {
+		$url = get_theme_mod( 'external_header_video' );
 	}
 
 	/**
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 28d69e2668..4c99174a44 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -13,7 +13,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '5.4-alpha-47266';
+$wp_version = '5.4-alpha-47267';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.