Changeset 34912 for trunk/src/wp-includes/script-loader.php

Timestamp:

10/07/2015 05:11:01 PM (9 years ago)

Author:

jeremyfelt

Message:

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

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.

File:

• trunk/src/wp-includes/script-loader.php (modified) (2 diffs)

trunk/src/wp-includes/script-loader.php

@@ -1164 +1164 @@
     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;
     }
@@ -1170 +1170 @@
     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;
     }