Changeset 34912 for trunk/src/wp-includes/functions.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/functions.php (modified) (3 diffs)

trunk/src/wp-includes/functions.php

@@ -1761 +1761 @@
      * We also sometimes obey UPLOADS when rewriting is enabled -- see the next block.
      */
-    if ( defined( 'UPLOADS' ) && ! ( is_multisite() && get_network_option( 'ms_files_rewriting' ) ) ) {
+    if ( defined( 'UPLOADS' ) && ! ( is_multisite() && get_site_option( 'ms_files_rewriting' ) ) ) {
         $dir = ABSPATH . UPLOADS;
         $url = trailingslashit( $siteurl ) . UPLOADS;
@@ -1769 +1769 @@
     if ( is_multisite() && ! ( is_main_network() && is_main_site() && defined( 'MULTISITE' ) ) ) {
 
-        if ( ! get_network_option( 'ms_files_rewriting' ) ) {
+        if ( ! get_site_option( 'ms_files_rewriting' ) ) {
             /*
              * If ms-files rewriting is disabled (networks created post-3.5), it is fairly
@@ -4004 +4004 @@
             $global_terms = (bool) $filter;
         else
-            $global_terms = (bool) get_network_option( 'global_terms_enabled', false );
+            $global_terms = (bool) get_site_option( 'global_terms_enabled', false );
     }
     return $global_terms;