Wordpress 2.6.2-scripts

[autoinstalls/wordpress.git] / wp-config.php

diff --git a/wp-config.php b/wp-config.php
index 8f40f3ba6b9e8b532cb9b5c7e9ae26d391a6a4bf..eb689835d251096d63d5862cbabcc4f5def1f749 100644 (file)
--- a/wp-config.php
+++ b/wp-config.php
@@ -7,10 +7,12 @@ define('DB_HOST', WIZARD_DBSERVER);    // 99% chance you won't need to change th
 define('DB_CHARSET', 'utf8');\r
 define('DB_COLLATE', '');\r
 \r
 define('DB_CHARSET', 'utf8');\r
 define('DB_COLLATE', '');\r
 \r

-// Change SECRET_KEY to a unique phrase.  You won't have to remember it later,\r
-// so make it long and complicated.  You can visit http://api.wordpress.org/secret-key/1.0/\r
-// to get a secret key generated for you, or just make something up.\r
-define('SECRET_KEY', WIZARD_SECRETKEY); // Change this to a unique phrase.\r
+// Change each KEY to a different unique phrase.  You won't have to remember the phrases later,\r
+// so make them long and complicated.  You can visit http://api.wordpress.org/secret-key/1.1/\r
+// to get keys generated for you, or just make something up.  Each key should have a different phrase.\r
+define('AUTH_KEY', WIZARD_AUTH_KEY); // Change this to a unique phrase.\r
+define('SECURE_AUTH_KEY', WIZARD_SECURE_AUTH_KEY); // Change this to a unique phrase.\r
+define('LOGGED_IN_KEY', WIZARD_LOGGED_IN_KEY); // Change this to a unique phrase.\r

 \r
 // You can have multiple installations in one database if you give each a unique prefix\r
 $table_prefix  = 'wp_';   // Only numbers, letters, and underscores please!\r
 \r
 // You can have multiple installations in one database if you give each a unique prefix\r
 $table_prefix  = 'wp_';   // Only numbers, letters, and underscores please!\r


@@ -23,6 +25,7 @@ define ('WPLANG', '');
 \r
 /* That's all, stop editing! Happy blogging. */\r
 \r
 \r
 /* That's all, stop editing! Happy blogging. */\r
 \r

-define('ABSPATH', dirname(__FILE__).'/');\r
-require_once(ABSPATH.'wp-settings.php');\r
+if ( !defined('ABSPATH') )\r
+       define('ABSPATH', dirname(__FILE__) . '/');\r
+require_once(ABSPATH . 'wp-settings.php');\r

 ?>\r
 ?>\r