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

trunk/src/wp-signup.php

@@ -8 +8 @@
 require( dirname( __FILE__ ) . '/wp-blog-header.php' );
 
-if ( is_array( get_network_option( 'illegal_names' ) ) && isset( $_GET[ 'new' ] ) && in_array( $_GET[ 'new' ], get_network_option( 'illegal_names' ) ) ) {
+if ( is_array( get_site_option( 'illegal_names' )) && isset( $_GET[ 'new' ] ) && in_array( $_GET[ 'new' ], get_site_option( 'illegal_names' ) ) ) {
     wp_redirect( network_home_url() );
     die();
@@ -674 +674 @@
 
 // Main
-$active_signup = get_network_option( 'registration', 'none' );
+$active_signup = get_site_option( 'registration', 'none' );
 /**
  * Filter the type of site sign-up.