summaryrefslogtreecommitdiffstats
path: root/wp-settings.php
diff options
context:
space:
mode:
authordonncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36>2008-07-04 11:56:56 +0000
committerdonncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36>2008-07-04 11:56:56 +0000
commite1e5cc697facc16d122d84caeab6eaa819f1dfbd (patch)
tree872823f0a3373f283f770873863854e9efe1bc0e /wp-settings.php
parent2b6348978ec434e2fa4114085783cf9ada097b22 (diff)
downloadwordpress-mu-e1e5cc697facc16d122d84caeab6eaa819f1dfbd.tar.gz
wordpress-mu-e1e5cc697facc16d122d84caeab6eaa819f1dfbd.tar.xz
wordpress-mu-e1e5cc697facc16d122d84caeab6eaa819f1dfbd.zip
Set the wp_default_secret_key, fixes #670, props trent
git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@1348 7be80a69-a1ef-0310-a953-fb0f7c49ff36
Diffstat (limited to 'wp-settings.php')
-rw-r--r--wp-settings.php2
1 files changed, 2 insertions, 0 deletions
diff --git a/wp-settings.php b/wp-settings.php
index 0f39503..b55f585 100644
--- a/wp-settings.php
+++ b/wp-settings.php
@@ -343,6 +343,8 @@ if( $current_blog->spam == '1' )
* @since 2.5
*/
$wp_default_secret_key = 'put your unique phrase here';
+if( defined( 'SECRET_KEY' ) )
+ $wp_default_secret_key = SECRET_KEY;
/**
* It is possible to define this in wp-config.php