golem
/
twentyGOLEM
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Allow DB salt to be overridden by SECRET_SALT. Add a filter to wp_salt(). see #5367 

git-svn-id: http://svn.automattic.com/wordpress/trunk@6478 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
ryan 2007-12-24 06:34:12 +00:00
parent b3fa9f2840
commit 42d83376c9
2 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
wp-config-sample.php
View File

@ -9,8 +9,8 @@ define('DB_COLLATE', '');
// Change SECRET_KEY to a unique phrase. You won't have to remember it later, // Change SECRET_KEY to a unique phrase. You won't have to remember it later,
// so make it long and complicated. You can visit https://www.grc.com/passwords.htm // so make it long and complicated. You can visit https://www.grc.com/passwords.htm
// to get a phrase generated for you. // to get a phrase generated for you, or just make something up.
define('SECRET_KEY', ''); // Change this to a unique phrase. define('SECRET_KEY', 'put your unique phrase here'); // Change this to a unique phrase.
// You can have multiple installations in one database if you give each a unique prefix // You can have multiple installations in one database if you give each a unique prefix
$table_prefix = 'wp_'; // Only numbers, letters, and underscores please! $table_prefix = 'wp_'; // Only numbers, letters, and underscores please!

19
wp-includes/pluggable.php
View File

@ -700,16 +700,21 @@ endif;
if ( !function_exists('wp_salt') ) : if ( !function_exists('wp_salt') ) :
function wp_salt() { function wp_salt() {
if ( defined('SECRET_KEY') && '' != SECRET_KEY ) $secret_key = '';
return SECRET_KEY; if ( defined('SECRET_KEY') && ('' != SECRET_KEY) && ('put your unique phrase here' != SECRET_KEY) )
$secret_key = SECRET_KEY;
$salt = get_option('secret'); if ( defined('SECRET_SALT') ) {
if ( empty($salt) ) { $salt = SECRET_SALT;
$salt = wp_generate_password(); } else {
update_option('secret', $salt); $salt = get_option('secret');
if ( empty($salt) ) {
$salt = wp_generate_password();
update_option('secret', $salt);
}
} }
return $salt; return apply_filters('salt', $salt);
} }
endif; endif;