From 2003bc15ba3d558f03681ffce4b85ba66dfb408c Mon Sep 17 00:00:00 2001
From: Scott Taylor <scott.c.taylor@mac.com>
Date: Tue, 6 Oct 2015 04:05:24 +0000
Subject: [PATCH] Multisite: in `wpmu_validate_blog_signup()`, pass `embed` to
 the array passed to `subdirectory_reserved_names`.

See #32522.

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


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

diff --git a/wp-includes/ms-functions.php b/wp-includes/ms-functions.php
index ae5a242afa..b066a27c96 100644
--- a/wp-includes/ms-functions.php
+++ b/wp-includes/ms-functions.php
@@ -561,12 +561,12 @@ function wpmu_validate_blog_signup( $blogname, $blog_title, $user = '' ) {
 			 * Filter reserved site names on a sub-directory Multisite install.
 			 *
 			 * @since 3.0.0
-			 * @since 4.4.0 'wp-admin', 'wp-content', 'wp-includes', and 'wp-json' were added
+			 * @since 4.4.0 'wp-admin', 'wp-content', 'wp-includes', 'wp-json', and 'embed' were added
 			 *              to the reserved names list.
 			 *
 			 * @param array $subdirectory_reserved_names Array of reserved names.
 			 */
-			apply_filters( 'subdirectory_reserved_names', array( 'page', 'comments', 'blog', 'files', 'feed', 'wp-admin', 'wp-content', 'wp-includes', 'wp-json' ) )
+			apply_filters( 'subdirectory_reserved_names', array( 'page', 'comments', 'blog', 'files', 'feed', 'wp-admin', 'wp-content', 'wp-includes', 'wp-json', 'embed' ) )
 		);
 	}
 
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 8df1be5319..5f6f740f52 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.4-alpha-34852';
+$wp_version = '4.4-alpha-34853';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.
diff --git a/wp-settings.php b/wp-settings.php
index 9a3afd840f..d2c8b0173a 100644
--- a/wp-settings.php
+++ b/wp-settings.php
@@ -146,6 +146,7 @@ require( ABSPATH . WPINC . '/update.php' );
 require( ABSPATH . WPINC . '/canonical.php' );
 require( ABSPATH . WPINC . '/shortcodes.php' );
 require( ABSPATH . WPINC . '/class-wp-embed.php' );
+require( ABSPATH . WPINC . '/embed-functions.php' );
 require( ABSPATH . WPINC . '/media.php' );
 require( ABSPATH . WPINC . '/http.php' );
 require( ABSPATH . WPINC . '/widgets.php' );