Changeset 34778 for trunk/src/wp-includes/functions.php

Timestamp:

10/02/2015 07:07:23 PM (11 years ago)

Author:

jeremyfelt

Message:

MS: Use *_network_option() functions throughout core.

Replaces all uses of *_site_option() with the corresponding "network" function.

This excludes one usage in wp-admin/admin-footer.php that needs more investigation.

Props spacedmonkey.
See #28290.

File:

• trunk/src/wp-includes/functions.php (modified) (3 diffs)

trunk/src/wp-includes/functions.php

@@ -1763 +1763 @@
          * We also sometimes obey UPLOADS when rewriting is enabled -- see the next block.
          */
-        if ( defined( 'UPLOADS' ) && ! ( is_multisite() && get_site_option( 'ms_files_rewriting' ) ) ) {
+        if ( defined( 'UPLOADS' ) && ! ( is_multisite() && get_network_option( 'ms_files_rewriting' ) ) ) {
                 $dir = ABSPATH . UPLOADS;
                 $url = trailingslashit( $siteurl ) . UPLOADS;
@@ -1771 +1771 @@
         if ( is_multisite() && ! ( is_main_network() && is_main_site() && defined( 'MULTISITE' ) ) ) {
 
-                if ( ! get_site_option( 'ms_files_rewriting' ) ) {
+                if ( ! get_network_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_site_option( 'global_terms_enabled', false );
+                        $global_terms = (bool) get_network_option( 'global_terms_enabled', false );
         }
         return $global_terms;