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/ms-load.php

    r34778 r34912  
    3535 */
    3636function wp_get_active_network_plugins() {
    37     $active_plugins = (array) get_network_option( 'active_sitewide_plugins', array() );
     37    $active_plugins = (array) get_site_option( 'active_sitewide_plugins', array() );
    3838    if ( empty( $active_plugins ) )
    3939        return array();
     
    9797            return WP_CONTENT_DIR . '/blog-inactive.php';
    9898        else
    99             wp_die( sprintf( __( 'This site has not been activated yet. If you are having problems activating your site, please contact <a href="mailto:%1$s">%1$s</a>.' ), str_replace( '@', ' AT ', get_network_option( 'admin_email', 'support@' . get_current_site()->domain ) ) ) );
     99            wp_die( sprintf( __( 'This site has not been activated yet. If you are having problems activating your site, please contact <a href="mailto:%1$s">%1$s</a>.' ), str_replace( '@', ' AT ', get_site_option( 'admin_email', 'support@' . get_current_site()->domain ) ) ) );
    100100    }
    101101
Note: See TracChangeset for help on using the changeset viewer.