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: http://core.svn.wordpress.org/trunk@20691 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
parent
dad497a12a
commit
725e0cc1df
|
@ -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 = '';
|
||||
|
|
Loading…
Reference in New Issue