From 8fc094b4471e50f335abaed758a5f3eab06e5ce4 Mon Sep 17 00:00:00 2001
From: donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36>
Date: Sat, 24 Dec 2005 17:20:16 +0000
Subject: Cookie fix

git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@486 7be80a69-a1ef-0310-a953-fb0f7c49ff36
---
 wp-inst/wp-settings.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/wp-inst/wp-settings.php b/wp-inst/wp-settings.php
index 987b034..0c4a59b 100644
--- a/wp-inst/wp-settings.php
+++ b/wp-inst/wp-settings.php
@@ -295,7 +295,7 @@ if( $current_blog->spam == '1' ) {
     die( 'This blog has been archived or suspended.' );
 }
 
-/*
+
 if (!strstr($_SERVER['PHP_SELF'], 'install.php') && !strstr($_SERVER['PHP_SELF'], 'wp-admin/import')) :
     // Used to guarantee unique hash cookies
     $cookiehash = ''; // Remove in 1.4
@@ -312,7 +312,7 @@ if ( !defined('SITECOOKIEPATH') )
 	define('SITECOOKIEPATH', preg_replace('|https?://[^/]+|i', '', get_settings('siteurl') . '/' ) );
 if ( !defined('COOKIE_DOMAIN') )
 	define('COOKIE_DOMAIN', false);
-*/
+
 
 require (ABSPATH . WPINC . '/vars.php');
 
-- 
cgit