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-admin/includes/schema.php

    r34778 r34912  
    936936        }
    937937    } else {
    938         $site_admins = get_network_option( 'site_admins' );
     938        $site_admins = get_site_option( 'site_admins' );
    939939    }
    940940
     
    986986        'siteurl' => get_option( 'siteurl' ) . '/',
    987987        'add_new_users' => '0',
    988         'upload_space_check_disabled' => is_multisite() ? get_network_option( 'upload_space_check_disabled' ) : '1',
     988        'upload_space_check_disabled' => is_multisite() ? get_site_option( 'upload_space_check_disabled' ) : '1',
    989989        'subdomain_install' => intval( $subdomain_install ),
    990990        'global_terms_enabled' => global_terms_enabled() ? '1' : '0',
    991         'ms_files_rewriting' => is_multisite() ? get_network_option( 'ms_files_rewriting' ) : '0',
     991        'ms_files_rewriting' => is_multisite() ? get_site_option( 'ms_files_rewriting' ) : '0',
    992992        'initial_db_version' => get_option( 'initial_db_version' ),
    993993        'active_sitewide_plugins' => array(),
Note: See TracChangeset for help on using the changeset viewer.