Changeset 14458

Timestamp:

05/04/2010 10:08:53 PM (15 years ago)

Author:

wpmuguru

Message:

use same salts/keys across network, see #12142

File:

• trunk/wp-includes/pluggable.php (modified) (4 diffs)

trunk/wp-includes/pluggable.php

@@ -1336 +1336 @@
             $salt = SECRET_SALT;
         } else {
-            $salt = get_option('auth_salt');
+            $salt = get_site_option('auth_salt');
             if ( empty($salt) ) {
                 $salt = wp_generate_password( 64, true, true );
-                update_option('auth_salt', $salt);
+                update_site_option('auth_salt', $salt);
             }
         }
@@ -1349 +1349 @@
             $salt = SECURE_AUTH_SALT;
         } else {
-            $salt = get_option('secure_auth_salt');
+            $salt = get_site_option('secure_auth_salt');
             if ( empty($salt) ) {
                 $salt = wp_generate_password( 64, true, true );
-                update_option('secure_auth_salt', $salt);
+                update_site_option('secure_auth_salt', $salt);
             }
         }
@@ -1362 +1362 @@
             $salt = LOGGED_IN_SALT;
         } else {
-            $salt = get_option('logged_in_salt');
+            $salt = get_site_option('logged_in_salt');
             if ( empty($salt) ) {
                 $salt = wp_generate_password( 64, true, true );
-                update_option('logged_in_salt', $salt);
+                update_site_option('logged_in_salt', $salt);
             }
         }
@@ -1375 +1375 @@
             $salt = NONCE_SALT;
         } else {
-            $salt = get_option('nonce_salt');
+            $salt = get_site_option('nonce_salt');
             if ( empty($salt) ) {
                 $salt = wp_generate_password( 64, true, true );
-                update_option('nonce_salt', $salt);
+                update_site_option('nonce_salt', $salt);
             }
         }