summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordonncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36>2008-07-04 14:51:18 +0000
committerdonncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36>2008-07-04 14:51:18 +0000
commit3cd5175fd9627e8fdd282377bc4ca990e02f39a6 (patch)
treefeade35d9f7501bf6e6e757a08bed4553522e7c7
parente2238d665f51ad4e37b866c9e0499d9571af0c2f (diff)
downloadwordpress-mu-3cd5175fd9627e8fdd282377bc4ca990e02f39a6.tar.gz
wordpress-mu-3cd5175fd9627e8fdd282377bc4ca990e02f39a6.tar.xz
wordpress-mu-3cd5175fd9627e8fdd282377bc4ca990e02f39a6.zip
Added AUTH_KEY and SECURE_AUTH_KEY
git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@1351 7be80a69-a1ef-0310-a953-fb0f7c49ff36
-rw-r--r--index-install.php2
-rw-r--r--wp-admin/includes/mu.php2
2 files changed, 3 insertions, 1 deletions
diff --git a/index-install.php b/index-install.php
index 99c85ed..e1788fa 100644
--- a/index-install.php
+++ b/index-install.php
@@ -340,6 +340,8 @@ function step2() {
case "define('SECRET_K":
case "define('SECRET_S":
case "define('LOGGED_I":
+ case "define('AUTH_KEY":
+ case "define('SECURE_A":
fwrite($handle, str_replace('put your unique phrase here', md5( mt_rand() ) . md5( mt_rand() ), $line));
break;
default:
diff --git a/wp-admin/includes/mu.php b/wp-admin/includes/mu.php
index 03d6c42..15cc9c6 100644
--- a/wp-admin/includes/mu.php
+++ b/wp-admin/includes/mu.php
@@ -631,7 +631,7 @@ remove_action( 'media_buttons', 'media_buttons' );
function secret_salt_warning() {
if( !is_site_admin() )
return;
- $secret_keys = array( 'SECRET_KEY', 'SECRET_SALT', 'LOGGED_IN_KEY', 'LOGGED_IN_SALT' );
+ $secret_keys = array( 'SECRET_KEY', 'SECRET_SALT', 'LOGGED_IN_KEY', 'LOGGED_IN_SALT', 'AUTH_KEY', 'SECURE_AUTH_KEY' );
$out = '';
foreach( $secret_keys as $key ) {
if( !defined( $key ) )