mirror of
https://github.com/WordPress/WordPress.git
synced 2024-12-23 01:27:36 +01:00
Allow overriding the default secret key. Proy. Props nbachiyski. fixes #5960
git-svn-id: http://svn.automattic.com/wordpress/trunk@6982 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
parent
c6d88f0bc6
commit
54f091eebf
@ -1016,9 +1016,9 @@ if ( !function_exists('wp_salt') ) :
|
||||
* @return string Salt value from either 'SECRET_KEY' or 'secret' option
|
||||
*/
|
||||
function wp_salt() {
|
||||
|
||||
global $wp_default_secret_key;
|
||||
$secret_key = '';
|
||||
if ( defined('SECRET_KEY') && ('' != SECRET_KEY) && ('put your unique phrase here' != SECRET_KEY) )
|
||||
if ( defined('SECRET_KEY') && ('' != SECRET_KEY) && ( $wp_default_secret_key != SECRET_KEY) )
|
||||
$secret_key = SECRET_KEY;
|
||||
|
||||
if ( defined('SECRET_SALT') ) {
|
||||
|
@ -275,6 +275,12 @@ if (strpos($_SERVER['PHP_SELF'], 'install.php') === false) {
|
||||
define('COOKIEHASH', $cookiehash);
|
||||
}
|
||||
|
||||
/**
|
||||
* Should be exactly the same as the default value of SECRET_KEY in wp-config-sample.php
|
||||
* @since 2.5
|
||||
*/
|
||||
$wp_default_secret_key = 'put your unique phrase here';
|
||||
|
||||
/**
|
||||
* It is possible to define this in wp-config.php
|
||||
* @since 2.0.0
|
||||
|
Loading…
Reference in New Issue
Block a user