WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
Sergey Biryukov 2020-06-20 12:24:08 +00:00
parent d586e4330d
commit 65724cf380
2 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
wp-admin/includes/network.php
View File

@ -52,12 +52,14 @@ function allow_subdomain_install() {
*/ */
function allow_subdirectory_install() { function allow_subdirectory_install() {
global $wpdb; global $wpdb;
/** /**
* Filters whether to enable the subdirectory installation feature in Multisite. * Filters whether to enable the subdirectory installation feature in Multisite.
* *
* @since 3.0.0 * @since 3.0.0
* *
* @param bool $allow Whether to enable the subdirectory installation feature in Multisite. Default is false. * @param bool $allow Whether to enable the subdirectory installation feature in Multisite.
* Default false.
*/ */
if ( apply_filters( 'allow_subdirectory_install', false ) ) { if ( apply_filters( 'allow_subdirectory_install', false ) ) {
return true; return true;
@ -97,8 +99,9 @@ function get_clean_basedomain() {
/** /**
* Prints step 1 for Network installation process. * 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 * @todo Realistically, step 1 should be a welcome screen explaining what a Network is and such.
* should not be a sudden "Welcome to a new install process! Fill this out and click here." See also contextual help todo. * 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 * @since 3.0.0
* *

2
wp-includes/version.php
View File

@ -13,7 +13,7 @@
* *
* @global string $wp_version * @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. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.