From 3ef27f792975f2574155ffaed76e96aca734a6ef Mon Sep 17 00:00:00 2001 From: Scott Taylor Date: Tue, 6 Oct 2015 03:45:25 +0000 Subject: [PATCH] oEmbed: add `embed` to `$subdirectory_reserved_names`. Props jeremyfelt. See #32522. Built from https://develop.svn.wordpress.org/trunk@34850 git-svn-id: http://core.svn.wordpress.org/trunk@34815 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/network/site-new.php | 2 +- wp-includes/version.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/wp-admin/network/site-new.php b/wp-admin/network/site-new.php index 4b4ec099ca..bd3216bc75 100644 --- a/wp-admin/network/site-new.php +++ b/wp-admin/network/site-new.php @@ -47,7 +47,7 @@ if ( isset($_REQUEST['action']) && 'add-site' == $_REQUEST['action'] ) { // If not a subdomain install, make sure the domain isn't a reserved word if ( ! is_subdomain_install() ) { /** This filter is documented in wp-includes/ms-functions.php */ - $subdirectory_reserved_names = apply_filters( 'subdirectory_reserved_names', array( 'page', 'comments', 'blog', 'files', 'feed', 'wp-admin', 'wp-content', 'wp-includes', 'wp-json' ) ); + $subdirectory_reserved_names = apply_filters( 'subdirectory_reserved_names', array( 'page', 'comments', 'blog', 'embed', 'files', 'feed', 'wp-admin', 'wp-content', 'wp-includes', 'wp-json' ) ); if ( in_array( $domain, $subdirectory_reserved_names ) ) wp_die( sprintf( __('The following words are reserved for use by WordPress functions and cannot be used as blog names: %s' ), implode( ', ', $subdirectory_reserved_names ) ) ); } diff --git a/wp-includes/version.php b/wp-includes/version.php index 0eef89f9bc..c040c9d499 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '4.4-alpha-34849'; +$wp_version = '4.4-alpha-34850'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.