Check WP_INSTALLING when setting cookiehash. Props DD32. fixes #6990

git-svn-id: http://svn.automattic.com/wordpress/trunk@7947 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2008-05-18 20:06:31 +00:00 · 2008-05-18 20:06:31 +00:00 · b8654e4cdf
parent 0a0216a765
commit b8654e4cdf
1 changed files with 1 additions and 1 deletions
--- a/wp-settings.php
+++ b/wp-settings.php
@ -268,7 +268,7 @@ require (ABSPATH . WPINC . '/canonical.php');
 require (ABSPATH . WPINC . '/shortcodes.php');
 require (ABSPATH . WPINC . '/media.php');

-if (strpos($_SERVER['PHP_SELF'], 'install.php') === false) {
+if ( ! defined('WP_INSTALLING') ) {
 	// Used to guarantee unique hash cookies
 	$cookiehash = md5(get_option('siteurl'));
 	/**