WordPress.org

Make WordPress Core


Ignore:
Timestamp:
10/07/2015 05:11:01 PM (5 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:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/wp-includes/script-loader.php

    r34903 r34912  
    11641164    if ( ! isset($compress_scripts) ) {
    11651165        $compress_scripts = defined('COMPRESS_SCRIPTS') ? COMPRESS_SCRIPTS : true;
    1166         if ( $compress_scripts && ( ! get_network_option( 'can_compress_scripts' ) || $compressed_output ) )
     1166        if ( $compress_scripts && ( ! get_site_option('can_compress_scripts') || $compressed_output ) )
    11671167            $compress_scripts = false;
    11681168    }
     
    11701170    if ( ! isset($compress_css) ) {
    11711171        $compress_css = defined('COMPRESS_CSS') ? COMPRESS_CSS : true;
    1172         if ( $compress_css && ( ! get_network_option( 'can_compress_scripts' ) || $compressed_output ) )
     1172        if ( $compress_css && ( ! get_site_option('can_compress_scripts') || $compressed_output ) )
    11731173            $compress_css = false;
    11741174    }
Note: See TracChangeset for help on using the changeset viewer.