Changeset 34912 for trunk/src/wp-includes/pluggable.php

Timestamp:

10/07/2015 05:11:01 PM (11 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/pluggable.php (modified) (2 diffs)

trunk/src/wp-includes/pluggable.php

@@ -1962 +1962 @@
                                 $values[ $type ] = constant( $const );
                         } elseif ( ! $values[ $type ] ) {
-                                $values[ $type ] = get_network_option( "{$scheme}_{$type}" );
+                                $values[ $type ] = get_site_option( "{$scheme}_{$type}" );
                                 if ( ! $values[ $type ] ) {
                                         $values[ $type ] = wp_generate_password( 64, true, true );
-                                        update_network_option( "{$scheme}_{$type}", $values[ $type ] );
+                                        update_site_option( "{$scheme}_{$type}", $values[ $type ] );
                                 }
                         }
@@ -1971 +1971 @@
         } else {
                 if ( ! $values['key'] ) {
-                        $values['key'] = get_network_option( 'secret_key' );
+                        $values['key'] = get_site_option( 'secret_key' );
                         if ( ! $values['key'] ) {
                                 $values['key'] = wp_generate_password( 64, true, true );
-                                update_network_option( 'secret_key', $values['key'] );
+                                update_site_option( 'secret_key', $values['key'] );
                         }
                 }