From c86199ddb2cd9bc7b627614def27f07cfafa32ae Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov.ru@gmail.com>
Date: Tue, 23 Aug 2016 00:05:30 +0000
Subject: [PATCH] Embeds: In `get_oembed_endpoint_url()`, avoid inadvertent
 stomping of the `$format` parameter passed to `oembed_endpoint_url` filter.

Props danhgilmore.
Fixes #37751.
Built from https://develop.svn.wordpress.org/trunk@38321


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

diff --git a/wp-includes/embed.php b/wp-includes/embed.php
index 7c533dd882..80caaee901 100644
--- a/wp-includes/embed.php
+++ b/wp-includes/embed.php
@@ -380,14 +380,10 @@ function get_post_embed_url( $post = null ) {
 function get_oembed_endpoint_url( $permalink = '', $format = 'json' ) {
 	$url = rest_url( 'oembed/1.0/embed' );
 
-	if ( 'json' === $format ) {
-		$format = false;
-	}
-
 	if ( '' !== $permalink ) {
 		$url = add_query_arg( array(
 			'url'    => urlencode( $permalink ),
-			'format' => $format,
+			'format' => ( 'json' !== $format ) ? $format : false,
 		), $url );
 	}
 
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 9b4555ec5f..5c8e1f7319 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.7-alpha-38320';
+$wp_version = '4.7-alpha-38321';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.