From 65724cf380c2b16f2ec74e38de9a09fbf13d87cb Mon Sep 17 00:00:00 2001 From: Sergey Biryukov Date: Sat, 20 Jun 2020 12:24:08 +0000 Subject: [PATCH] Docs: Correct DocBlock placement for `allow_subdirectory_install` filter. See #49572. Built from https://develop.svn.wordpress.org/trunk@48108 git-svn-id: http://core.svn.wordpress.org/trunk@47877 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/includes/network.php | 21 ++++++++++++--------- wp-includes/version.php | 2 +- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/wp-admin/includes/network.php b/wp-admin/includes/network.php index f15aadd542..7fba97bcf2 100644 --- a/wp-admin/includes/network.php +++ b/wp-admin/includes/network.php @@ -52,13 +52,15 @@ function allow_subdomain_install() { */ function allow_subdirectory_install() { global $wpdb; - /** - * Filters whether to enable the subdirectory installation feature in Multisite. - * - * @since 3.0.0 - * - * @param bool $allow Whether to enable the subdirectory installation feature in Multisite. Default is false. - */ + + /** + * Filters whether to enable the subdirectory installation feature in Multisite. + * + * @since 3.0.0 + * + * @param bool $allow Whether to enable the subdirectory installation feature in Multisite. + * Default false. + */ if ( apply_filters( 'allow_subdirectory_install', false ) ) { return true; } @@ -97,8 +99,9 @@ function get_clean_basedomain() { /** * Prints step 1 for Network installation process. * - * @todo Realistically, step 1 should be a welcome screen explaining what a Network is and such. Navigating to Tools > Network - * should not be a sudden "Welcome to a new install process! Fill this out and click here." See also contextual help todo. + * @todo Realistically, step 1 should be a welcome screen explaining what a Network is and such. + * Navigating to Tools > Network should not be a sudden "Welcome to a new install process! + * Fill this out and click here." See also contextual help todo. * * @since 3.0.0 * diff --git a/wp-includes/version.php b/wp-includes/version.php index 662f46f442..7e2050e322 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -13,7 +13,7 @@ * * @global string $wp_version */ -$wp_version = '5.5-alpha-48107'; +$wp_version = '5.5-alpha-48108'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.