From e1e5cc697facc16d122d84caeab6eaa819f1dfbd Mon Sep 17 00:00:00 2001
From: donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36>
Date: Fri, 4 Jul 2008 11:56:56 +0000
Subject: 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
---
 wp-settings.php | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'wp-settings.php')

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
-- 
cgit