Changeset 34778 for trunk/src/wp-includes/ms-load.php

Timestamp:

10/02/2015 07:07:23 PM (10 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/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_site_option( 'active_sitewide_plugins', array() );
+    $active_plugins = (array) get_network_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_site_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_network_option( 'admin_email', 'support@' . get_current_site()->domain ) ) ) );
     }