From c4f902f4c0b790747aab508c8bc4e7cce4fbdcf4 Mon Sep 17 00:00:00 2001 From: Andrew Nacin Date: Wed, 2 May 2012 19:29:39 +0000 Subject: [PATCH] Remove $wp_secret_key_default. With the duplicate key checks, this is isn't necessary. It could also cause problems when you temporarily update to an English translation of a new version before going back to the locale. see #19599. git-svn-id: https://develop.svn.wordpress.org/trunk@20691 602fd350-edb4-49c9-b593-d223f7449a82 --- wp-includes/pluggable.php | 4 ---- 1 file changed, 4 deletions(-) diff --git a/wp-includes/pluggable.php b/wp-includes/pluggable.php index 141e86a35f..ac308a9966 100644 --- a/wp-includes/pluggable.php +++ b/wp-includes/pluggable.php @@ -1325,8 +1325,6 @@ if ( !function_exists('wp_salt') ) : * @return string Salt value */ function wp_salt( $scheme = 'auth' ) { - global $wp_secret_key_default; // This is set for localized builds for versions > 3.4.0. - static $cached_salts = array(); if ( isset( $cached_salts[ $scheme ] ) ) return apply_filters( 'salt', $cached_salts[ $scheme ], $scheme ); @@ -1342,8 +1340,6 @@ function wp_salt( $scheme = 'auth' ) { $duplicated_keys[ $value ] = isset( $duplicated_keys[ $value ] ); } } - if ( ! empty( $wp_secret_key_default ) ) - $duplicated_keys[ $wp_secret_key_default ] = true; } $key = $salt = '';