From b8654e4cdf23cc1a1f61d56843fb16479961f90c Mon Sep 17 00:00:00 2001
From: ryan <ryan@1a063a9b-81f0-0310-95a4-ce76da25c4cd>
Date: Sun, 18 May 2008 20:06:31 +0000
Subject: [PATCH] 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
---
 wp-settings.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/wp-settings.php b/wp-settings.php
index cfb684470..0f5ce0883 100644
--- 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'));
 	/**