Changeset 6478

Timestamp:

12/24/2007 06:34:12 AM (17 years ago)

Author:

ryan

Message:

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

Location:

trunk

Files:

• wp-config-sample.php (modified) (1 diff)
• wp-includes/pluggable.php (modified) (1 diff)

trunk/wp-config-sample.php

@@ -10 +10 @@
 // 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
-// to get a phrase generated for you.
-define('SECRET_KEY', ''); // Change this to a unique phrase.
+// to get a phrase generated for you, or just make something up.
+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

trunk/wp-includes/pluggable.php

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