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

trunk/src/wp-includes/ms-load.php

@@ -35 +35 @@
  */
 function wp_get_active_network_plugins() {
-    $active_plugins = (array) get_network_option( 'active_sitewide_plugins', array() );
+    $active_plugins = (array) get_site_option( 'active_sitewide_plugins', array() );
     if ( empty( $active_plugins ) )
         return array();
@@ -97 +97 @@
             return WP_CONTENT_DIR . '/blog-inactive.php';
         else
-            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 ) ) ) );
+            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 ) ) ) );
     }