Ticket #19599: 19599.2.patch

wp-includes/default-constants.php

@@ -140 +140 @@
  * @since 3.0.0
  */
 function wp_cookie_constants( ) {
-        global $wp_default_secret_key;
-
         /**
          * Used to guarantee unique hash cookies
          * @since 1.5
@@ -155 +153 @@
         }
 
         /**
-         * Should be exactly the same as the default value of SECRET_KEY in wp-config-sample.php
-         * @since 2.5.0
-         */
-        $wp_default_secret_key = 'put your unique phrase here';
-
-        /**
          * @since 2.0.0
          */
         if ( !defined('USER_COOKIE') )

wp-includes/pluggable.php

@@ -1313 +1313 @@
  * @return string Salt value
  */
 function wp_salt($scheme = 'auth') {
-        global $wp_default_secret_key;
+        $secret_keys = array();
+
+        if ( defined( 'SECRET_KEY' ) && ( '' != SECRET_KEY ) )
+                $secret_keys['secret_key'] = SECRET_KEY;
+        if ( defined( 'AUTH_KEY' ) && ( '' != AUTH_KEY ) )
+                $secret_keys['auth_key'] = AUTH_KEY;
+        if ( defined( 'SECURE_AUTH_KEY' ) && ( '' != SECURE_AUTH_KEY ) )
+                $secret_keys['secure_auth_key'] = SECURE_AUTH_KEY;
+        if ( defined( 'LOGGED_IN_KEY' ) && ( '' != LOGGED_IN_KEY ) )
+                $secret_keys['logged_in_key'] = LOGGED_IN_KEY;
+        if ( defined( 'NONCE_KEY' ) && ( '' != NONCE_KEY ) )
+                $secret_keys['nonce_key'] = NONCE_KEY;
+        if ( defined( 'SECRET_SALT' ) && ( '' != SECRET_SALT ) )
+                $secret_keys['secret_salt'] = SECRET_SALT;
+        if ( defined( 'AUTH_SALT' ) && ( '' != AUTH_SALT ) )
+                $secret_keys['auth_salt'] = AUTH_SALT;
+        if ( defined( 'SECURE_AUTH_SALT' ) && ( '' != SECURE_AUTH_SALT ) )
+                $secret_keys['secure_auth_salt'] = SECURE_AUTH_SALT;
+        if ( defined( 'LOGGED_IN_SALT' ) && ( '' != LOGGED_IN_SALT ) )
+                $secret_keys['logged_in_salt'] = LOGGED_IN_SALT;
+        if ( defined( 'NONCE_SALT' ) && ( '' != NONCE_SALT ) )
+                $secret_keys['nonce_salt'] = NONCE_SALT;
+
+        $wp_default_secret_key = '';
+        if ( !empty( $secret_keys ) ) {
+                $secret_keys_count = array_count_values( $secret_keys );
+                arsort( $secret_keys_count );
+                if ( array_shift( array_values( $secret_keys_count ) ) > 2 )
+                        $wp_default_secret_key = array_shift( array_keys( $secret_keys_count ) );
+        }
+
         $secret_key = '';
-        if ( defined('SECRET_KEY') && ('' != SECRET_KEY) && ( $wp_default_secret_key != SECRET_KEY) )
-                $secret_key = SECRET_KEY;
+        if ( !empty( $secret_keys['secret_key'] ) && ( $wp_default_secret_key != $secret_keys['secret_key'] ) )
+                $secret_key = $secret_keys['secret_key'];
 
         if ( 'auth' == $scheme ) {
-                if ( defined('AUTH_KEY') && ('' != AUTH_KEY) && ( $wp_default_secret_key != AUTH_KEY) )
-                        $secret_key = AUTH_KEY;
+                if ( !empty( $secret_keys['auth_key'] ) && ( $wp_default_secret_key != $secret_keys['auth_key'] ) )
+                        $secret_key = $secret_keys['auth_key'];
 
-                if ( defined('AUTH_SALT') && ('' != AUTH_SALT) && ( $wp_default_secret_key != AUTH_SALT) ) {
-                        $salt = AUTH_SALT;
-                } elseif ( defined('SECRET_SALT') && ('' != SECRET_SALT) && ( $wp_default_secret_key != SECRET_SALT) ) {
-                        $salt = SECRET_SALT;
+                if ( !empty( $secret_keys['auth_salt'] ) && ( $wp_default_secret_key != $secret_keys['auth_salt'] ) ) {
+                        $salt = $secret_keys['auth_salt'];
+                } elseif ( !empty( $secret_keys['secret_salt'] ) && ( $wp_default_secret_key != $secret_keys['secret_salt'] ) ) {
+                        $salt = $secret_keys['secret_salt'];
                 } else {
                         $salt = get_site_option('auth_salt');
                         if ( empty($salt) ) {
@@ -1334 +1364 @@
                         }
                 }
         } elseif ( 'secure_auth' == $scheme ) {
-                if ( defined('SECURE_AUTH_KEY') && ('' != SECURE_AUTH_KEY) && ( $wp_default_secret_key != SECURE_AUTH_KEY) )
-                        $secret_key = SECURE_AUTH_KEY;
+                if ( !empty( $secret_keys['secure_auth_key'] ) && ( $wp_default_secret_key != $secret_keys['secure_auth_key'] ) )
+                        $secret_key = $secret_keys['secure_auth_key'];
 
-                if ( defined('SECURE_AUTH_SALT') && ('' != SECURE_AUTH_SALT) && ( $wp_default_secret_key != SECURE_AUTH_SALT) ) {
-                        $salt = SECURE_AUTH_SALT;
+                if ( !empty( $secret_keys['secure_auth_salt'] ) && ( $wp_default_secret_key != $secret_keys['secure_auth_salt'] ) ) {
+                        $salt = $secret_keys['secure_auth_salt'];
                 } else {
                         $salt = get_site_option('secure_auth_salt');
                         if ( empty($salt) ) {
@@ -1347 +1377 @@
                         }
                 }
         } elseif ( 'logged_in' == $scheme ) {
-                if ( defined('LOGGED_IN_KEY') && ('' != LOGGED_IN_KEY) && ( $wp_default_secret_key != LOGGED_IN_KEY) )
-                        $secret_key = LOGGED_IN_KEY;
+                if ( !empty( $secret_keys['logged_in_key'] ) && ( $wp_default_secret_key != $secret_keys['logged_in_key'] ) )
+                        $secret_key = $secret_keys['logged_in_key'];
 
-                if ( defined('LOGGED_IN_SALT') && ('' != LOGGED_IN_SALT) && ( $wp_default_secret_key != LOGGED_IN_SALT) ) {
-                        $salt = LOGGED_IN_SALT;
+                if ( !empty( $secret_keys['logged_in_salt'] ) && ( $wp_default_secret_key != $secret_keys['logged_in_salt'] ) ) {
+                        $salt = $secret_keys['logged_in_salt'];
                 } else {
                         $salt = get_site_option('logged_in_salt');
                         if ( empty($salt) ) {
@@ -1360 +1390 @@
                         }
                 }
         } elseif ( 'nonce' == $scheme ) {
-                if ( defined('NONCE_KEY') && ('' != NONCE_KEY) && ( $wp_default_secret_key != NONCE_KEY) )
-                        $secret_key = NONCE_KEY;
+                if ( !empty( $secret_keys['nonce_key'] ) && ( $wp_default_secret_key != $secret_keys['nonce_key'] ) )
+                        $secret_key = $secret_keys['nonce_key'];
 
-                if ( defined('NONCE_SALT') && ('' != NONCE_SALT) && ( $wp_default_secret_key != NONCE_SALT) ) {
-                        $salt = NONCE_SALT;
+                if ( !empty( $secret_keys['nonce_salt'] ) && ( $wp_default_secret_key != $secret_keys['nonce_salt'] ) ) {
+                        $salt = $secret_keys['nonce_salt'];
                 } else {
                         $salt = get_site_option('nonce_salt');
                         if ( empty($salt) ) {