Changeset 6982

Timestamp:

02/22/2008 05:36:09 PM (17 years ago)

Author:

ryan

Message:

Allow overriding the default secret key. Proy. Props nbachiyski. fixes #5960

Location:

trunk

Files:

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

trunk/wp-includes/pluggable.php

@@ -1017 +1017 @@
  */
 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;
 

trunk/wp-settings.php

@@ -277 +277 @@
 
 /**
+ * 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