Remove $wp_secret_key_default.

nacin · nacin · commit c4f902f4c0b7 · 2012-05-02T19:29:39.000Z
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
diff --git a/wp-includes/pluggable.php b/wp-includes/pluggable.php
@@ -1325,8 +1325,6 @@ function wp_create_nonce($action = -1) {
  * @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 = '';

Original file line number	Diff line number	Diff line change
`@@ -1325,8 +1325,6 @@ function wp_create_nonce($action = -1) {`
`1325`	`1325`	`* @return string Salt value`
`1326`	`1326`	`*/`
`1327`	`1327`	`function wp_salt( $scheme = 'auth' ) {`
`1328`		`- global $wp_secret_key_default; // This is set for localized builds for versions > 3.4.0.`
`1329`		`-`
`1330`	`1328`	`static $cached_salts = array();`
`1331`	`1329`	`if ( isset( $cached_salts[ $scheme ] ) )`
`1332`	`1330`	`return apply_filters( 'salt', $cached_salts[ $scheme ], $scheme );`
`@@ -1342,8 +1340,6 @@ function wp_salt( $scheme = 'auth' ) {`
`1342`	`1340`	`$duplicated_keys[ $value ] = isset( $duplicated_keys[ $value ] );`
`1343`	`1341`	`}`
`1344`	`1342`	`}`
`1345`		`- if ( ! empty( $wp_secret_key_default ) )`
`1346`		`- $duplicated_keys[ $wp_secret_key_default ] = true;`
`1347`	`1343`	`}`
`1348`	`1344`
`1349`	`1345`	`$key = $salt = '';`