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

MS: Populate `site_name` property in a new `WP_Network`. 

This allows us to reduce some extra handling in `ms-settings.php`. Requires [34777].

Props johnjamesjacoby for the initial patch.
See #31985.

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


git-svn-id: http://core.svn.wordpress.org/trunk@34784 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Jeremy Felt 2015-10-04 20:51:25 +00:00
parent 6650dfea4f
commit a8771a3914
3 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
wp-includes/class-wp-network.php
View File

@ -129,9 +129,25 @@ class WP_Network {
$this->$key = $value;
}
$this->_set_site_name();
$this->_set_cookie_domain();
}
/**
* Set the site name assigned to the network if one has not been populated.
*
* @since 4.4.0
* @access private
*/
private function _set_site_name() {
if ( ! empty( $this->site_name ) ) {
return;
}
$default = ucfirst( $this->domain );
$this->site_name = get_network_option( 'site_name', $default, $this->id );
}
/**
* Set the cookie domain based on the network domain if one has
* not been populated.

7
wp-includes/ms-settings.php
View File

@ -221,12 +221,5 @@ if ( ! $current_site instanceof WP_Network ) {
$current_site = new WP_Network( $current_site );
}
if ( empty( $current_site->site_name ) ) {
$current_site->site_name = get_network_option( 'site_name' );
if ( ! $current_site->site_name ) {
$current_site->site_name = ucfirst( $current_site->domain );
}
}
// Define upload directory constants
ms_upload_constants();

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
*
* @global string $wp_version
*/
$wp_version = '4.4-alpha-34818';
$wp_version = '4.4-alpha-34819';
/**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.