Ticket #27881: wp-salt.diff

src/wp-includes/pluggable.php

@@ -1746 +1746 @@
                 $duplicated_keys = array( 'put your unique phrase here' => true );
                 foreach ( array( 'AUTH', 'SECURE_AUTH', 'LOGGED_IN', 'NONCE', 'SECRET' ) as $first ) {
                         foreach ( array( 'KEY', 'SALT' ) as $second ) {
-                                if ( ! defined( "{$first}_{$second}" ) )
+                                if ( ! defined( "{$first}_{$second}" ) ) {
                                         continue;
+                                }
                                 $value = constant( "{$first}_{$second}" );
                                 $duplicated_keys[ $value ] = isset( $duplicated_keys[ $value ] );
                         }
@@ -1754 +1755 @@
                 }
         }
 
-        $key = $salt = '';
-        if ( defined( 'SECRET_KEY' ) && SECRET_KEY && empty( $duplicated_keys[ SECRET_KEY ] ) )
-                $key = SECRET_KEY;
-        if ( 'auth' == $scheme && defined( 'SECRET_SALT' ) && SECRET_SALT && empty( $duplicated_keys[ SECRET_SALT ] ) )
-                $salt = SECRET_SALT;
+        $values = array(
+                'key' => '',
+                'salt' => ''
+        );
+        if ( defined( 'SECRET_KEY' ) && SECRET_KEY && empty( $duplicated_keys[ SECRET_KEY ] ) ) {
+                $values['key'] = SECRET_KEY;
+        }
+        if ( 'auth' == $scheme && defined( 'SECRET_SALT' ) && SECRET_SALT && empty( $duplicated_keys[ SECRET_SALT ] ) ) {
+                $values['salt'] = SECRET_SALT;
+        }
 
         if ( in_array( $scheme, array( 'auth', 'secure_auth', 'logged_in', 'nonce' ) ) ) {
                 foreach ( array( 'key', 'salt' ) as $type ) {
                         $const = strtoupper( "{$scheme}_{$type}" );
                         if ( defined( $const ) && constant( $const ) && empty( $duplicated_keys[ constant( $const ) ] ) ) {
-                                $$type = constant( $const );
-                        } elseif ( ! $$type ) {
-                                $$type = get_site_option( "{$scheme}_{$type}" );
-                                if ( ! $$type ) {
-                                        $$type = wp_generate_password( 64, true, true );
-                                        update_site_option( "{$scheme}_{$type}", $$type );
+                                $values[ $type ] = constant( $const );
+                        } elseif ( ! $values[ $type ] ) {
+                                $values[ $type ] = get_site_option( "{$scheme}_{$type}" );
+                                if ( ! $values[ $type ] ) {
+                                        $values[ $type ] = wp_generate_password( 64, true, true );
+                                        update_site_option( "{$scheme}_{$type}", $values[ $type ] );
                                 }
                         }
                 }
         } else {
-                if ( ! $key ) {
-                        $key = get_site_option( 'secret_key' );
-                        if ( ! $key ) {
-                                $key = wp_generate_password( 64, true, true );
-                                update_site_option( 'secret_key', $key );
+                if ( ! $values['key'] ) {
+                        $values['key'] = get_site_option( 'secret_key' );
+                        if ( ! $values['key'] ) {
+                                $values['key'] = wp_generate_password( 64, true, true );
+                                update_site_option( 'secret_key', $values['key'] );
                         }
                 }
-                $salt = hash_hmac( 'md5', $scheme, $key );
+                $values['salt'] = hash_hmac( 'md5', $scheme, $values['key'] );
         }
 
-        $cached_salts[ $scheme ] = $key . $salt;
+        $cached_salts[ $scheme ] = $values['key'] . $values['salt'];
 
         /** This filter is documented in wp-includes/pluggable.php */
         return apply_filters( 'salt', $cached_salts[ $scheme ], $scheme );