vhad/wordpress-develop
1
0
Fork 0
mirror of https://github.com/gosticks/wordpress-develop.git synced 2026-04-03 12:14:25 +00:00
Code Issues Actions 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.


git-svn-id: https://develop.svn.wordpress.org/trunk@34912 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Jeremy Felt
2015-10-07 17:11:01 +00:00
parent 9a704fa0b8
commit 599fb50e09
35 changed files with 192 additions and 192 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/wp-includes/script-loader.php
View File

@@ -1163,13 +1163,13 @@ function script_concat_settings() {
if ( ! isset($compress_scripts) ) {
$compress_scripts = defined('COMPRESS_SCRIPTS') ? COMPRESS_SCRIPTS : true;
if ( $compress_scripts && ( ! get_network_option( 'can_compress_scripts' ) || $compressed_output ) )
if ( $compress_scripts && ( ! get_site_option('can_compress_scripts') || $compressed_output ) )
$compress_scripts = false;
}
if ( ! isset($compress_css) ) {
$compress_css = defined('COMPRESS_CSS') ? COMPRESS_CSS : true;
if ( $compress_css && ( ! get_network_option( 'can_compress_scripts' ) || $compressed_output ) )
if ( $compress_css && ( ! get_site_option('can_compress_scripts') || $compressed_output ) )
$compress_css = false;
}
}