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

Timestamp:

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

trunk/src/wp-includes/pluggable.php

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