From fd60f500c3ec9bbb2db51f0d4e5f60db8c827963 Mon Sep 17 00:00:00 2001 From: Drew Jaynes Date: Wed, 16 Sep 2015 13:26:26 +0000 Subject: [PATCH] Docs: Add a changelog entry for the addition of 'wp-admin', 'wp-content', and 'wp-includes' as reserved names for the `subdirectory_reserved_names` filter docs. The new names were introduced in [33952]. See #33615. See #32246. Built from https://develop.svn.wordpress.org/trunk@34235 git-svn-id: http://core.svn.wordpress.org/trunk@34199 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/ms-functions.php | 1 + wp-includes/version.php | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/wp-includes/ms-functions.php b/wp-includes/ms-functions.php index 53d13c5e9f..a6c2d02d2b 100644 --- a/wp-includes/ms-functions.php +++ b/wp-includes/ms-functions.php @@ -619,6 +619,7 @@ 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', and 'wp-includes' were added to the reserved names list. * * @param array $subdirectory_reserved_names Array of reserved names. */ diff --git a/wp-includes/version.php b/wp-includes/version.php index 8a451624ff..8253f39cd4 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '4.4-alpha-34234'; +$wp_version = '4.4-alpha-34235'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.