IntenseWebs/WordPress
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert [34778], continue using _site_option() for the current network.

Browse Source 
The `_network_option()` parameter order will be changing to accept `$network_id` first. The `_site_option()` functions will remain in use throughout core as our way of retrieving a network option for the current network.

See #28290.

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


git-svn-id: http://core.svn.wordpress.org/trunk@34877 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Jeremy Felt
2015-10-07 17:11:25 +00:00
parent feb2267a13
commit 9926983b66
36 changed files with 193 additions and 193 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
wp-includes/l10n.php
View File

@@ -54,7 +54,7 @@ function get_locale() {
if ( is_multisite() ) {
// Don't check blog option when installing.
if ( wp_installing() || ( false === $ms_locale = get_option( 'WPLANG' ) ) ) {
$ms_locale = get_network_option( 'WPLANG' );
$ms_locale = get_site_option( 'WPLANG' );
}
if ( $ms_locale !== false ) {