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

trunk/src/wp-admin/includes/network.php

@@ -451 +451 @@
                     <action type="None" />
                 </rule>';
-                if ( is_multisite() && get_network_option( 'ms_files_rewriting' ) ) {
+                if ( is_multisite() && get_site_option( 'ms_files_rewriting' ) ) {
                     $web_config_file .= '
                 <rule name="WordPress Rule for Files" stopProcessing="true">
@@ -507 +507 @@
 
         $ms_files_rewriting = '';
-        if ( is_multisite() && get_network_option( 'ms_files_rewriting' ) ) {
+        if ( is_multisite() && get_site_option( 'ms_files_rewriting' ) ) {
             $ms_files_rewriting = "\n# uploaded files\nRewriteRule ^";
             $ms_files_rewriting .= $subdir_match . "files/(.+) {$rewrite_base}" . WPINC . "/ms-files.php?file={$subdir_replacement_12} [L]" . "\n";